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

Indentation +4 added lines, -4 removed lines

@@ -18,12 +18,12 @@
             $table->string('password')->nullable()->change();
             // We need a new string field to store the oauth provider unique id in
             $table->string('azure_id', 36)
-                  ->nullable()
-                  ->after('email');
+                    ->nullable()
+                    ->after('email');
             // We need a new string field to store the user principal name in
             $table->string('userPrincipalName')
-                  ->nullable()
-                  ->after('azure_id');
+                    ->nullable()
+                    ->after('azure_id');
         });
         // We dont support password resets because social identity is external
         Schema::dropIfExists('password_resets');

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

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

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

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

routes/api.microsoft.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // Authenticated user information routes
-Route::middleware([config('enterpriseauth.apiroutes.middleware'), config('enterpriseauth.apiroutes.authmiddleware')])->group(function () {
+Route::middleware([config('enterpriseauth.apiroutes.middleware'), config('enterpriseauth.apiroutes.authmiddleware')])->group(function() {
 
     /**
      * @SWG\Get(

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

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;