SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Database/Migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php

Indentation +23 added lines, -23 removed lines

@@ -6,28 +6,28 @@
 
 class CreateOauthRefreshTokensTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
-            $table->string('id', 100)->primary();
-            $table->string('access_token_id', 100)->index();
-            $table->boolean('revoked');
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
+			$table->string('id', 100)->primary();
+			$table->string('access_token_id', 100)->index();
+			$table->boolean('revoked');
+			$table->dateTime('expires_at')->nullable();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('oauth_refresh_tokens');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('oauth_refresh_tokens');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
+        Schema::create('oauth_refresh_tokens', function(Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->string('access_token_id', 100)->index();
             $table->boolean('revoked');

src/Modules/V1/Acl/Database/Migrations/2016_06_01_000004_create_oauth_clients_table.php

Indentation +28 added lines, -28 removed lines

@@ -6,33 +6,33 @@
 
 class CreateOauthClientsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('oauth_clients', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id')->index()->nullable();
-            $table->string('name');
-            $table->string('secret', 100);
-            $table->text('redirect');
-            $table->boolean('personal_access_client');
-            $table->boolean('password_client');
-            $table->boolean('revoked');
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('oauth_clients', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_id')->index()->nullable();
+			$table->string('name');
+			$table->string('secret', 100);
+			$table->text('redirect');
+			$table->boolean('personal_access_client');
+			$table->boolean('password_client');
+			$table->boolean('revoked');
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('oauth_clients');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('oauth_clients');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_clients', function (Blueprint $table) {
+        Schema::create('oauth_clients', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id')->index()->nullable();
             $table->string('name');

src/Modules/V1/Acl/Database/Migrations/2016_06_01_000001_create_oauth_auth_codes_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,30 +6,30 @@
 
 class CreateOauthAuthCodesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('oauth_auth_codes', function (Blueprint $table) {
-            $table->string('id', 100)->primary();
-            $table->integer('user_id');
-            $table->integer('client_id');
-            $table->text('scopes')->nullable();
-            $table->boolean('revoked');
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('oauth_auth_codes', function (Blueprint $table) {
+			$table->string('id', 100)->primary();
+			$table->integer('user_id');
+			$table->integer('client_id');
+			$table->text('scopes')->nullable();
+			$table->boolean('revoked');
+			$table->dateTime('expires_at')->nullable();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('oauth_auth_codes');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('oauth_auth_codes');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('oauth_auth_codes', function (Blueprint $table) {
+        Schema::create('oauth_auth_codes', function(Blueprint $table) {
             $table->string('id', 100)->primary();
             $table->integer('user_id');
             $table->integer('client_id');

src/Modules/V1/Acl/Proxy/LoginProxy.php

Indentation +103 added lines, -103 removed lines

@@ -5,107 +5,107 @@
 
 class LoginProxy
 {
-    private $apiConsumer;
-
-    private $auth;
-
-    private $db;
-
-    private $request;
-
-    private $userRepository;
-
-    public function __construct(Application $app, UserRepository $userRepository) 
-    {
-
-        $this->userRepository = $userRepository;
-        $this->apiConsumer    = $app->make('apiconsumer');
-        $this->auth           = $app->make('auth');
-        $this->db             = $app->make('db');
-        $this->request        = $app->make('request');
-    }
-
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  array   $credentials
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        $user = $this->userRepository->login($credentials, $adminLogin);
-
-        return $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
-
-        \ErrorHandler::loginFailed();
-    }
-
-    /**
-     * Attempt to refresh the access token useing the given refresh token.
-     * 
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshtoken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
-
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array 
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => env('PASSWORD_CLIENT_ID'),
-            'client_secret' => env('PASSWORD_CLIENT_SECRET'),
-            'grant_type'    => $grantType
-        ]);
-
-        $response = $this->apiConsumer->post('/oauth/token', $data);
-
-        if ( ! $response->isSuccessful()) 
-        {
-            if ($grantType == 'refresh_token') 
-            {
-                \ErrorHandler::invalidRefreshToken();
-            }
-
-            \ErrorHandler::loginFailed();
-        }
-
-        $data = json_decode($response->getContent());
-
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
-
-    /**
-     * Logs out the user. We revoke access token and refresh token.
-     */
-    public function logout()
-    {
-        $accessToken = $this->auth->user()->token();
-
-        $refreshToken = $this->db
-            ->table('oauth_refresh_tokens')
-            ->where('access_token_id', $accessToken->id)
-            ->update([
-                'revoked' => true
-            ]);
-
-        $accessToken->revoke();
-    }
+	private $apiConsumer;
+
+	private $auth;
+
+	private $db;
+
+	private $request;
+
+	private $userRepository;
+
+	public function __construct(Application $app, UserRepository $userRepository) 
+	{
+
+		$this->userRepository = $userRepository;
+		$this->apiConsumer    = $app->make('apiconsumer');
+		$this->auth           = $app->make('auth');
+		$this->db             = $app->make('db');
+		$this->request        = $app->make('request');
+	}
+
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  array   $credentials
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		$user = $this->userRepository->login($credentials, $adminLogin);
+
+		return $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
+
+		\ErrorHandler::loginFailed();
+	}
+
+	/**
+	 * Attempt to refresh the access token useing the given refresh token.
+	 * 
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshtoken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
+
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array 
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => env('PASSWORD_CLIENT_ID'),
+			'client_secret' => env('PASSWORD_CLIENT_SECRET'),
+			'grant_type'    => $grantType
+		]);
+
+		$response = $this->apiConsumer->post('/oauth/token', $data);
+
+		if ( ! $response->isSuccessful()) 
+		{
+			if ($grantType == 'refresh_token') 
+			{
+				\ErrorHandler::invalidRefreshToken();
+			}
+
+			\ErrorHandler::loginFailed();
+		}
+
+		$data = json_decode($response->getContent());
+
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
+
+	/**
+	 * Logs out the user. We revoke access token and refresh token.
+	 */
+	public function logout()
+	{
+		$accessToken = $this->auth->user()->token();
+
+		$refreshToken = $this->db
+			->table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +101 added lines, -101 removed lines

@@ -2,105 +2,105 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => trans('errors.unAuthorized')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidRefreshToken()
-    {
-        $error = ['status' => 401, 'message' => trans('errors.invalidRefreshToken')];
-        abort($error['status'], $error['message']);
-    }
-
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.noPermissions')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.loginFailed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noSocialEmail()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.noSocialEmail')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userAlreadyRegistered()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.userAlreadyRegistered')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function connectionError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.connectionError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.redisNotRunning')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.dbQueryError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.cannotCreateSetting')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.cannotUpdateSettingKey')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => trans('errors.userIsBlocked')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidResetToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidResetPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidOldPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.invalidOldPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => trans('errors.notFound', ['replace' => $text])];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 400, 'message' => trans('errors.generalError')];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => trans('errors.unAuthorized')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidRefreshToken()
+	{
+		$error = ['status' => 401, 'message' => trans('errors.invalidRefreshToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.noPermissions')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.loginFailed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noSocialEmail()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.noSocialEmail')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userAlreadyRegistered()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.userAlreadyRegistered')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function connectionError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.connectionError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.redisNotRunning')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.dbQueryError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.cannotCreateSetting')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.cannotUpdateSettingKey')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => trans('errors.userIsBlocked')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidResetToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidResetPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidOldPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.invalidOldPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => trans('errors.notFound', ['replace' => $text])];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 400, 'message' => trans('errors.generalError')];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Database/Seeds/AssignRelationsSeeder.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@ 
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {	
-    	$adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{	
+		$adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin group.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function ($permission) use ($adminGroupId) {
-        	\DB::table('groups_permissions')->insert(
+		/**
+		 * Assign the permissions to the admin group.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function ($permission) use ($adminGroupId) {
+			\DB::table('groups_permissions')->insert(
 				[
 				'permission_id' => $permission->id,
 				'group_id'      => $adminGroupId,
@@ -27,6 +27,6 @@ 
 				'updated_at'    => \DB::raw('NOW()')
 				]
 			);
-        });
-    }
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin group.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function ($permission) use ($adminGroupId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings'])->each(function($permission) use ($adminGroupId) {
         	\DB::table('groups_permissions')->insert(
 				[
 				'permission_id' => $permission->id,

src/Modules/V1/Core/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-    	$permissions = \DB::table('permissions')->whereIn('model', ['settings']);
-        \DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['settings']);
+		\DB::table('groups_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/V1/Core/Database/Seeds/CoreDatabaseSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class CoreDatabaseSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $this->call(ClearDataSeeder::class);
-    	$this->call(SettingsTableSeeder::class);
-        $this->call(AssignRelationsSeeder::class);
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->call(ClearDataSeeder::class);
+		$this->call(SettingsTableSeeder::class);
+		$this->call(AssignRelationsSeeder::class);
+	}
 }

src/Modules/V1/Notifications/Http/Controllers/PushNotificationsDevicesController.php

Indentation +34 added lines, -34 removed lines

@@ -7,42 +7,42 @@
 
 class PushNotificationsDevicesController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model            = 'pushNotificationDevices';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model            = 'pushNotificationDevices';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['registerDevice'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['registerDevice'];
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'device_token' => 'required|string|max:255',
-    'user_id'      => 'required|exists:users,id'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'device_token' => 'required|string|max:255',
+	'user_id'      => 'required|exists:users,id'
+	];
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function registerDevice(Request $request)
-    {
-        $this->validate($request, [
-            'device_token' => 'required|string|max:255'
-            ]);
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function registerDevice(Request $request)
+	{
+		$this->validate($request, [
+			'device_token' => 'required|string|max:255'
+			]);
 
-        return \Response::json($this->repo->registerDevice($request->all()), 200);
-    }
+		return \Response::json($this->repo->registerDevice($request->all()), 200);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model            = 'pushNotificationDevices';
+    protected $model = 'pushNotificationDevices';
 
     /**
      * List of all route actions that the base api controller
@@ -26,7 +26,7 @@ 
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'device_token' => 'required|string|max:255',
     'user_id'      => 'required|exists:users,id'
     ];