small refactor

gofractally · Dec 12, 2024 · 0742dfc · 0742dfc
1 parent 46b0744
commit 0742dfc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/services/system/AuthDelegate/include/services/system/AuthDelegate.hpp b/services/system/AuthDelegate/include/services/system/AuthDelegate.hpp
@@ -85,7 +85,8 @@ namespace SystemService
       void setOwner(psibase::AccountNumber owner);
 
      private:
-      Tables db{psibase::getReceiver()};
+      Tables                 db{psibase::getReceiver()};
+      psibase::AccountNumber getOwner(psibase::AccountNumber account);
    };
    PSIO_REFLECT(AuthDelegate,  //
                 method(checkAuthSys, flags, requester, sender, action, allowedActions, claims),

diff --git a/services/system/AuthDelegate/src/AuthDelegate.cpp b/services/system/AuthDelegate/src/AuthDelegate.cpp
@@ -34,16 +34,14 @@ namespace SystemService
 
    void AuthDelegate::canAuthUserSys(psibase::AccountNumber user)
    {
-      auto row = db.open<AuthDelegateTable>().getIndex<0>().get(user);
-      check(row.has_value(), "sender does not have an owning account");
+      // Asserts if no owner is set for the user
+      getOwner(user);
    }
 
    bool AuthDelegate::isAuthSys(psibase::AccountNumber              sender,
                                 std::vector<psibase::AccountNumber> authorizers)
    {
-      auto record = db.open<AuthDelegateTable>().getIndex<0>().get(sender);
-      check(record.has_value(), "sender does not have an owning account");
-      auto owner = record->owner;
+      auto owner = getOwner(sender);
 
       if (std::ranges::contains(authorizers, owner))
          return true;
@@ -57,9 +55,7 @@ namespace SystemService
    bool AuthDelegate::isRejectSys(psibase::AccountNumber              sender,
                                   std::vector<psibase::AccountNumber> rejecters)
    {
-      auto record = db.open<AuthDelegateTable>().getIndex<0>().get(sender);
-      check(record.has_value(), "sender does not have an owning account");
-      auto owner = record->owner;
+      auto owner = getOwner(sender);
 
       if (std::ranges::contains(rejecters, owner))
          return true;
@@ -76,6 +72,13 @@ namespace SystemService
       authTable.put(AuthDelegateRecord{.account = getSender(), .owner = owner});
    }
 
+   psibase::AccountNumber AuthDelegate::getOwner(psibase::AccountNumber account)
+   {
+      auto row = db.open<AuthDelegateTable>().getIndex<0>().get(account);
+      check(row.has_value(), "account does not have an owning account");
+      return row->owner;
+   }
+
 }  // namespace SystemService
 
 PSIBASE_DISPATCH(SystemService::AuthDelegate)