metaclassing / PHP7-Laravel5-EnterpriseAuth

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 +6 added lines, -6 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);

src/Controller/WebAuthController.php

Indentation +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
     public function buildAuthUrl()
     {
         $url = $this->azureActiveDirectory->authorizationEndpoint
-             .'?'
-             .$this->buildAuthUrlQueryString();
+                .'?'
+                .$this->buildAuthUrlQueryString();
 
         return $url;
     }
@@ -70,7 +70,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');
@@ -96,7 +96,7 @@ 
                 'client_secret' => env('AZURE_AD_CLIENT_SECRET'),
                 'redirect_uri'  => ENV('AZURE_AD_CALLBACK_URL'),
                 'grant_type'    => 'authorization_code',
-             ],
+                ],
         ];
         $response = $guzzle->post($url, $parameters);
         $responseObject = json_decode($response->getBody());

src/ServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -16,26 +16,26 @@ 
         // Make sure nobody is including or running this thing without all the required env settings
         $requiredVariables = ['AZURE_AD_CLIENT_ID', 'AZURE_AD_CLIENT_SECRET', 'AZURE_AD_TENANT', 'AZURE_AD_CALLBACK_URL'];
         foreach ($requiredVariables as $env) {
-            if (! env($env)) {
+            if (!env($env)) {
                 throw new \Exception('enterpriseauth setup error: missing mandatory .env value for '.$env);
             }
         }
 
         // Actually I have my own oauth token cache based authentication guard now lol
         config(['auth.guards.api.driver' => 'oauthtoken']);
-        Auth::extend('oauthtoken', function ($app, $name, array $config) {
+        Auth::extend('oauthtoken', function($app, $name, array $config) {
             return new OauthTokenGuard(Auth::createUserProvider($config['provider']), $app->make('request'));
         });
 
         // Make sure that this vendor dir and the routes dir are in any scanned paths for swagger documentation
         $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]);
@@ -65,7 +65,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(env('AZURE_AD_TENANT'));
             //$authorizationUrl = $aad->authorizationEndpoint . '?resource=https://graph.microsoft.com';
             $authorizationUrl = $aad->authorizationEndpoint;