Completed
Push — master ( 09a64e...d2b124 )
by Sherif
02:30
created
src/Modules/Roles/Enums/RoleEnum.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 class RoleEnum
6 6
 {
7
-    const ADMIN = 'Admin';
7
+	const ADMIN = 'Admin';
8 8
 }
Please login to merge, or discard this patch.
files/HttpKernel.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -6,82 +6,82 @@
 block discarded – undo
6 6
 
7 7
 class Kernel extends HttpKernel
8 8
 {
9
-    /**
10
-     * The application's global HTTP middleware stack.
11
-     *
12
-     * These middleware are run during every request to your application.
13
-     *
14
-     * @var array
15
-     */
16
-    protected $middleware = [
17
-        \Fruitcake\Cors\HandleCors::class,
18
-        \App\Http\Middleware\TrustProxies::class,
19
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
20
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
21
-        \App\Http\Middleware\TrimStrings::class,
22
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
23
-    ];
9
+	/**
10
+	 * The application's global HTTP middleware stack.
11
+	 *
12
+	 * These middleware are run during every request to your application.
13
+	 *
14
+	 * @var array
15
+	 */
16
+	protected $middleware = [
17
+		\Fruitcake\Cors\HandleCors::class,
18
+		\App\Http\Middleware\TrustProxies::class,
19
+		\App\Http\Middleware\CheckForMaintenanceMode::class,
20
+		\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
21
+		\App\Http\Middleware\TrimStrings::class,
22
+		\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
23
+	];
24 24
 
25
-    /**
26
-     * The application's route middleware groups.
27
-     *
28
-     * @var array
29
-     */
30
-    protected $middlewareGroups = [
31
-        'web' => [
32
-            \App\Http\Middleware\EncryptCookies::class,
33
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
34
-            \Illuminate\Session\Middleware\StartSession::class,
35
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
36
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
37
-            \App\Http\Middleware\VerifyCsrfToken::class,
38
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
39
-        ],
25
+	/**
26
+	 * The application's route middleware groups.
27
+	 *
28
+	 * @var array
29
+	 */
30
+	protected $middlewareGroups = [
31
+		'web' => [
32
+			\App\Http\Middleware\EncryptCookies::class,
33
+			\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
34
+			\Illuminate\Session\Middleware\StartSession::class,
35
+			// \Illuminate\Session\Middleware\AuthenticateSession::class,
36
+			\Illuminate\View\Middleware\ShareErrorsFromSession::class,
37
+			\App\Http\Middleware\VerifyCsrfToken::class,
38
+			\Illuminate\Routing\Middleware\SubstituteBindings::class,
39
+		],
40 40
 
41
-        'api' => [
42
-            'throttle:60,1',
43
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
44
-            \App\Modules\Core\Http\Middleware\SetSessions::class,
45
-            \App\Modules\Core\Http\Middleware\CheckPermissions::class,
46
-            \App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,
47
-            \App\Modules\Core\Http\Middleware\SetRelations::class,
48
-        ],
49
-    ];
41
+		'api' => [
42
+			'throttle:60,1',
43
+			\Illuminate\Routing\Middleware\SubstituteBindings::class,
44
+			\App\Modules\Core\Http\Middleware\SetSessions::class,
45
+			\App\Modules\Core\Http\Middleware\CheckPermissions::class,
46
+			\App\Modules\Core\Http\Middleware\UpdateLocaleAndTimezone::class,
47
+			\App\Modules\Core\Http\Middleware\SetRelations::class,
48
+		],
49
+	];
50 50
 
51
-    /**
52
-     * The application's route middleware.
53
-     *
54
-     * These middleware may be assigned to groups or used individually.
55
-     *
56
-     * @var array
57
-     */
58
-    protected $routeMiddleware = [
59
-        'auth' => \App\Http\Middleware\Authenticate::class,
60
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
61
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
62
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
63
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
64
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
65
-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
66
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
67
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
68
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
69
-    ];
51
+	/**
52
+	 * The application's route middleware.
53
+	 *
54
+	 * These middleware may be assigned to groups or used individually.
55
+	 *
56
+	 * @var array
57
+	 */
58
+	protected $routeMiddleware = [
59
+		'auth' => \App\Http\Middleware\Authenticate::class,
60
+		'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
61
+		'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
62
+		'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
63
+		'can' => \Illuminate\Auth\Middleware\Authorize::class,
64
+		'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
65
+		'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
66
+		'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
67
+		'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
68
+		'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
69
+	];
70 70
 
71
-    /**
72
-     * The priority-sorted list of middleware.
73
-     *
74
-     * This forces non-global middleware to always be in the given order.
75
-     *
76
-     * @var array
77
-     */
78
-    protected $middlewarePriority = [
79
-        \Illuminate\Session\Middleware\StartSession::class,
80
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
81
-        \App\Http\Middleware\Authenticate::class,
82
-        \Illuminate\Routing\Middleware\ThrottleRequests::class,
83
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
84
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
85
-        \Illuminate\Auth\Middleware\Authorize::class,
86
-    ];
71
+	/**
72
+	 * The priority-sorted list of middleware.
73
+	 *
74
+	 * This forces non-global middleware to always be in the given order.
75
+	 *
76
+	 * @var array
77
+	 */
78
+	protected $middlewarePriority = [
79
+		\Illuminate\Session\Middleware\StartSession::class,
80
+		\Illuminate\View\Middleware\ShareErrorsFromSession::class,
81
+		\App\Http\Middleware\Authenticate::class,
82
+		\Illuminate\Routing\Middleware\ThrottleRequests::class,
83
+		\Illuminate\Session\Middleware\AuthenticateSession::class,
84
+		\Illuminate\Routing\Middleware\SubstituteBindings::class,
85
+		\Illuminate\Auth\Middleware\Authorize::class,
86
+	];
87 87
 }
