ShibIdentity improvements

CornellCustomDev · Dec 5, 2024 · 65bd7af · 65bd7af
1 parent 52b7b48
commit 65bd7af
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/CUAuth/DataObjects/ShibIdentity.php b/src/CUAuth/DataObjects/ShibIdentity.php
@@ -27,7 +27,7 @@ public function __construct(
         public readonly string $idp,
         public readonly string $uid,
         public readonly string $displayName = '',
-        public readonly string $mail = '',
+        public readonly string $email = '',
         public readonly array $serverVars = [],
     ) {}
 
@@ -46,14 +46,18 @@ public static function fromServerVars(?array $serverVars = null): self
             displayName: $serverVars['displayName']
                 ?? $serverVars['cn']
                 ?? trim(($serverVars['givenName'] ?? '').' '.($serverVars['sn'] ?? '')),
-            mail: $serverVars['eduPersonPrincipalName']
+            email: $serverVars['eduPersonPrincipalName']
                 ?? $serverVars['mail'] ?? '',
             serverVars: $serverVars,
         );
     }
 
-    public static function getRemoteUser(Request $request): ?string
+    public static function getRemoteUser(?Request $request = null): ?string
     {
+        if (empty($request)) {
+            $request = app('request');
+        }
+
         // If this is a local development environment, allow the local override.
         $remote_user_override = self::getRemoteUserOverride();
 
@@ -93,7 +97,7 @@ public function uniqueUid(): string
      */
     public function email(): string
     {
-        return $this->mail;
+        return $this->email;
     }
 
     /**