metaclassing / PHP7-Laravel5-EnterpriseAuth

publish/database/migrations/2018_02_19_152839_alter_users_table_for_azure_ad.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::table('users', function (Blueprint $table) {
+        Schema::table('users', function(Blueprint $table) {
             // Users must be able to support blank passwords for external identity
             $table->string('password')->nullable()->change();
             // We need a new string field to store the oauth provider unique id in

src/UserFactory.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     public static function userCallback($callback)
     {
-        if (! is_callable($callback)) {
+        if (!is_callable($callback)) {
             throw new \Exception('Must provide a callable.');
         }
 

publish/app/User.php

Indentation +3 added lines, -3 removed lines

@@ -7,9 +7,9 @@
 
 class User extends Authenticatable implements
     \Illuminate\Contracts\Auth\Authenticatable,
-                                              \Illuminate\Contracts\Auth\Access\Authorizable,
-                                              \Illuminate\Contracts\Auth\CanResetPassword,
-                                              \Tymon\JWTAuth\Contracts\JWTSubject
+                                                \Illuminate\Contracts\Auth\Access\Authorizable,
+                                                \Illuminate\Contracts\Auth\CanResetPassword,
+                                                \Tymon\JWTAuth\Contracts\JWTSubject
 {
     use Notifiable;
     use \Silber\Bouncer\Database\HasRolesAndAbilities;

publish/routes/swagger.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 
     // Redirect requests to /api to the swagger documentation
     //$api->any('', function (Illuminate\Http\Request $request) {
-    $api->any('', function () {
+    $api->any('', function() {
         return redirect('api/documentation/');
     });
 
@@ -17,6 +17,6 @@ 
      *     @SWG\Response(response="200", description="Hello world example")
      * )
      **/
-    $api->any('/api/hello', function () {
+    $api->any('/api/hello', function() {
         return 'hello world';
     });

publish/routes/api.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  *     @SWG\Response(response="200", description="Hello world example")
  * )
  **/
-Route::middleware('api')->get('/hello', function (Request $request) {
+Route::middleware('api')->get('/hello', function(Request $request) {
     return 'hello world';
 });
 

src/AzureActiveDirectory.php

Indentation +3 added lines, -3 removed lines

@@ -46,9 +46,9 @@
     public function buildOpenIdConfigUrl()
     {
         $this->openIdConfigUrl = $this->baseUrl.'/'
-                               .$this->tenantName.'/'
-                               .$this->version.'/'
-                               .$this->wellKnownOpenIdConfig;
+                                .$this->tenantName.'/'
+                                .$this->version.'/'
+                                .$this->wellKnownOpenIdConfig;
     }
 
     public function downloadOpenIdConfig()

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         if ($tenantName != 'common') {
             // Make sure the tenant is formatted like xyzcorp.onmicrosoft.com
             $regex = '/\.onmicrosoft\.com/';
-            if (! preg_match($regex, $tenantName, $hits)) {
+            if (!preg_match($regex, $tenantName, $hits)) {
                 // Append the suffix if it is missing
                 $tenantName .= '.onmicrosoft.com';
             }

archive/GraphAPI.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     public function __construct($azureActiveDirectory)
     {
         // IF they didnt pre-populate all our AAD stuff then make a new one for the common tenant
-        if (! $azureActiveDirectory) {
+        if (!$azureActiveDirectory) {
             $azureActiveDirectory = new AzureActiveDirectory();
         }
         $this->azureActiveDirectory = $azureActiveDirectory;
@@ -27,7 +27,7 @@ 
 
     protected function getAccessToken()
     {
-        if (! $this->accessToken) {
+        if (!$this->accessToken) {
             $this->authenticateAsApplication();
         }
 

src/Middleware/OauthTokenGuard.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function check()
     {
-        return ! is_null($this->user());
+        return !is_null($this->user());
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     public function guest()
     {
-        return ! $this->check();
+        return !$this->check();
     }
 
     /**
@@ -77,7 +77,7 @@ 
      */
     public function user()
     {
-        if (! is_null($this->user)) {
+        if (!is_null($this->user)) {
             return $this->user;
         }
     }

src/Controller/AuthController.php

Indentation +5 added lines, -5 removed lines

@@ -39,8 +39,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();
     }
@@ -131,9 +131,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 +7 added lines, -7 removed lines

@@ -48,7 +48,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'];
         }
 
@@ -69,7 +69,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
             $UserFactory = new UserFactory();
             $user = $UserFactory->convertAzureUser($userData);
@@ -81,7 +81,7 @@ 
     public function certAuth()
     {
         // 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
@@ -90,7 +90,7 @@ 
         $asciicert = str_replace("\t", '', $_SERVER['SSL_CLIENT_CERT']);
         $cert = $x509->loadX509($asciicert);
         $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
@@ -104,12 +104,12 @@ 
                 }
             }
         }
-        if (! $upn) {
+        if (!$upn) {
             throw new \Exception('Could not find user principal name in TLS client cert');
         }
         $user_class = config('enterpriseauth.user_class');
         $user = $user_class::where('userPrincipalName', $upn)->first();
-        if (! $user) {
+        if (!$user) {
             throw new \Exception('No user found with user principal name '.$upn);
         }
         //dd($user);
@@ -123,7 +123,7 @@ 
 
         // Process group data into a list of displayNames we use as roles
         $groups = [];
-        foreach($groupData as $info) {
+        foreach ($groupData as $info) {
             $groups[] = $info['displayName'];
         }