fix: improve UX on OTP request

smarcet · smarcet · commit 036edd84d78f · 2024-09-07T15:29:48.000-03:00
Change-Id: I5aa9e7be727dd52eba4f3debef1e9400698679df
diff --git a/app/Services/OAuth2/TokenService.php b/app/Services/OAuth2/TokenService.php
@@ -13,6 +13,7 @@
  **/
 
 use App\Http\Utils\IUserIPHelperProvider;
+use App\Jobs\AddUserAction;
 use App\libs\Auth\Models\IGroupSlugs;
 use App\libs\OAuth2\Repositories\IOAuth2OTPRepository;
 use App\Models\OAuth2\Factories\OTPFactory;
@@ -73,6 +74,7 @@
 use Utils\Db\ITransactionService;
 use Utils\Exceptions\ConfigurationException;
 use Utils\Exceptions\UnacquiredLockException;
+use Utils\IPHelper;
 use utils\json_types\JsonValue;
 use utils\json_types\NumericDate;
 use utils\json_types\StringOrURI;
@@ -1587,6 +1589,21 @@ public function createOTPFromRequest(OAuth2PasswordlessAuthenticationRequest $re
                 $this->otp_repository->add($otp);
             }
 
+            $user = $this->auth_service->getUserByUsername($otp->getUserName());
+            if(!is_null($user)){
+                Log::debug
+                (
+                    sprintf
+                    (
+                        "TokenService::createOTPFromRequest requested OTP for existent user %s (%s)",
+                        $user->getEmail(),
+                        $user->getId()
+                    )
+                );
+                AddUserAction::dispatch($user->getId(), IPHelper::getUserIp(), "Requested OTP");
+                if(!$user->isActive())
+                    throw new ValidationException("User is not active.");
+            }
             return $otp;
         });
 
@@ -1610,10 +1627,26 @@ public function createOTPFromRequest(OAuth2PasswordlessAuthenticationRequest $re
      * @throws Exception
      */
     public function createOTPFromPayload(array $payload, ?Client $client):OAuth2OTP{
+
         $otp = $this->tx_service->transaction(function() use($payload, $client){
 
             $otp = OTPFactory::buildFromPayload($payload, $this->identifier_generator, $client);
 
+            $user = $this->auth_service->getUserByUsername($otp->getUserName());
+            if(!is_null($user)){
+                Log::debug
+                (
+                    sprintf
+                    (
+                        "TokenService::createOTPFromPayload requested OTP for existent user %s (%s)",
+                        $user->getEmail(),
+                        $user->getId()
+                    )
+                );
+                AddUserAction::dispatch($user->getId(), IPHelper::getUserIp(), "Requested OTP");
+                if(!$user->isActive())
+                    throw new ValidationException("User is not active.");
+            }
             if(is_null($client)){
                 $this->otp_repository->add($otp);
             }
diff --git a/app/libs/OAuth2/GrantTypes/PasswordlessGrantType.php b/app/libs/OAuth2/GrantTypes/PasswordlessGrantType.php
@@ -14,6 +14,7 @@
 
 use Exception;
 use Illuminate\Support\Facades\Auth;
+use models\exceptions\ValidationException;
 use Models\OAuth2\Client;
 use Models\OAuth2\OAuth2OTP;
 use OAuth2\Exceptions\InvalidApplicationType;
@@ -325,6 +326,13 @@ public function handle(OAuth2Request $request)
             $this->memento_service->forget();
             return new OAuth2DirectErrorResponse($ex->getError(), $ex->getMessage());
         }
+        catch(ValidationException $ex){
+            $this->log_service->warning($ex);
+            // clear save data ...
+            $this->auth_service->clearUserAuthorizationResponse();
+            $this->memento_service->forget();
+            return new OAuth2DirectErrorResponse($ex->getMessage());
+        }
         catch (Exception $ex) {
             $this->log_service->error($ex);
             // clear save data ...
diff --git a/resources/js/login/login.js b/resources/js/login/login.js
@@ -444,6 +444,12 @@ class LoginPage extends React.Component {
             });
         }, (error) => {
             let {response, status, message} = error;
+            if(status == 412){
+                const {message, errors} = response.body;
+                Swal(message, errors[0], 'error')
+                return;
+            }
+
             Swal('Oops...', 'Something went wrong!', 'error')
         });
         return false;
