SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Notifications/Resources/Lang/ar/notifications.php

Indentation +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@
 
 return [
     
-    /**
-     * Here goes your notification messages.
-     */
+	/**
+	 * Here goes your notification messages.
+	 */
 
 ];
\ No newline at end of file

src/Modules/Notifications/Notifications/ConfirmEmail.php

Indentation +34 added lines, -34 removed lines

@@ -10,41 +10,41 @@
 
 class ConfirmEmail extends Notification implements ShouldQueue
 {
-    use Queueable;
+	use Queueable;
 
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
+	/**
+	 * Create a new notification instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		//
+	}
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
+	/**
+	 * Get the notification's delivery channels.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return array
+	 */
+	public function via($notifiable)
+	{
+		return ['mail'];
+	}
 
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-            ->subject('Email verification')
-            ->line('Email verification')
-            ->line('To validate your email click on the button below')
-            ->action('Verify your email', config('confrim_email_url') . '/' . $notifiable->confirmation_code));
-    }
+	/**
+	 * Get the mail representation of the notification.
+	 *
+	 * @param  mixed  $notifiable
+	 * @return \Illuminate\Notifications\Messages\MailMessage
+	 */
+	public function toMail($notifiable)
+	{
+		return (new MailMessage)
+			->subject('Email verification')
+			->line('Email verification')
+			->line('To validate your email click on the button below')
+			->action('Verify your email', config('confrim_email_url') . '/' . $notifiable->confirmation_code));
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,6 +45,6 @@
             ->subject('Email verification')
             ->line('Email verification')
             ->line('To validate your email click on the button below')
-            ->action('Verify your email', config('confrim_email_url') . '/' . $notifiable->confirmation_code));
+            ->action('Verify your email', config('confrim_email_url').'/'.$notifiable->confirmation_code));
     }
 }
\ No newline at end of file

src/Modules/Acl/Proxy/LoginProxy.php

Indentation +101 added lines, -101 removed lines

