get caller's hrn from the credentials gid_origin_caller object

diff --git a/sfa/methods/register.py b/sfa/methods/register.py
index 294b712..4ca7973 100644 (file)
--- a/sfa/methods/register.py
+++ b/sfa/methods/register.py
@@ -38,7 +38,14 @@ class register(Method):
 
     returns = Parameter(int, "String representation of gid object")
     
-    def call(self, cred, record_dict, request_hash=None, origin_hrn=None):
+    def call(self, cred, record_dict, request_hash=None):
+        user_cred = Credential(string=cred)
+
+        #log the call
+        gid_origin_caller = user_cred.get_gid_origin_caller()
+        origin_hrn = gid_origin_caller.get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+        
         # This cred will be an authority cred, not a user, so we cant use it to 
         # authenticate the caller's request_hash. Let just get the caller's gid
         # from the cred and authenticate using that 
@@ -46,11 +53,7 @@ class register(Method):
         client_gid_str = client_gid.save_to_string(save_parents=True)
         self.api.auth.authenticateGid(client_gid_str, [cred], request_hash)
         self.api.auth.check(cred, "register")
-        if origin_hrn==None:
-               origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
        
-        #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, None, self.name))
         record = GeniRecord(dict = record_dict)
         record['authority'] = get_authority(record['hrn'])
         type = record['type']