metaclassing / PHP7-Laravel5-EnterpriseAuth

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

src/AzureActiveDirectory.php

Indentation +7 added lines, -7 removed lines

@@ -46,18 +46,18 @@
     public function buildOpenIdConfigUrl()
     {
         $this->openIdConfigUrl = $this->baseUrl.'/'
-                               .$this->tenantName.'/'
-                               .$this->version.'/'
-                               .$this->wellKnownOpenIdConfig;
+                                .$this->tenantName.'/'
+                                .$this->version.'/'
+                                .$this->wellKnownOpenIdConfig;
     }
 
     public function buildAdminConsentUrl($clientId, $redirectUri)
     {
         $url = $this->baseUrl.'/'
-             .$this->tenantName.'/'
-             .'adminconsent'
-             .'?client_id='.$clientId
-             .'&redirect_uri='.$redirectUri;
+                .$this->tenantName.'/'
+                .'adminconsent'
+                .'?client_id='.$clientId
+                .'&redirect_uri='.$redirectUri;
 
         return $url;
     }

Spacing +2 added lines, -2 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';
             }
@@ -80,7 +80,7 @@ 
         $keyData = json_decode($json, true);
         $keyRing = $keyData['keys'];
         // Loop through the keys and build us an index by kid
-        foreach($keyRing as $key) {
+        foreach ($keyRing as $key) {
             $this->signingKeys[$key['kid']] = $key;
         }
     }

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

src/Controllers/ApiAuthController.php

Indentation +2 added lines, -2 removed lines

@@ -133,8 +133,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, array('RS256'));
 

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,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) {
             $app = \Metaclassing\EnterpriseAuth\Models\AzureApp::create();
             $app->name   = $app_id;
             $app->app_id = $app_id;
@@ -113,16 +113,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
@@ -133,7 +133,7 @@ 
         }
         // Get the X509 certificate for the selected key id
         $certificate = '-----BEGIN CERTIFICATE-----'.PHP_EOL
-                     . $x5c . PHP_EOL
+                     . $x5c.PHP_EOL
                      . '-----END CERTIFICATE-----';
         // Perform the verification and get the verified payload results
         $payload = \Firebase\JWT\JWT::decode($accessToken, $certificate, array('RS256'));
@@ -199,7 +199,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]);
             }
         }