24Slides / auth-connector

src/TokenGuard.php

Braces +1 added lines, -2 removed lines

@@ -171,8 +171,7 @@
         try
         {
             $data = (array) \Firebase\JWT\JWT::decode($token, env('JWT_SECRET'), ['HS256']);
-        }
-        catch(\RuntimeException $e) {
+        } catch(\RuntimeException $e) {
             $this->logout();
 
             return null;

Spacing +12 added lines, -12 removed lines

@@ -82,11 +82,11 @@ 
     {
         $this->client->request('login', compact('email', 'password', 'remember'));
 
-        if(!$this->client->success()) {
+        if (!$this->client->success()) {
             return false;
         }
 
-        if(!$this->token = $this->client->getToken()) {
+        if (!$this->token = $this->client->getToken()) {
             return false;
         }
 
@@ -113,11 +113,11 @@ 
     {
         $this->client->request('unsafeLogin', compact('email', 'remember'));
 
-        if(!$this->client->success()) {
+        if (!$this->client->success()) {
             return false;
         }
 
-        if(!$this->token = $this->client->getToken()) {
+        if (!$this->token = $this->client->getToken()) {
             return false;
         }
 
@@ -136,15 +136,15 @@ 
         // If we've already retrieved the user for the current request we can just
         // return it back immediately. We do not want to fetch the user data on
         // every call to this method because that would be tremendously slow.
-        if (! is_null($this->user)) {
+        if (!is_null($this->user)) {
             return $this->user;
         }
 
         $user = null;
 
-        if($token = $this->token()) {
-            if(!$user = $this->retrieveUserFromToken($token)) {
-                if(!$user = $this->syncInstantly()) {
+        if ($token = $this->token()) {
+            if (!$user = $this->retrieveUserFromToken($token)) {
+                if (!$user = $this->syncInstantly()) {
                     $this->logout();
                 }
             }
@@ -160,7 +160,7 @@ 
      */
     public function token()
     {
-        if($this->token) {
+        if ($this->token) {
             return $this->token;
         }
 
@@ -209,13 +209,13 @@ 
         {
             $data = (array) \Firebase\JWT\JWT::decode($token, env('JWT_SECRET'), ['HS256']);
         }
-        catch(\RuntimeException $e) {
+        catch (\RuntimeException $e) {
             $this->logout();
 
             return null;
         }
 
-        if(!$userId = array_get($data, 'userId')) {
+        if (!$userId = array_get($data, 'userId')) {
             return null;
         }
 
@@ -231,7 +231,7 @@ 
      */
     private function syncInstantly()
     {
-        if($user = $this->authService->retrieveByToken()) {
+        if ($user = $this->authService->retrieveByToken()) {
             return $this->authService->handle('sync.create', ['remote' => $user]);
         }
 

src/Client.php

Indentation +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
         $this->formatted = $decoded;
 
         if($this->success()) {
-           return $this->formatted;
+            return $this->formatted;
         }
 
         $message = array_get($this->formatted, 'message');

Spacing +9 added lines, -9 removed lines

@@ -61,15 +61,15 @@ 
      */
     protected function boot()
     {
-        if(!$publicKey = $this->credential('public')) {
+        if (!$publicKey = $this->credential('public')) {
             throw new \InvalidArgumentException('Public key must be defined');
         }
 
-        if(!$secretKey = $this->credential('secret')) {
+        if (!$secretKey = $this->credential('secret')) {
             throw new \InvalidArgumentException('Secret key must be defined');
         }
 
-        if(!$this->client) {
+        if (!$this->client) {
             $handler = new \GuzzleHttp\HandlerStack();
             $handler->setHandler(new \GuzzleHttp\Handler\CurlHandler());
             $handler->push($this->bearerTokenHeader());
@@ -243,11 +243,11 @@ 
      */
     public function request(string $name, array $parameters = []): array
     {
-        if(!$this->hasRequest($name)) {
+        if (!$this->hasRequest($name)) {
             throw new \InvalidArgumentException("Request `{$name}` is not supported");
         }
 
-        if(!method_exists($this, $name)) {
+        if (!method_exists($this, $name)) {
             throw new \InvalidArgumentException("Request `{$name}` listed but is not implemented");
         }
 
@@ -277,7 +277,7 @@ 
      */
     public function success(bool $withStatus = false): bool
     {
-        if(!$this->response || $this->response->getStatusCode() !== 200) {
+        if (!$this->response || $this->response->getStatusCode() !== 200) {
             return false;
         }
 
@@ -341,7 +341,7 @@ 
 
         $this->formatted = $decoded;
 
-        if($this->success()) {
+        if ($this->success()) {
            return $this->formatted;
         }
 
@@ -369,7 +369,7 @@ 
      */
     private function bearerToken()
     {
-        if(!$token = app('auth')->token()) {
+        if (!$token = app('auth')->token()) {
             return null;
         }
 
@@ -384,7 +384,7 @@ 
     public function bearerTokenHeader(): \Closure
     {
         return function(callable $handler) {
-            return function (\Psr\Http\Message\RequestInterface $request, array $options) use ($handler) {
+            return function(\Psr\Http\Message\RequestInterface $request, array $options) use ($handler) {
                 $request = $request->withHeader('Authorization', $this->bearerToken());
 
                 return $handler($request, $options);

src/ServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -73,7 +73,7 @@ 
      */
     protected function loadConsoleCommands()
     {
-        if(!$this->app->runningInConsole()) {
+        if (!$this->app->runningInConsole()) {
             return;
         }
 
@@ -91,7 +91,7 @@ 
     protected function loadGuards()
     {
         // Skip loading guards if an application running in the console
-        if($this->app->runningInConsole()) {
+        if ($this->app->runningInConsole()) {
             return;
         }
 
@@ -99,7 +99,7 @@ 
             $this->app['auth']->guard('authService')
         );
 
-        if(!$this->enabled()) {
+        if (!$this->enabled()) {
             $this->app['authService']->setFallbackGuard(
                 $this->app['auth']->guard('fallback')
             );
@@ -136,7 +136,7 @@ 
         });
 
         // Register the fallback driver if service is disabled
-        if(!$this->enabled()) {
+        if (!$this->enabled()) {
             $this->app['auth']->shouldUse('fallback');
         }
     }

src/Exceptions/ValidationException.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $messages = [];
 
         foreach (json_decode($message, true) as $property => $attributeMessages) {
-            if(in_array($property, static::$attributeHides)) {
+            if (in_array($property, static::$attributeHides)) {
                 continue;
             }
 

src/Concerns/ResetsPasswords.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function showResetForm(string $token, string $email)
     {
-        if(!$email = AuthService::validatePasswordResetToken($token, $email)) {
+        if (!$email = AuthService::validatePasswordResetToken($token, $email)) {
             throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
         }
 
@@ -48,13 +48,13 @@ 
     {
         $this->validate($request, $this->rules(), $this->validationErrorMessages());
 
-        if(AuthService::resetPassword(
+        if (AuthService::resetPassword(
             $request->input('token'),
             $email = $request->input('email'),
             $password = $request->input('password'),
             $request->input('password_confirmation')
         )) {
-            if(AuthService::login($email, $password)) {
+            if (AuthService::login($email, $password)) {
                 return $this->sendResetResponse(PasswordBroker::PASSWORD_RESET);
             }
         }

src/Commands/SyncUsers.php

Spacing +7 added lines, -7 removed lines

@@ -74,12 +74,12 @@ 
             ->newQuery()
             ->get();
 
-        if($users->isEmpty()) {
+        if ($users->isEmpty()) {
             $this->info('No users found.');
             return;
         }
 
-        if(!$this->confirm('There are ' . $users->count() . ' users to sync. Continue?')) {
+        if (!$this->confirm('There are ' . $users->count() . ' users to sync. Continue?')) {
             return;
         }
 
@@ -93,7 +93,7 @@ 
 
         $this->writeStats('Remote affection', array_keys($remoteStats), array_values($remoteStats));
 
-        if(!count($difference)) {
+        if (!count($difference)) {
             $this->info('There are no changes to apply locally.');
         }
         else {
@@ -187,7 +187,7 @@ 
         $email = $user->getEmail();
 
         // If a user already exists, skip the process
-        if(Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
+        if (Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
             $this->warn("User with email {$email} already exists, unable to create");
 
             return;
@@ -208,13 +208,13 @@ 
         $email = $user->getEmail();
 
         // If a user doesn't exist, skip the process
-        if(!$model = Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
+        if (!$model = Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
             $this->warn("User with email {$email} doesn't exist, unable to update");
 
             return;
         }
 
-        if(!$this->passwords) {
+        if (!$this->passwords) {
             $user->resetPassword();
         }
 
@@ -236,7 +236,7 @@ 
         $email = $user->getEmail();
 
         // If a user doesn't exist, skip the process
-        if(!$model = Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
+        if (!$model = Auth::getProvider()->retrieveByCredentials(['email' => $email])) {
             $this->warn("User with email {$email} doesn't exist, unable to delete");
 
             return;

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 
         if(!count($difference)) {
             $this->info('There are no changes to apply locally.');
-        }
-        else {
+        } else {
             $this->info('Remote changes detected, applying...');
 
             $localStats = $this->applyDifference($difference);

src/AuthService.php

Spacing +17 added lines, -17 removed lines

@@ -81,7 +81,7 @@ 
      */
     public function login(string $email, string $password, bool $remember = false)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('login', compact('email', 'password', 'remember'));
         }
 
@@ -103,7 +103,7 @@ 
      */
     public function unsafeLogin(string $email, bool $remember = false)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('unsafeLogin', compact('email', 'remember'));
         }
 
@@ -119,7 +119,7 @@ 
      */
     public function logout()
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('logout');
         }
 
@@ -141,7 +141,7 @@ 
      */
     public function register(int $userId, string $name, string $email, string $password, string $country)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return [];
         }
 
@@ -159,7 +159,7 @@ 
      */
     public function forgot(string $email)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('forgot', compact('email'));
         }
 
@@ -180,13 +180,13 @@ 
      */
     public function validatePasswordResetToken(string $token, string $email)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('validateReset', compact('token', 'email'));
         }
 
         $response = $this->client->request('validateReset', compact('token', 'email'));
 
-        if(!$this->client->success(true)) {
+        if (!$this->client->success(true)) {
             return false;
         }
 
@@ -209,13 +209,13 @@ 
     {
         $parameters = compact('token', 'email', 'password', 'confirmation');
 
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return $this->handleFallback('resetPassword', $parameters);
         }
 
         $response = $this->client->request('reset', $parameters);
 
-        if(!$this->client->success(true)) {
+        if (!$this->client->success(true)) {
             return false;
         }
 
@@ -234,7 +234,7 @@ 
      */
     public function update(int $id, ?string $name, ?string $email, ?string $password)
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return false;
         }
 
@@ -242,7 +242,7 @@ 
 
         $response = $this->client->request('update', compact('id', 'attributes'));
 
-        if(!$this->client->success(true)) {
+        if (!$this->client->success(true)) {
             return false;
         }
 
@@ -256,18 +256,18 @@ 
      */
     public function retrieveByToken()
     {
-        if($this->disabled()) {
+        if ($this->disabled()) {
             return null;
         }
 
         try {
             $response = $this->client->request('me');
         }
-        catch(\Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException $e) {
+        catch (\Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException $e) {
             return null;
         }
 
-        if(!$this->client->success(true)) {
+        if (!$this->client->success(true)) {
             return null;
         }
 
@@ -301,7 +301,7 @@ 
     {
         $handler = camel_case(str_replace('.', ' ', $key));
 
-        if(!method_exists($this->handlersContainer, $handler)) {
+        if (!method_exists($this->handlersContainer, $handler)) {
             throw new \InvalidArgumentException("Handler `{$handler}` cannot be found");
         }
 
@@ -346,10 +346,10 @@ 
         try {
             $output = $callback();
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
             DB::rollBack();
 
-            if(is_null($fallback)) {
+            if (is_null($fallback)) {
                 throw $e;
             }
 

Braces +2 added lines, -4 removed lines

@@ -262,8 +262,7 @@ 
 
         try {
             $response = $this->client->request('me');
-        }
-        catch(\Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException $e) {
+        } catch(\Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException $e) {
             return null;
         }
 
@@ -345,8 +344,7 @@ 
 
         try {
             $output = $callback();
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
             DB::rollBack();
 
             if(is_null($fallback)) {