|
|
@@ -20,8 +20,8 @@ class AuthController extends Controller
|
|
|
$validated = $request->validated();
|
|
|
|
|
|
$result = $this->authService->login(
|
|
|
- email: $validated['email'],
|
|
|
- password: $validated['password'],
|
|
|
+ email: data_get($validated, 'email'),
|
|
|
+ password: data_get($validated, 'password'),
|
|
|
);
|
|
|
|
|
|
if (! $result) {
|
|
|
@@ -29,12 +29,12 @@ class AuthController extends Controller
|
|
|
}
|
|
|
|
|
|
return $this->successResponse(
|
|
|
- payload: new AuthResource($result['payload']),
|
|
|
+ payload: new AuthResource(data_get($result, 'payload')),
|
|
|
message: __('auth.logged_in'),
|
|
|
)->withCookie(
|
|
|
cookie(
|
|
|
'refresh_token',
|
|
|
- $result['refreshToken'],
|
|
|
+ data_get($result, 'refreshToken'),
|
|
|
config('sanctum.rt_expiration') * 60,
|
|
|
'/',
|
|
|
config('session.domain'),
|
|
|
@@ -51,8 +51,8 @@ class AuthController extends Controller
|
|
|
$validated = $request->validated();
|
|
|
|
|
|
$result = $this->authService->login(
|
|
|
- email: $validated['email'],
|
|
|
- password: $validated['password'],
|
|
|
+ email: data_get($validated, 'email'),
|
|
|
+ password: data_get($validated, 'password'),
|
|
|
);
|
|
|
|
|
|
if (! $result) {
|
|
|
@@ -61,8 +61,8 @@ class AuthController extends Controller
|
|
|
|
|
|
return $this->successResponse(
|
|
|
payload: new AuthResource([
|
|
|
- ...$result['payload'],
|
|
|
- 'refresh_token' => $result['refreshToken'],
|
|
|
+ ...data_get($result, 'payload'),
|
|
|
+ 'refresh_token' => data_get($result, 'refreshToken'),
|
|
|
]),
|
|
|
message: __('auth.logged_in'),
|
|
|
);
|
|
|
@@ -93,17 +93,16 @@ class AuthController extends Controller
|
|
|
|
|
|
if (is_null($result)) {
|
|
|
return $this->errorResponse(
|
|
|
- message: __('auth.unauthorized'),
|
|
|
- code: 403,
|
|
|
+ message: __('auth.unauthorized'), code: 403,
|
|
|
)->withoutCookie('refresh_token');
|
|
|
}
|
|
|
|
|
|
return $this->successResponse(
|
|
|
- payload: new AuthResource($result['payload']),
|
|
|
+ payload: new AuthResource(data_get($result, 'payload')),
|
|
|
)->withCookie(
|
|
|
cookie(
|
|
|
'refresh_token',
|
|
|
- $result['refreshToken'],
|
|
|
+ data_get($result, 'refreshToken'),
|
|
|
config('sanctum.rt_expiration') * 60,
|
|
|
'/',
|
|
|
config('session.domain'),
|
|
|
@@ -122,22 +121,21 @@ class AuthController extends Controller
|
|
|
if (is_null($refresh_token)) {
|
|
|
return $this->errorResponse(code: 403);
|
|
|
}
|
|
|
+
|
|
|
$result = $this->authService->refresh(
|
|
|
- $refresh_token,
|
|
|
- isApp: true,
|
|
|
+ $refresh_token, isApp: true,
|
|
|
);
|
|
|
|
|
|
if (is_null($result)) {
|
|
|
return $this->errorResponse(
|
|
|
- message: __('auth.unauthorized'),
|
|
|
- code: 403,
|
|
|
+ message: __('auth.unauthorized'), code: 403,
|
|
|
);
|
|
|
}
|
|
|
|
|
|
return $this->successResponse(
|
|
|
payload: new AuthResource([
|
|
|
- ...$result['payload'],
|
|
|
- 'refresh_token' => $result['refreshToken'],
|
|
|
+ ...data_get($result, 'payload'),
|
|
|
+ 'refresh_token' => data_get($result, 'refreshToken'),
|
|
|
]),
|
|
|
);
|
|
|
}
|
|
|
@@ -146,13 +144,13 @@ class AuthController extends Controller
|
|
|
{
|
|
|
$result = $this->authService->clientSendCode($request->validated());
|
|
|
|
|
|
- if (is_array($result) && isset($result['error'])) {
|
|
|
- return $this->errorResponse(message: __("auth.{$result['error']}"), code: 403);
|
|
|
+ if (is_array($result) && data_get($result, 'error') !== null) {
|
|
|
+ return $this->errorResponse(message: __('auth.'.data_get($result, 'error')), code: 403);
|
|
|
}
|
|
|
|
|
|
return $this->successResponse(
|
|
|
message: __('messages.code_sent'),
|
|
|
- code: 201,
|
|
|
+ code: 201,
|
|
|
payload: ['isLogin' => $result],
|
|
|
);
|
|
|
}
|
|
|
@@ -161,22 +159,22 @@ class AuthController extends Controller
|
|
|
{
|
|
|
$result = $this->authService->providerSendCode($request->validated());
|
|
|
|
|
|
- if (is_array($result) && isset($result['error'])) {
|
|
|
- return $this->errorResponse(message: __("auth.{$result['error']}"), code: 403);
|
|
|
+ if (is_array($result) && data_get($result, 'error') !== null) {
|
|
|
+ return $this->errorResponse(message: __('auth.'.data_get($result, 'error')), code: 403);
|
|
|
}
|
|
|
|
|
|
return $this->successResponse(
|
|
|
message: __('messages.code_sent'),
|
|
|
- code: 201,
|
|
|
+ code: 201,
|
|
|
payload: ['isLogin' => $result],
|
|
|
);
|
|
|
}
|
|
|
|
|
|
public function validateCodeClient(UserAppsValidateCodeRequest $request): JsonResponse
|
|
|
{
|
|
|
- $email = $request->input('email');
|
|
|
- $phone = $request->input('phone');
|
|
|
- $code = $request->input('code');
|
|
|
+ $email = $request->input('email');
|
|
|
+ $phone = $request->input('phone');
|
|
|
+ $code = $request->input('code');
|
|
|
$isLogin = (bool) $request->input('isLogin', false);
|
|
|
|
|
|
$result = $this->authService->validateCodeClient($request->validated(), $isLogin);
|
|
|
@@ -185,13 +183,13 @@ class AuthController extends Controller
|
|
|
return $this->errorResponse(message: __('auth.invalid_code'), code: 400);
|
|
|
}
|
|
|
|
|
|
- if (is_array($result) && isset($result['error'])) {
|
|
|
- return $this->errorResponse(message: __("auth.{$result['error']}"), code: 403);
|
|
|
+ if (is_array($result) && data_get($result, 'error') !== null) {
|
|
|
+ return $this->errorResponse(message: __('auth.'.data_get($result, 'error')), code: 403);
|
|
|
}
|
|
|
|
|
|
if ($isLogin) {
|
|
|
return $this->successResponse(
|
|
|
- payload: new AuthResource([...$result['payload'], 'refresh_token' => $result['refreshToken']]),
|
|
|
+ payload: new AuthResource([...data_get($result, 'payload'), 'refresh_token' => data_get($result, 'refreshToken')]),
|
|
|
message: __('auth.logged_in'),
|
|
|
);
|
|
|
}
|
|
|
@@ -204,9 +202,9 @@ class AuthController extends Controller
|
|
|
|
|
|
public function validateCodeProvider(UserAppsValidateCodeRequest $request): JsonResponse
|
|
|
{
|
|
|
- $email = $request->input('email');
|
|
|
- $phone = $request->input('phone');
|
|
|
- $code = $request->input('code');
|
|
|
+ $email = $request->input('email');
|
|
|
+ $phone = $request->input('phone');
|
|
|
+ $code = $request->input('code');
|
|
|
$isLogin = (bool) $request->input('isLogin', false);
|
|
|
|
|
|
$result = $this->authService->validateCodeProvider($request->validated(), $isLogin);
|
|
|
@@ -215,13 +213,13 @@ class AuthController extends Controller
|
|
|
return $this->errorResponse(message: __('auth.invalid_code'), code: 400);
|
|
|
}
|
|
|
|
|
|
- if (is_array($result) && isset($result['error'])) {
|
|
|
- return $this->errorResponse(message: __("auth.{$result['error']}"), code: 403);
|
|
|
+ if (is_array($result) && data_get($result, 'error') !== null) {
|
|
|
+ return $this->errorResponse(message: __('auth.'.data_get($result, 'error')), code: 403);
|
|
|
}
|
|
|
|
|
|
if ($isLogin) {
|
|
|
return $this->successResponse(
|
|
|
- payload: new AuthResource([...$result['payload'], 'refresh_token' => $result['refreshToken']]),
|
|
|
+ payload: new AuthResource([...data_get($result, 'payload'), 'refresh_token' => data_get($result, 'refreshToken')]),
|
|
|
message: __('auth.logged_in'),
|
|
|
);
|
|
|
}
|
|
|
@@ -235,25 +233,24 @@ class AuthController extends Controller
|
|
|
public function validateCode(UserAppsValidateCodeRequest $request): JsonResponse
|
|
|
{
|
|
|
try {
|
|
|
- $email = $request->input('email');
|
|
|
- $phone = $request->input('phone');
|
|
|
- $code = $request->input('code');
|
|
|
+ $email = $request->input('email');
|
|
|
+ $phone = $request->input('phone');
|
|
|
+ $code = $request->input('code');
|
|
|
$isLogin = $request->input('isLogin');
|
|
|
|
|
|
$result = $this->authService->validateCode($request->validated(), $isLogin);
|
|
|
|
|
|
if (! $result) {
|
|
|
return $this->errorResponse(
|
|
|
- message: __('auth.invalid_code'),
|
|
|
- code: 400,
|
|
|
+ message: __('auth.invalid_code'), code: 400,
|
|
|
);
|
|
|
}
|
|
|
|
|
|
if ($isLogin) {
|
|
|
return $this->successResponse(
|
|
|
payload: new AuthResource([
|
|
|
- ...$result['payload'],
|
|
|
- 'refresh_token' => $result['refreshToken'],
|
|
|
+ ...data_get($result, 'payload'),
|
|
|
+ 'refresh_token' => data_get($result, 'refreshToken'),
|
|
|
]),
|
|
|
message: __('auth.logged_in'),
|
|
|
);
|
|
|
@@ -261,14 +258,13 @@ class AuthController extends Controller
|
|
|
return $this->successResponse(
|
|
|
payload: ['email' => $email, 'phone' => $phone, 'code' => $code],
|
|
|
message: __('auth.valid_code'),
|
|
|
- code: 200,
|
|
|
+ code: 200,
|
|
|
);
|
|
|
}
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
|
return $this->errorResponse(
|
|
|
- message: __('auth.validation_error'),
|
|
|
- code: 500,
|
|
|
+ message: __('auth.validation_error'), code: 500, exception: $e,
|
|
|
);
|
|
|
}
|
|
|
}
|