SherifElfadaly / Laravel-Api-Skeleton

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');
+	}
 }

src/Modules/Notifications/Notifications/ConfirmEmail.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * Get the notification's delivery channels.
      *
      * @param  mixed  $notifiable
-     * @return array
+     * @return string[]
      */
     public function via($notifiable)
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Messages\BroadcastMessage;
 
 class ConfirmEmail extends Notification implements ShouldQueue
 {

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('skeleton.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('skeleton.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('skeleton.confrim_email_url') . '/' . $notifiable->confirmation_code);
+            ->action('Verify your email', config('skeleton.confrim_email_url').'/'.$notifiable->confirmation_code);
     }
 }
\ No newline at end of file

files/Kernel.php

Indentation +30 added lines, -30 removed lines

@@ -9,37 +9,37 @@
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        GenerateDoc::class,
-        MakeNotificationsCommand::class
-    ];
+	/**
+	 * The Artisan commands provided by your application.
+	 *
+	 * @var array
+	 */
+	protected $commands = [
+		GenerateDoc::class,
+		MakeNotificationsCommand::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');
+	}
 }

src/Modules/Core/Utl/CoreConfig.php

Indentation +4 added lines, -4 removed lines

@@ -2,9 +2,9 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-        return [
+	public function getConfig()
+	{
+		return [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -14,5 +14,5 @@ 
 			 */
 			'cacheConfig' =>  config('skeleton.cache_config'),
 		];
-    }
+	}
 }
\ No newline at end of file

src/ApiSkeletonServiceProvider.php

Indentation +32 added lines, -32 removed lines

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

src/Modules/Core/Utl/ErrorHandler.php

Indentation +113 added lines, -113 removed lines

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

src/Modules/Acl/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -5,63 +5,63 @@
  */
 class AclUserObserver {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) 
-        {
-            $model->tokens()->each(function($token){
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) 
+		{
+			$model->tokens()->each(function($token){
 
-                \Core::users()->revokeAccessToken($token);
+				\Core::users()->revokeAccessToken($token);
 
-            });
-        }
-    }
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     {
         if ($model->isDirty('blocked') && $model->blocked) 
         {
-            $model->tokens()->each(function($token){
+            $model->tokens()->each(function($token) {
 
                 \Core::users()->revokeAccessToken($token);
 

src/Modules/Acl/Proxy/LoginProxy.php

Indentation +91 added lines, -91 removed lines

@@ -5,95 +5,95 @@
 
 class LoginProxy
 {
-    private $apiConsumer;
-
-    private $auth;
-
-    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->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('skeleton.passport_client_id'),
-            'client_secret' => config('skeleton.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.
-     * 
-     * @return void
-     */
-    public function logout()
-    {
-        \Core::users()->revokeAccessToken($this->auth->user()->token());
-    }
+	private $apiConsumer;
+
+	private $auth;
+
+	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->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('skeleton.passport_client_id'),
+			'client_secret' => config('skeleton.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.
+	 * 
+	 * @return void
+	 */
+	public function logout()
+	{
+		\Core::users()->revokeAccessToken($this->auth->user()->token());
+	}
 }
\ No newline at end of file