metaclassing / PHP7-Laravel5-EnterpriseAuth

src/Controllers/AuthController.php

Spacing +6 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
     public function scrubMicrosoftGraphUserData($userData)
     {
         // Fix any stupid crap with missing or null fields
-        if (! isset($userData['mail']) || ! $userData['mail']) {
+        if (!isset($userData['mail']) || !$userData['mail']) {
             \Illuminate\Support\Facades\Log::debug('graph api did not contain mail field, using userPrincipalName instead '.json_encode($userData));
             $userData['mail'] = $userData['userPrincipalName'];
         }
@@ -65,7 +65,7 @@ 
         // Try to find an existing user
         $user = $userType::where($userIdField, $userData['id'])->first();
         // If we dont have an existing user
-        if (! $user) {
+        if (!$user) {
             // Go create a new one with this data
             $user = $this->createUserFromAzureData($userData);
         }
@@ -109,7 +109,7 @@ 
 
         // TODO: rewrite this so that if the user doesnt exist we create them and get their groups from AAD
         $user = $user_class::where('userPrincipalName', $upn)->first();
-        if (! $user) {
+        if (!$user) {
             throw new \Exception('No user found with user principal name '.$upn);
         }
 
@@ -119,7 +119,7 @@ 
     public function loadClientCertFromWebserver()
     {
         // Make sure we got a client certificate from the web server
-        if (! isset($_SERVER['SSL_CLIENT_CERT']) || ! $_SERVER['SSL_CLIENT_CERT']) {
+        if (!isset($_SERVER['SSL_CLIENT_CERT']) || !$_SERVER['SSL_CLIENT_CERT']) {
             throw new \Exception('TLS client certificate missing');
         }
         // try to parse the certificate we got
@@ -134,7 +134,7 @@ 
     public function getUserPrincipalNameFromClientCert($x509)
     {
         $names = $x509->getExtension('id-ce-subjectAltName');
-        if (! $names) {
+        if (!$names) {
             throw new \Exception('TLS client cert missing subject alternative names');
         }
         // Search subject alt names for user principal name
@@ -148,7 +148,7 @@ 
                 }
             }
         }
-        if (! $upn) {
+        if (!$upn) {
             throw new \Exception('Could not find user principal name in TLS client cert');
         }
 

src/Controllers/WebAuthController.php

Indentation +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
     public function redirectToOauthAdminConsent(\Illuminate\Http\Request $request)
     {
         $url = $this->azureActiveDirectory->buildAdminConsentUrl(config('enterpriseauth.credentials.client_id'),
-                                                                 config('enterpriseauth.credentials.callback_url'));
+                                                                    config('enterpriseauth.credentials.callback_url'));
         //return new \Illuminate\Http\RedirectResponse($url);
         return redirect($url);
     }
@@ -58,8 +58,8 @@ 
     public function buildAuthUrl()
     {
         $url = $this->azureActiveDirectory->authorizationEndpoint
-             .'?'
-             .$this->buildAuthUrlQueryString();
+                .'?'
+                .$this->buildAuthUrlQueryString();
 
         return $url;
     }
@@ -101,7 +101,7 @@ 
 
         // Check to see if there is an intended destination url saved
         $destination = $request->session()
-                               ->get('oauthIntendedUrl');
+                                ->get('oauthIntendedUrl');
         // If there is no intended destination url, use the default
         if (! $destination) {
             $destination = config('enterpriseauth.redirect_on_login');