generate valid Guid to match the validation.

silverstripe · Nov 23, 2023 · faaeb60 · faaeb60
1 parent 81d60dc
commit faaeb60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Control/SAMLController.php b/src/Control/SAMLController.php
@@ -153,8 +153,6 @@ public function acs()
             return $this->getRedirect();
         }
 
-        $this->extend('updateGuid', $guid);
-
         $attributes = $auth->getAttributes();
 
         // Allows setups that map GUID (email format) to email {@see SAMLConfiguration::$expose_guid_as_attribute}.
@@ -163,6 +161,7 @@ public function acs()
         }
 
         $this->extend('updateAttributes', $attributes);
+        $this->extend('updateGuid', $guid);
 
         $fieldToClaimMap = array_flip(Member::config()->claims_field_mappings);
 

diff --git a/src/Helpers/SAMLHelper.php b/src/Helpers/SAMLHelper.php
@@ -124,7 +124,7 @@ public function binToStrGuid($object_guid)
             $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
         }
         $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
-        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
+        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20, 12);
         return strtoupper($hex_guid_to_guid_str);
     }