|
|
@@ -215,15 +215,13 @@ class AuthService
|
|
|
->first();
|
|
|
$isLogin = false;
|
|
|
if ($user) {
|
|
|
- // if ($user->registration_complete) {
|
|
|
$provider = Provider::where('user_id', $user->id)->first();
|
|
|
if ($provider && $provider->approval_status->value !== ApprovalStatusEnum::ACCEPTED->value) {
|
|
|
DB::rollBack();
|
|
|
|
|
|
return ['error' => 'provider_not_accepted'];
|
|
|
}
|
|
|
- $isLogin = true;
|
|
|
- // }
|
|
|
+ $isLogin = $provider !== null;
|
|
|
|
|
|
$user->code = $code;
|
|
|
$user->validated_code = false;
|
|
|
@@ -320,15 +318,15 @@ class AuthService
|
|
|
$user->load('provider');
|
|
|
$provider = $user->provider ?? null;
|
|
|
|
|
|
- // if (! $user->registration_complete || ! $provider) {
|
|
|
- // return ['error' => 'registration_incomplete'];
|
|
|
- // }
|
|
|
+ if (! $user->registration_complete || ! $provider) {
|
|
|
+ return ['error' => 'registration_incomplete'];
|
|
|
+ }
|
|
|
|
|
|
- if ($provider->approval_status === ApprovalStatusEnum::PENDING->value) {
|
|
|
+ if ($provider->approval_status === ApprovalStatusEnum::PENDING) {
|
|
|
return ['error' => 'provider_pending'];
|
|
|
}
|
|
|
|
|
|
- if ($provider->approval_status === ApprovalStatusEnum::REJECTED->value) {
|
|
|
+ if ($provider->approval_status === ApprovalStatusEnum::REJECTED) {
|
|
|
return ['error' => 'provider_rejected'];
|
|
|
}
|
|
|
|