SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/Repositories/UserRepository.php

Indentation +26 added lines, -26 removed lines

@@ -293,14 +293,14 @@ 
 	 */
 	public function confirmEmail($confirmationCode)
 	{
-        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) 
-        {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
+		if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) 
+		{
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
 	}
 
 	/**
@@ -375,26 +375,26 @@ 
 		$this->save($data);
 	}
 
-    /**
-     * Ensure access token hasn't expired or revoked.
-     * 
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 * 
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) 
-        {
-            return true;
-        }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) 
+		{
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	/**
 	 * Revoke the given access token and all 

src/Modules/Acl/AclUser.php

Indentation +25 added lines, -25 removed lines

@@ -30,10 +30,10 @@ 
 		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
 	}
 
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
 	public function getProfilePictureAttribute($value)
 	{
 		return url(\Storage::url($value));
@@ -89,27 +89,27 @@ 
 	 * 
 	 * @return array
 	 */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) 
-        {
-            if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) 
-            {
-                continue;
-            }
-            else
-            {
-                $device->forceDelete();
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) 
+		{
+			if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) 
+			{
+				continue;
+			}
+			else
+			{
+				$device->forceDelete();
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
 
 	/**
 	 * The channels the user receives notification broadcasts on.

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
             if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) 
             {
                 continue;
-            }
-            else
+            } else
             {
                 $device->forceDelete();
             }