1
0
Fork 0
mirror of synced 2024-07-01 04:30:59 +12:00

fix conflicts

This commit is contained in:
Yatharth Verma 2023-09-22 22:56:07 +05:30
parent f07f246f8d
commit 6b47999120
2 changed files with 6 additions and 6 deletions

View file

@ -242,12 +242,12 @@ return [
Exception::USER_EMAIL_ALREADY_VERIFIED => [ Exception::USER_EMAIL_ALREADY_VERIFIED => [
'name' => Exception::USER_EMAIL_ALREADY_VERIFIED, 'name' => Exception::USER_EMAIL_ALREADY_VERIFIED,
'description' => 'User email is already verified', 'description' => 'User email is already verified',
'code' => 400, 'code' => 409,
], ],
Exception::USER_PHONE_ALREADY_VERIFIED => [ Exception::USER_PHONE_ALREADY_VERIFIED => [
'name' => Exception::USER_PHONE_ALREADY_VERIFIED, 'name' => Exception::USER_PHONE_ALREADY_VERIFIED,
'description' => 'User phone is already verified', 'description' => 'User phone is already verified',
'code' => 400 'code' => 409
], ],
/** Teams */ /** Teams */

View file

@ -2669,8 +2669,8 @@ App::post('/v1/account/verification')
if (empty(App::getEnv('_APP_SMTP_HOST'))) { if (empty(App::getEnv('_APP_SMTP_HOST'))) {
throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled'); throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
} }
if($user->getAttribute('emailVerification') == true){ if ($user->getAttribute('emailVerification')) {
throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED); throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
} }
@ -2898,8 +2898,8 @@ App::post('/v1/account/verification/phone')
if (empty($user->getAttribute('phone'))) { if (empty($user->getAttribute('phone'))) {
throw new Exception(Exception::USER_PHONE_NOT_FOUND); throw new Exception(Exception::USER_PHONE_NOT_FOUND);
} }
if($user->getAttribute('phoneVerification') == true){ if ($user->getAttribute('phoneVerification')) {
throw new Exception(Exception::USER_PHONE_ALREADY_VERIFIED); throw new Exception(Exception::USER_PHONE_ALREADY_VERIFIED);
} }