metaclassing / PHP7-Laravel5-EnterpriseAuth

src/Controllers/ApiAuthController.php

Indentation +2 added lines, -2 removed lines

@@ -134,8 +134,8 @@
         }
         // Get the X509 certificate for the selected key id
         $certificate = '-----BEGIN CERTIFICATE-----'.PHP_EOL
-                     .$x5c.PHP_EOL
-                     .'-----END CERTIFICATE-----';
+                        .$x5c.PHP_EOL
+                        .'-----END CERTIFICATE-----';
         // Perform the verification and get the verified payload results
         $payload = \Firebase\JWT\JWT::decode($accessToken, $certificate, ['RS256']);
 

Spacing +5 added lines, -5 removed lines

@@ -100,7 +100,7 @@ 
         $app_id = $appData->azp;
         $app = \Metaclassing\EnterpriseAuth\Models\AzureApp::where('app_id', $app_id)->first();
         // If we dont have an existing app go create one
-        if (! $app) {
+        if (!$app) {
             $azureApp = [
                 'name'   => $app_id,
                 'app_id' => $app_id,
@@ -117,16 +117,16 @@ 
         // Unpack our jwt to verify it is correctly formed
         $token = $this->unpackJwt($accessToken);
         // app tokens must be signed in RSA
-        if (! isset($token['header']['alg']) || $token['header']['alg'] != 'RS256') {
+        if (!isset($token['header']['alg']) || $token['header']['alg'] != 'RS256') {
             throw new \Exception('Token is not using the correct signing algorithm RS256 '.$accessToken);
         }
         // app tokens are RSA signed with a key ID in the header of the token
-        if (! isset($token['header']['kid'])) {
+        if (!isset($token['header']['kid'])) {
             throw new \Exception('Token with unknown RSA key id can not be validated '.$accessToken);
         }
         // Make sure the key id is known to our azure ad information
         $kid = $token['header']['kid'];
-        if (! isset($this->azureActiveDirectory->signingKeys[$kid])) {
+        if (!isset($this->azureActiveDirectory->signingKeys[$kid])) {
             throw new \Exception('Token signed with unknown KID '.$kid);
         }
         // get the x509 encoded cert body
@@ -203,7 +203,7 @@ 
         $roles = $user->roles()->get()->all();
         foreach ($roles as $key => $role) {
             $role->permissions = $role->abilities()->get()->all();
-            if (! count($role->permissions)) {
+            if (!count($role->permissions)) {
                 unset($roles[$key]);
             }
         }

src/Controllers/AuthController.php

Indentation +6 added lines, -6 removed lines

@@ -40,8 +40,8 @@ 
         $graph = new \Microsoft\Graph\Graph();
         $graph->setAccessToken($accessToken);
         $user = $graph->createRequest('GET', '/me')
-                      ->setReturnType(\Microsoft\Graph\Model\User::class)
-                      ->execute();
+                        ->setReturnType(\Microsoft\Graph\Model\User::class)
+                        ->execute();
 
         return $user->jsonSerialize();
     }
@@ -97,7 +97,7 @@ 
     {
         // get the cert from the webserver and load it into an x509 phpseclib object
         $cert = $this->loadClientCertFromWebserver();
-         // extract the UPN from the client cert
+            // extract the UPN from the client cert
         $upn = $this->getUserPrincipalNameFromClientCert($cert);
         // get the user if it exists
         $user_class = config('enterpriseauth.user_class');
@@ -163,9 +163,9 @@ 
         if (count($groups)) {
             // remove the users existing database roles before assigning new ones
             \DB::table('assigned_roles')
-               ->where('entity_id', $user->id)
-               ->where('entity_type', get_class($user))
-               ->delete();
+                ->where('entity_id', $user->id)
+                ->where('entity_type', get_class($user))
+                ->delete();
             // add the user to each group they are assigned
             $user->assign($groups);
         }

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']) {
             $userData['mail'] = $userData['userPrincipalName'];
         }
 
@@ -64,7 +64,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);
         }
@@ -104,7 +104,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);
         }
 
@@ -114,7 +114,7 @@ 
     public function loadClientCertFromWebserver()
     {
         // Make sure we got a client certificate from the web server
-        if (! $_SERVER['SSL_CLIENT_CERT']) {
+        if (!$_SERVER['SSL_CLIENT_CERT']) {
             throw new \Exception('TLS client certificate missing');
         }
         // try to parse the certificate we got
@@ -128,7 +128,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
@@ -142,7 +142,7 @@ 
                 }
             }
         }
-        if (! $upn) {
+        if (!$upn) {
             throw new \Exception('Could not find user principal name in TLS client cert');
         }
         return $upn;