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');
         }
 

Indentation +5 added lines, -5 removed lines

@@ -41,8 +41,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();
     }
@@ -173,9 +173,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();
             // TRY to add the user to each group they are assigned
             try {
                 $user->assign($groups);

src/Console/GenerateUIPreload.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $path = $this->option('destination');
         $path = reset($path);
         // otherwise use the default path
-        if (! $path) {
+        if (!$path) {
             $path = 'ui/preload.js';
         }
         // fully calculated path is APPDIR/public/ui/preload.js