metaclassing / PHP7-Laravel5-EnterpriseAuth

src/Controllers/WebAuthController.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $destination = $request->session()
                                ->get('oauthIntendedUrl');
         // If there is no intended destination url, use the default
-        if (! $destination) {
+        if (!$destination) {
             $destination = config('enterpriseauth.redirect_on_login');
         }
         \Illuminate\Support\Facades\Log::info('AUTH success USER ID '.$user->id.' with redirect url '.$destination);

Indentation +5 added lines, -5 removed lines

@@ -40,7 +40,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);
     }
@@ -57,8 +57,8 @@ 
     public function buildAuthUrl()
     {
         $url = $this->azureActiveDirectory->authorizationEndpoint
-             .'?'
-             .$this->buildAuthUrlQueryString();
+                .'?'
+                .$this->buildAuthUrlQueryString();
 
         return $url;
     }
@@ -100,7 +100,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');
@@ -126,7 +126,7 @@ 
                 'client_secret' => config('enterpriseauth.credentials.client_secret'),
                 'redirect_uri'  => config('enterpriseauth.credentials.callback_url'),
                 'grant_type'    => 'authorization_code',
-             ],
+                ],
         ];
         $response = $guzzle->post($url, $parameters);
         $responseObject = json_decode($response->getBody());

src/Controllers/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 +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);
         }
@@ -96,7 +96,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
@@ -105,7 +105,7 @@ 
         $asciicert = str_replace("\t", '', $_SERVER['SSL_CLIENT_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
@@ -119,12 +119,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);

src/Controllers/ApiAuthController.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,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/ServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
             // Go through all the credential config and make sure they are set in the .env or config file
             foreach (config('enterpriseauth.credentials') as $config => $env) {
                 // If one isnt set, throw a red flat until the person fixes it
-                if (! config('enterpriseauth.credentials.'.$config)) {
+                if (!config('enterpriseauth.credentials.'.$config)) {
                     throw new \Exception('enterpriseauth setup error: missing mandatory config value for enterpriseauth.credentials.'.$config.' check your .env file!');
                 }
             }
@@ -59,7 +59,7 @@ 
         // Override the application configuration to use our oauth token guard driver at runtime
         config(['auth.guards.api.driver' => 'oauthtoken']);
         // Now I have a machine gun. ho ho ho!
-        \Illuminate\Support\Facades\Auth::extend('oauthtoken', function ($app, $name, array $config) {
+        \Illuminate\Support\Facades\Auth::extend('oauthtoken', function($app, $name, array $config) {
             $userProvider = \Illuminate\Support\Facades\Auth::createUserProvider($config['provider']);
 
             return new \Metaclassing\EnterpriseAuth\Middleware\OauthTokenGuard($userProvider, $app->make('request'));
@@ -69,13 +69,13 @@ 
     protected function configureSwaggerToScanEnterpriseAuthRouteFiles()
     {
         $swaggerScanPaths = config('l5-swagger.paths.annotations');
-        if (! is_array($swaggerScanPaths)) {
+        if (!is_array($swaggerScanPaths)) {
             $swaggerScanPaths = [$swaggerScanPaths];
         }
-        if (! in_array(base_path('routes'), $swaggerScanPaths)) {
+        if (!in_array(base_path('routes'), $swaggerScanPaths)) {
             $swaggerScanPaths[] = base_path('routes');
         }
-        if (! in_array(__DIR__.'/../routes/', $swaggerScanPaths)) {
+        if (!in_array(__DIR__.'/../routes/', $swaggerScanPaths)) {
             $swaggerScanPaths[] = __DIR__.'/../routes/';
         }
         config(['l5-swagger.paths.annotations' => $swaggerScanPaths]);
@@ -85,7 +85,7 @@ 
     {
         // If the routes files for the swagger oauth config is NOT present, and we have all the right info, then generate it really quick
         $swaggerAzureadFile = __DIR__.'/../routes/swagger.azuread.php';
-        if (! file_exists($swaggerAzureadFile)) {
+        if (!file_exists($swaggerAzureadFile)) {
             $aad = new AzureActiveDirectory(config('enterpriseauth.credentials.tenant'));
             //$authorizationUrl = $aad->authorizationEndpoint . '?resource=https://graph.microsoft.com';
             $authorizationUrl = $aad->authorizationEndpoint;

routes/web.microsoft.php

Spacing +4 added lines, -4 removed lines

@@ -1,19 +1,19 @@
 <?php
 
-Route::middleware([config('enterpriseauth.routes.middleware')])->group(function () {
+Route::middleware([config('enterpriseauth.routes.middleware')])->group(function() {
     Route::get(config('enterpriseauth.routes.login'), 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@redirectToOauthProvider');
     Route::get(config('enterpriseauth.routes.logout'), 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@logoutFromOauthProvider');
     Route::get(config('enterpriseauth.routes.callback'), 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@handleOauthResponse');
     Route::get(config('enterpriseauth.routes.adminconsent'), 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@redirectToOauthAdminConsent');
 
     // This handles a situation where a route with the NAME of login does not exist, we define it to keep from breaking framework redirects hard coded
-    if (! \Route::has('login')) {
+    if (!\Route::has('login')) {
         Route::get('login', 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@loginOrRegister')->name('login');
     }
-    if (! \Route::has('register')) {
+    if (!\Route::has('register')) {
         Route::get('register', 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@loginOrRegister')->name('register');
     }
-    if (! \Route::has('logout')) {
+    if (!\Route::has('logout')) {
         Route::get('logout', 'Metaclassing\EnterpriseAuth\Controllers\WebAuthController@logout')->name('logout');
     }
 });

publish/database/migrations/2018_05_15_152839_create_azure_apps_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('azure_apps', function (Blueprint $table) {
+        Schema::create('azure_apps', function(Blueprint $table) {
             // Auto increment for unique id
             $table->increments('id');
             // Some human readable name