fix: add if condition to append "::" in auth::verify_with_role

account-tech · Dec 6, 2024 · 83d9531 · 83d9531
1 parent 5eca606
commit 83d9531
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 18 deletions.
diff --git a/packages/actions/sources/kiosk.move b/packages/actions/sources/kiosk.move
@@ -142,13 +142,13 @@ public fun delist<Config, Outcome, Nft: key + store>(
     account: &mut Account<Config, Outcome>, 
     kiosk: &mut Kiosk, 
     name: String,
-    nft: ID,
+    nft_id: ID,
 ) {
     auth.verify_with_role<DelistCommand>(account.addr(), name);
     assert!(has_lock(account, name), ENoLock);
 
     let cap: &KioskOwnerCap = account.borrow_managed_object(KioskOwnerKey { name }, version::current());
-    kiosk.delist<Nft>(cap, nft);
+    kiosk.delist<Nft>(cap, nft_id);
 }
 
 /// Members can withdraw the profits to the account

diff --git a/packages/actions/tests/access_control_tests.move b/packages/actions/tests/access_control_tests.move
@@ -72,8 +72,10 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::access_control::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/actions/tests/config_tests.move b/packages/actions/tests/config_tests.move
@@ -78,17 +78,21 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::config::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 
 fun upgrade_policies_role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::upgrade_policies::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/actions/tests/currency_tests.move b/packages/actions/tests/currency_tests.move
@@ -85,8 +85,10 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::currency::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/actions/tests/kiosk_tests.move b/packages/actions/tests/kiosk_tests.move
@@ -102,8 +102,10 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::kiosk::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/actions/tests/treasury_tests.move b/packages/actions/tests/treasury_tests.move
@@ -90,8 +90,10 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::treasury::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/actions/tests/upgrade_policies_tests.move b/packages/actions/tests/upgrade_policies_tests.move
@@ -71,8 +71,10 @@ fun role(action: vector<u8>, name: vector<u8>): String {
     let mut full_role = @account_actions.to_string();
     full_role.append_utf8(b"::upgrade_policies::");
     full_role.append_utf8(action);
-    full_role.append_utf8(b"::");
-    full_role.append_utf8(name);
+    if (!name.is_empty()) {
+        full_role.append_utf8(b"::");
+        full_role.append_utf8(name);
+    };
     full_role
 }
 

diff --git a/packages/protocol/sources/auth.move b/packages/protocol/sources/auth.move
@@ -72,8 +72,11 @@ public fun verify_with_role<Role>(
     name: String,
 ) {
     let mut r = type_name::get<Role>().into_string().to_string();  
-    r.append_utf8(b"::");
-    r.append(name);
+
+    if (!name.is_empty()) {
+        r.append_utf8(b"::");
+        r.append(name);
+    };
 
     let Auth { role, account_addr } = auth;