Please login to merge, or discard this patch.
src/Modules/Users/Http/Controllers/UserController.php 1 patch
Indentation   +207 added lines, -207 removed lines patch added patch discarded remove patch
@@ -20,211 +20,211 @@
 block discarded – undo
20 20
 
21 21
 class UserController extends BaseApiController
22 22
 {
23
-    /**
24
-     * Path of the sotre form request.
25
-     *
26
-     * @var string
27
-     */
28
-    protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
29
-
30
-    /**
31
-     * Path of the model resource.
32
-     *
33
-     * @var string
34
-     */
35
-    protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
36
-
37
-    /**
38
-     * List of all route actions that the base api controller
39
-     * will skip permissions check for them.
40
-     * @var array
41
-     */
42
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
43
-
44
-    /**
45
-     * List of all route actions that the base api controller
46
-     * will skip login check for them.
47
-     * @var array
48
-     */
49
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
50
-
51
-    /**
52
-     * Init new object.
53
-     *
54
-     * @param   UserService $service
55
-     * @return  void
56
-     */
57
-    public function __construct(UserService $service)
58
-    {
59
-        parent::__construct($service);
60
-    }
61
-
62
-    /**
63
-     * Return the logged in user account.
64
-     *
65
-     * @param Request $request
66
-     * @return \Illuminate\Http\Response
67
-     */
68
-    public function account(Request $request)
69
-    {
70
-        return new $this->modelResource($this->service->account($request->relations));
71
-    }
72
-
73
-    /**
74
-     * Block the user.
75
-     *
76
-     * @param  integer  $id Id of the user.
77
-     * @return \Illuminate\Http\Response
78
-     */
79
-    public function block($id)
80
-    {
81
-        return new $this->modelResource($this->service->block($id));
82
-    }
83
-
84
-    /**
85
-     * Unblock the user.
86
-     *
87
-     * @param  integer  $id Id of the user.
88
-     * @return \Illuminate\Http\Response
89
-     */
90
-    public function unblock($id)
91
-    {
92
-        return new $this->modelResource($this->service->unblock($id));
93
-    }
94
-
95
-    /**
96
-     * Logout the user.
97
-     *
98
-     * @return \Illuminate\Http\Response
99
-     */
100
-    public function logout()
101
-    {
102
-        return new GeneralResource($this->service->logout());
103
-    }
104
-
105
-    /**
106
-     * Handle the registration request.
107
-     *
108
-     * @param Register $request
109
-     * @return \Illuminate\Http\Response
110
-     */
111
-    public function register(Register $request)
112
-    {
113
-        return new $this->modelResource($this->service->register($request->validated()));
114
-    }
115
-
116
-    /**
117
-     * Handle the login request to the application.
118
-     *
119
-     * @param Login $request
120
-     * @return \Illuminate\Http\Response
121
-     */
122
-    public function login(Login $request)
123
-    {
124
-        $result = $this->service->login($request->get('email'), $request->get('password'));
125
-
126
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
127
-    }
128
-
129
-    /**
130
-     * Handle the social login request the application.
131
-     *
132
-     * @param LoginSocial $request
133
-     * @return \Illuminate\Http\Response
134
-     */
135
-    public function loginSocial(LoginSocial $request)
136
-    {
137
-        $result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
138
-
139
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
140
-    }
141
-
142
-    /**
143
-     * Assign the given roles to the given user.
144
-     *
145
-     * @param AssignRoles $request
146
-     * @param integer     $id
147
-     * @return \Illuminate\Http\Response
148
-     */
149
-    public function assignRoles(AssignRoles $request, $id)
150
-    {
151
-        return new $this->modelResource($this->service->assignRoles($id, $request->get('role_ids')));
152
-    }
153
-
154
-    /**
155
-     * Send a reset link to the given user.
156
-     *
157
-     * @param SendReset $request
158
-     * @return \Illuminate\Http\Response
159
-     */
160
-    public function sendReset(SendReset $request)
161
-    {
162
-        return new GeneralResource($this->service->sendReset($request->get('email')));
163
-    }
164
-
165
-    /**
166
-     * Reset the given user's password.
167
-     *
168
-     * @param ResetPassword $request
169
-     * @return \Illuminate\Http\Response
170
-     */
171
-    public function resetPassword(ResetPassword $request)
172
-    {
173
-        return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
174
-    }
175
-
176
-    /**
177
-     * Change the logged in user password.
178
-     *
179
-     * @param ChangePassword $request
180
-     * @return \Illuminate\Http\Response
181
-     */
182
-    public function changePassword(ChangePassword $request)
183
-    {
184
-        return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
185
-    }
186
-
187
-    /**
188
-     * Confirm email using the confirmation code.
189
-     *
190
-     * @param ConfirmEmail $request
191
-     * @return \Illuminate\Http\Response
192
-     */
193
-    public function confirmEmail(ConfirmEmail $request)
194
-    {
195
-        return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
196
-    }
197
-
198
-    /**
199
-     * Resend the email confirmation mail.
200
-     *
201
-     * @param ResendEmailConfirmation $request
202
-     * @return \Illuminate\Http\Response
203
-     */
204
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
205
-    {
206
-        return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
207
-    }
208
-
209
-    /**
210
-     * Refresh the expired login token.
211
-     *
212
-     * @param RefreshToken $request
213
-     * @return \Illuminate\Http\Response
214
-     */
215
-    public function refreshToken(RefreshToken $request)
216
-    {
217
-        return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
218
-    }
219
-
220
-    /**
221
-     * Save the given data to the logged in user.
222
-     *
223
-     * @param SaveProfile $request
224
-     * @return \Illuminate\Http\Response
225
-     */
226
-    public function saveProfile(SaveProfile $request)
227
-    {
228
-        return new $this->modelResource($this->service->saveProfile($request->validated()));
229
-    }
23
+	/**
24
+	 * Path of the sotre form request.
25
+	 *
26
+	 * @var string
27
+	 */
28
+	protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
29
+
30
+	/**
31
+	 * Path of the model resource.
32
+	 *
33
+	 * @var string
34
+	 */
35
+	protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
36
+
37
+	/**
38
+	 * List of all route actions that the base api controller
39
+	 * will skip permissions check for them.
40
+	 * @var array
41
+	 */
42
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
43
+
44
+	/**
45
+	 * List of all route actions that the base api controller
46
+	 * will skip login check for them.
47
+	 * @var array
48
+	 */
49
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
50
+
51
+	/**
52
+	 * Init new object.
53
+	 *
54
+	 * @param   UserService $service
55
+	 * @return  void
56
+	 */
57
+	public function __construct(UserService $service)
58
+	{
59
+		parent::__construct($service);
60
+	}
61
+
62
+	/**
63
+	 * Return the logged in user account.
64
+	 *
65
+	 * @param Request $request
66
+	 * @return \Illuminate\Http\Response
67
+	 */
68
+	public function account(Request $request)
69
+	{
70
+		return new $this->modelResource($this->service->account($request->relations));
71
+	}
72
+
73
+	/**
74
+	 * Block the user.
75
+	 *
76
+	 * @param  integer  $id Id of the user.
77
+	 * @return \Illuminate\Http\Response
78
+	 */
79
+	public function block($id)
80
+	{
81
+		return new $this->modelResource($this->service->block($id));
82
+	}
83
+
84
+	/**
85
+	 * Unblock the user.
86
+	 *
87
+	 * @param  integer  $id Id of the user.
88
+	 * @return \Illuminate\Http\Response
89
+	 */
90
+	public function unblock($id)
91
+	{
92
+		return new $this->modelResource($this->service->unblock($id));
93
+	}
94
+
95
+	/**
96
+	 * Logout the user.
97
+	 *
98
+	 * @return \Illuminate\Http\Response
99
+	 */
100
+	public function logout()
101
+	{
102
+		return new GeneralResource($this->service->logout());
103
+	}
104
+
105
+	/**
106
+	 * Handle the registration request.
107
+	 *
108
+	 * @param Register $request
109
+	 * @return \Illuminate\Http\Response
110
+	 */
111
+	public function register(Register $request)
112
+	{
113
+		return new $this->modelResource($this->service->register($request->validated()));
114
+	}
115
+
116
+	/**
117
+	 * Handle the login request to the application.
118
+	 *
119
+	 * @param Login $request
120
+	 * @return \Illuminate\Http\Response
121
+	 */
122
+	public function login(Login $request)
123
+	{
124
+		$result = $this->service->login($request->get('email'), $request->get('password'));
125
+
126
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
127
+	}
128
+
129
+	/**
130
+	 * Handle the social login request the application.
131
+	 *
132
+	 * @param LoginSocial $request
133
+	 * @return \Illuminate\Http\Response
134
+	 */
135
+	public function loginSocial(LoginSocial $request)
136
+	{
137
+		$result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
138
+
139
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
140
+	}
141
+
142
+	/**
143
+	 * Assign the given roles to the given user.
144
+	 *
145
+	 * @param AssignRoles $request
146
+	 * @param integer     $id
147
+	 * @return \Illuminate\Http\Response
148
+	 */
149
+	public function assignRoles(AssignRoles $request, $id)
150
+	{
151
+		return new $this->modelResource($this->service->assignRoles($id, $request->get('role_ids')));
152
+	}
153
+
154
+	/**
155
+	 * Send a reset link to the given user.
156
+	 *
157
+	 * @param SendReset $request
158
+	 * @return \Illuminate\Http\Response
159
+	 */
160
+	public function sendReset(SendReset $request)
161
+	{
162
+		return new GeneralResource($this->service->sendReset($request->get('email')));
163
+	}
164
+
165
+	/**
166
+	 * Reset the given user's password.
167
+	 *
168
+	 * @param ResetPassword $request
169
+	 * @return \Illuminate\Http\Response
170
+	 */
171
+	public function resetPassword(ResetPassword $request)
172
+	{
173
+		return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
174
+	}
175
+
176
+	/**
177
+	 * Change the logged in user password.
178
+	 *
179
+	 * @param ChangePassword $request
180
+	 * @return \Illuminate\Http\Response
181
+	 */
182
+	public function changePassword(ChangePassword $request)
183
+	{
184
+		return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
185
+	}
186
+
187
+	/**
188
+	 * Confirm email using the confirmation code.
189
+	 *
190
+	 * @param ConfirmEmail $request
191
+	 * @return \Illuminate\Http\Response
192
+	 */
193
+	public function confirmEmail(ConfirmEmail $request)
194
+	{
195
+		return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
196
+	}
197
+
198
+	/**
199
+	 * Resend the email confirmation mail.
200
+	 *
201
+	 * @param ResendEmailConfirmation $request
202
+	 * @return \Illuminate\Http\Response
203
+	 */
204
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
205
+	{
206
+		return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
207
+	}
208
+
209
+	/**
210
+	 * Refresh the expired login token.
211
+	 *
212
+	 * @param RefreshToken $request
213
+	 * @return \Illuminate\Http\Response
214
+	 */
215
+	public function refreshToken(RefreshToken $request)
216
+	{
217
+		return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
218
+	}
219
+
220
+	/**
221
+	 * Save the given data to the logged in user.
222
+	 *
223
+	 * @param SaveProfile $request
224
+	 * @return \Illuminate\Http\Response
225
+	 */
226
+	public function saveProfile(SaveProfile $request)
227
+	{
228
+		return new $this->modelResource($this->service->saveProfile($request->validated()));
229
+	}
230 230
 }
Please login to merge, or discard this patch.