Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-adminpanel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
laravel-adminpanel
Commits
36716b68
Unverified
Commit
36716b68
authored
Dec 03, 2017
by
Viral Solani
Committed by
GitHub
Dec 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #57 from viralsolani/analysis-8bon7a
Apply fixes from StyleCI
parents
bcfbaa1e
af9cc834
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
ResetPasswordController.php
app/Http/Controllers/Api/V1/ResetPasswordController.php
+10
-9
No files found.
app/Http/Controllers/Api/V1/ResetPasswordController.php
View file @
36716b68
...
...
@@ -2,8 +2,6 @@
namespace
App\Http\Controllers\Api\V1
;
use
App\Repositories\Frontend\Access\User\UserRepository
;
use
Illuminate\Foundation\Auth\ResetsPasswords
;
use
Illuminate\Http\Request
;
/**
...
...
@@ -12,7 +10,8 @@ use Illuminate\Http\Request;
class
ResetPasswordController
extends
APIController
{
/**
* Reset Password
* Reset Password.
*
* @param ResetPasswordRequest
* @param JWTAuth
*
...
...
@@ -26,11 +25,11 @@ class ResetPasswordController extends APIController
}
);
if
(
$response
!==
Password
::
PASSWORD_RESET
)
{
if
(
$response
!==
Password
::
PASSWORD_RESET
)
{
throw
new
HttpException
(
500
);
}
if
(
!
Config
::
get
(
'boilerplate.reset_password.release_token'
))
{
if
(
!
Config
::
get
(
'boilerplate.reset_password.release_token'
))
{
return
response
()
->
json
([
'status'
=>
'ok'
,
]);
...
...
@@ -40,7 +39,7 @@ class ResetPasswordController extends APIController
return
response
()
->
json
([
'status'
=>
'ok'
,
'token'
=>
$JWTAuth
->
fromUser
(
$user
)
'token'
=>
$JWTAuth
->
fromUser
(
$user
),
]);
}
...
...
@@ -57,7 +56,8 @@ class ResetPasswordController extends APIController
/**
* Get the password reset credentials from the request.
*
* @param ResetPasswordRequest $request
* @param ResetPasswordRequest $request
*
* @return array
*/
protected
function
credentials
(
ResetPasswordRequest
$request
)
...
...
@@ -70,8 +70,9 @@ class ResetPasswordController extends APIController
/**
* Reset the given user's password.
*
* @param \Illuminate\Contracts\Auth\CanResetPassword $user
* @param string $password
* @param \Illuminate\Contracts\Auth\CanResetPassword $user
* @param string $password
*
* @return void
*/
protected
function
reset
(
$user
,
$password
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment