Skip to content

Commit 65f3411

Browse files
author
EllaiSys
committed
fix: change password api route and controller
1 parent 9c6b579 commit 65f3411

2 files changed

Lines changed: 17 additions & 46 deletions

File tree

app/Http/Controllers/ApiAuthController.php

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use Illuminate\Http\Request;
88
use Illuminate\Support\Facades\Log;
99

10+
use App\Models\User;
11+
1012
use Ellaisys\Cognito\AwsCognitoClaim;
1113
use Ellaisys\Cognito\Auth\AuthenticatesUsers;
1214
use Ellaisys\Cognito\Auth\ChangePasswords;
@@ -32,33 +34,6 @@ class ApiAuthController extends BaseController
3234
use AuthenticatesUsers;
3335
use ChangePasswords;
3436
use RegistersUsers;
35-
//use RegisterMFA;
36-
37-
38-
// public function register(Request $request)
39-
// {
40-
// $this->validator($request->all())->validate();
41-
42-
// $attributes = [];
43-
44-
// $userFields = ['name', 'email'];
45-
46-
// foreach($userFields as $userField) {
47-
48-
// if ($request->$userField === null) {
49-
// throw new \Exception("The configured user field $userField is not provided in the request.");
50-
// }
51-
52-
// $attributes[$userField] = $request->$userField;
53-
// }
54-
55-
// app()->make(CognitoClient::class)->register($request->email, $request->password, $attributes);
56-
57-
// event(new Registered($user = $this->create($request->all())));
58-
59-
// return $this->registered($request, $user)
60-
// ?: redirect($this->redirectPath());
61-
// } //Function ends
6237

6338

6439
/**
@@ -69,6 +44,11 @@ public function actionRegister(Request $request)
6944
return $this->register($request);
7045
} //Function ends
7146

47+
public function create (array $data)
48+
{
49+
return User::create($data);
50+
} //Function ends
51+
7252

7353
/**
7454
* Login action for the API based approach.
@@ -127,29 +107,19 @@ public function actionChangePassword(Request $request)
127107
]);
128108
$validator->validate();
129109

130-
// Get Current User
131-
$userCurrent = auth()->guard('web')->user();
132-
133110
if ($this->reset($request)) {
134-
return redirect(route('login'))->with('success', true);
111+
return response()->json([
112+
'status' => 'success',
113+
'message' => 'Password updated successfully'
114+
], 200);
135115
} else {
136-
return redirect()->back()
137-
->with('status', 'error')
138-
->with('message', 'Password updated failed');
116+
return response()->json([
117+
'status' => 'error',
118+
'message' => 'Password update failed'
119+
], 400);
139120
} //End if
140121
} catch(Exception $e) {
141-
$message = 'Error sending the reset mail.';
142-
if ($e instanceof ValidationException) {
143-
$message = $e->errors();
144-
} else if ($e instanceof CognitoIdentityProviderException) {
145-
$message = $e->getAwsErrorMessage();
146-
} else {
147-
//Do nothing
148-
} //End if
149-
150-
return redirect()->back()
151-
->with('status', 'error')
152-
->with('message', $message);
122+
throw $e;
153123
} //Try-catch ends
154124
} //Function ends
155125

routes/api.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
Route::post('login', [App\Http\Controllers\ApiAuthController::class, 'actionLogin']);
2525
Route::post('register', [App\Http\Controllers\ApiAuthController::class, 'actionRegister']);
2626
Route::post('/login/mfa', [App\Http\Controllers\ApiMFAController::class, 'actionValidateMFA']);
27+
Route::post('changepassword', [App\Http\Controllers\ApiAuthController::class, 'actionChangePassword']);
2728

2829
Route::group(['middleware' => 'aws-cognito'], function() {
2930
Route::get('profile', [App\Http\Controllers\AuthController::class, 'getRemoteUser']);

0 commit comments

Comments
 (0)