@@ -5,105 +5,105 @@
 
 class LoginProxy
 {
-    private $apiConsumer;
-
-    private $auth;
-
-    private $db;
-
-    private $request;
-
-    private $userRepository;
-
-    public function __construct(Application $app) 
-    {
-
-        $this->userRepository = $app->make('App\Modules\Acl\Repositories\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)
-    {
-        $this->userRepository->login($credentials, $adminLogin);
-
-        return $this->proxy('password', [
-            'username' => $credentials['email'],
-            'password' => $credentials['password']
-        ]);
-    }
-
-    /**
-     * 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'     => config('passport_client_id'),
-            'client_secret' => config('passport_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();
-
-        $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) 
+	{
+
+		$this->userRepository = $app->make('App\Modules\Acl\Repositories\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)
+	{
+		$this->userRepository->login($credentials, $adminLogin);
+
+		return $this->proxy('password', [
+			'username' => $credentials['email'],
+			'password' => $credentials['password']
+		]);
+	}
+
+	/**
+	 * 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'     => config('passport_client_id'),
+			'client_secret' => config('passport_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();
+
+		$this->db
+			->table('oauth_refresh_tokens')
+			->where('access_token_id', $accessToken->id)
+			->update([
+				'revoked' => true
+			]);
+
+		$accessToken->revoke();
+	}
 }
\ No newline at end of file

src/ApiSkeletonServiceProvider.php

Indentation +29 added lines, -29 removed lines

@@ -6,35 +6,35 @@
 
 class ApiSkeletonServiceProvider extends ServiceProvider
 {
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__.'/../Modules'                            => app_path('Modules'),
-            __DIR__.'/../lang'                               => base_path('resources/lang'),
-            __DIR__.'/../files/Handler.php'                  => base_path('app/Exceptions/Handler.php'),
-            __DIR__.'/../files/auth.php'                     => base_path('config/auth.php'),
-            __DIR__.'/../files/AuthServiceProvider.php'      => base_path('app/Providers/AuthServiceProvider.php'),
-            __DIR__.'/../files/BroadcastServiceProvider.php' => base_path('app/Providers/BroadcastServiceProvider.php'),
-            __DIR__.'/../files/Kernel.php'                   => base_path('app/Console/Kernel.php'),
-        ]);
+	/**
+	 * Perform post-registration booting of services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->publishes([
+			__DIR__.'/../Modules'                            => app_path('Modules'),
+			__DIR__.'/../lang'                               => base_path('resources/lang'),
+			__DIR__.'/../files/Handler.php'                  => base_path('app/Exceptions/Handler.php'),
+			__DIR__.'/../files/auth.php'                     => base_path('config/auth.php'),
+			__DIR__.'/../files/AuthServiceProvider.php'      => base_path('app/Providers/AuthServiceProvider.php'),
+			__DIR__.'/../files/BroadcastServiceProvider.php' => base_path('app/Providers/BroadcastServiceProvider.php'),
+			__DIR__.'/../files/Kernel.php'                   => base_path('app/Console/Kernel.php'),
+		]);
 
-        $this->publishes([
-            __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
-        ], 'config');
-    }
+		$this->publishes([
+			__DIR__.'/../config/skeleton.php' => config_path('skeleton.php'),
+		], 'config');
+	}
 
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+	/**
+	 * Register any package services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//
+	}
 }
\ No newline at end of file

files/AuthServiceProvider.php

Indentation +25 added lines, -25 removed lines

@@ -8,31 +8,31 @@
 
 class AuthServiceProvider extends ServiceProvider
 {
-    /**
-     * The policy mappings for the application.
-     *
-     * @var array
-     */
-    protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
-    ];
+	/**
+	 * The policy mappings for the application.
+	 *
+	 * @var array
+	 */
+	protected $policies = [
+		'App\Model' => 'App\Policies\ModelPolicy',
+	];
 
-    /**
-     * Register any authentication / authorization services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->registerPolicies();
+	/**
+	 * Register any authentication / authorization services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->registerPolicies();
 
-        Passport::routes(function ($router) {
-            $router->forAuthorization();
-            $router->forAccessTokens();
-            $router->forPersonalAccessTokens();
-            $router->forTransientTokens();
-        });
-        Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10));
-        Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10));
-    }
+		Passport::routes(function ($router) {
+			$router->forAuthorization();
+			$router->forAccessTokens();
+			$router->forPersonalAccessTokens();
+			$router->forTransientTokens();
+		});
+		Passport::tokensExpireIn(\Carbon\Carbon::now()->addMinutes(10));
+		Passport::refreshTokensExpireIn(\Carbon\Carbon::now()->addDays(10));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         $this->registerPolicies();
 
-        Passport::routes(function ($router) {
+        Passport::routes(function($router) {
             $router->forAuthorization();
             $router->forAccessTokens();
             $router->forPersonalAccessTokens();

files/auth.php

Indentation +35 added lines, -35 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Defaults
     |--------------------------------------------------------------------------
@@ -13,12 +13,12 @@ 
     |
     */
 
-    'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
-    ],
+	'defaults' => [
+		'guard' => 'web',
+		'passwords' => 'users',
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Guards
     |--------------------------------------------------------------------------
@@ -35,19 +35,19 @@ 
     |
     */
 
-    'guards' => [
-        'web' => [
-            'driver' => 'session',
-            'provider' => 'users',
-        ],
+	'guards' => [
+		'web' => [
+			'driver' => 'session',
+			'provider' => 'users',
+		],
 
-        'api' => [
-            'driver' => 'passport',
-            'provider' => 'users',
-        ],
-    ],
+		'api' => [
+			'driver' => 'passport',
+			'provider' => 'users',
+		],
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | User Providers
     |--------------------------------------------------------------------------
@@ -64,19 +64,19 @@ 
     |
     */
 
-    'providers' => [
-        'users' => [
-            'driver' => 'eloquent',
-            'model' => App\Modules\Acl\AclUser::class,
-        ],
+	'providers' => [
+		'users' => [
+			'driver' => 'eloquent',
+			'model' => App\Modules\Acl\AclUser::class,
+		],
 
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
-    ],
+		// 'users' => [
+		//     'driver' => 'database',
+		//     'table' => 'users',
+		// ],
+	],
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Resetting Passwords
     |--------------------------------------------------------------------------
@@ -91,12 +91,12 @@ 
     |
     */
 
-    'passwords' => [
-        'users' => [
-            'provider' => 'users',
-            'table' => 'password_resets',
-            'expire' => 60,
-        ],
-    ],
+	'passwords' => [
+		'users' => [
+			'provider' => 'users',
+			'table' => 'password_resets',
+			'expire' => 60,
+		],
+	],
 
 ];

files/Handler.php

Indentation +74 added lines, -74 removed lines

@@ -7,81 +7,81 @@
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        \League\OAuth2\Server\Exception\OAuthServerException::class,
-    ];
+	/**
+	 * A list of the exception types that are not reported.
+	 *
+	 * @var array
+	 */
+	protected $dontReport = [
+		\League\OAuth2\Server\Exception\OAuthServerException::class,
+	];
 
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
-     */
-    protected $dontFlash = [
-        'password',
-        'password_confirmation',
-    ];
+	/**
+	 * A list of the inputs that are never flashed for validation exceptions.
+	 *
+	 * @var array
+	 */
+	protected $dontFlash = [
+		'password',
+		'password_confirmation',
+	];
 
-    /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
-     * @return void
-     */
-    public function report(Exception $exception)
-    {
-        parent::report($exception);
-    }
+	/**
+	 * Report or log an exception.
+	 *
+	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+	 *
+	 * @param  \Exception  $exception
+	 * @return void
+	 */
+	public function report(Exception $exception)
+	{
+		parent::report($exception);
+	}
 
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        if ($request->wantsJson())
-        {
-            if ($exception instanceof \Illuminate\Auth\AuthenticationException) 
-            {
-                \ErrorHandler::unAuthorized();
-            }
-            if ($exception instanceof \Illuminate\Database\QueryException) 
-            {
-                \ErrorHandler::dbQueryError();
-            }
-            else if ($exception instanceof \predis\connection\connectionexception) 
-            {
-                \ErrorHandler::redisNotRunning();
-            }
-            else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
-            {
-                \ErrorHandler::connectionError();
-            }
-            else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
-            {
-                return \Response::json($exception->getMessage(), $exception->getStatusCode());   
-            }
-            else if ($exception instanceof \Illuminate\Validation\ValidationException) 
-            {
-                return \Response::json($exception->errors(), 422);   
-            }
-            else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
-            {
-                return parent::render($request, $exception);
-            }
-        }
-        else
-        {
-            return parent::render($request, $exception);
-        }
-    }
+	/**
+	 * Render an exception into an HTTP response.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Exception  $exception
+	 * @return \Illuminate\Http\Response
+	 */
+	public function render($request, Exception $exception)
+	{
+		if ($request->wantsJson())
+		{
+			if ($exception instanceof \Illuminate\Auth\AuthenticationException) 
+			{
+				\ErrorHandler::unAuthorized();
+			}
+			if ($exception instanceof \Illuminate\Database\QueryException) 
+			{
+				\ErrorHandler::dbQueryError();
+			}
+			else if ($exception instanceof \predis\connection\connectionexception) 
+			{
+				\ErrorHandler::redisNotRunning();
+			}
+			else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
+			{
+				\ErrorHandler::connectionError();
+			}
+			else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
+			{
+				return \Response::json($exception->getMessage(), $exception->getStatusCode());   
+			}
+			else if ($exception instanceof \Illuminate\Validation\ValidationException) 
+			{
+				return \Response::json($exception->errors(), 422);   
+			}
+			else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
+			{
+				return parent::render($request, $exception);
+			}
+		}
+		else
+		{
+			return parent::render($request, $exception);
+		}
+	}
 }

Braces +6 added lines, -12 removed lines

@@ -57,29 +57,23 @@
             if ($exception instanceof \Illuminate\Database\QueryException) 
             {
                 \ErrorHandler::dbQueryError();
-            }
-            else if ($exception instanceof \predis\connection\connectionexception) 
+            } else if ($exception instanceof \predis\connection\connectionexception) 
             {
                 \ErrorHandler::redisNotRunning();
-            }
-            else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
+            } else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
             {
                 \ErrorHandler::connectionError();
-            }
-            else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
+            } else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
             {
                 return \Response::json($exception->getMessage(), $exception->getStatusCode());   
-            }
-            else if ($exception instanceof \Illuminate\Validation\ValidationException) 
+            } else if ($exception instanceof \Illuminate\Validation\ValidationException) 
             {
                 return \Response::json($exception->errors(), 422);   
-            }
-            else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
+            } else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
             {
                 return parent::render($request, $exception);
             }
-        }
-        else
+        } else
         {
             return parent::render($request, $exception);
         }

files/BroadcastServiceProvider.php

Indentation +10 added lines, -10 removed lines

@@ -7,15 +7,15 @@
 
 class BroadcastServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        Broadcast::routes(['middleware' => ['auth:api']]);
+	/**
+	 * Bootstrap any application services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		Broadcast::routes(['middleware' => ['auth:api']]);
 
-        require base_path('routes/channels.php');
-    }
+		require base_path('routes/channels.php');
+	}
 }

files/Kernel.php

Indentation +31 added lines, -31 removed lines

@@ -9,38 +9,38 @@
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        GenerateDoc::class,
-        MakeNotificationsCommand::class,
-        UpdateTeachersWorkingHoursCommand::class
-    ];
+	/**
+	 * The Artisan commands provided by your application.
+	 *
+	 * @var array
+	 */
+	protected $commands = [
+		GenerateDoc::class,
+		MakeNotificationsCommand::class,
+		UpdateTeachersWorkingHoursCommand::class
+	];
 
-    /**
-     * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
-     */
-    protected function schedule(Schedule $schedule)
-    {
-        // $schedule->command('inspire')
-        //          ->hourly();
-    }
+	/**
+	 * Define the application's command schedule.
+	 *
+	 * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+	 * @return void
+	 */
+	protected function schedule(Schedule $schedule)
+	{
+		// $schedule->command('inspire')
+		//          ->hourly();
+	}
 
-    /**
-     * Register the commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        $this->load(__DIR__.'/Commands');
+	/**
+	 * Register the commands for the application.
+	 *
+	 * @return void
+	 */
+	protected function commands()
+	{
+		$this->load(__DIR__.'/Commands');
 
-        require base_path('routes/console.php');
-    }
+		require base_path('routes/console.php');
+	}
 }