fix: PR review feedback

Signed-off-by: romanetar <roman_ag@hotmail.com>

Author: romanetar

app/Services/Auth/UserService.php

@@ -218,15 +218,17 @@ public function registerUser(array $payload, ?OAuth2OTP $otp = null):User
      * @param string $token
      * @return User
      * @throws EntityNotFoundException
-     * @throws ValidationException
+     * @throws ValidationException|\Exception
      */
     public function verifyEmail(string $token): User
     {
         return $this->tx_service->transaction(function () use ($token) {
             $user = $this->user_repository->getByVerificationEmailToken($token);
 
-            if (is_null($user) || !$user->isActive())
+            if (is_null($user) || !$user->isActive()) {
+                Log::warning(sprintf("UserService::verifyEmail user with id %s is not active", $user->getId()));
                 throw new EntityNotFoundException();
+            }
 
             $user->verifyEmail();
 

resources/js/login/login.js

@@ -24,7 +24,7 @@ import Grid from '@material-ui/core/Grid';
 import CustomSnackbar from "../components/custom_snackbar";
 import Banner from '../components/banner/banner';
 import OtpInput from 'react-otp-input';
-import {handleThirdPartyProvidersVerbiage} from '../utils';
+import {handleErrorResponse, handleThirdPartyProvidersVerbiage} from '../utils';
 
 import styles from './login.module.scss'
 import "./third_party_identity_providers.scss";
@@ -605,21 +605,22 @@ class LoginPage extends React.Component {
         let {user_name} = this.state;
         user_name = user_name?.trim();
 
+        if (!user_name) {
+            this.showAlert(
+                'Something went wrong while trying to resend the verification email. Please try again later.',
+                'error');
+            return;
+        }
+
         resendVerificationEmail(user_name, this.props.token).then((payload) => {
             this.showAlert(
                 'We\'ve sent you a verification email. Please check your inbox and click the link to verify your account.',
                 'success');
         }, (error) => {
-            let {response, status} = error;
-            if(status === 412){
-                const {errors} = response.body;
-                const allErrors = Object.values(errors ?? {})
-                  ?.flat?.()
-                  ?.join(', ') || '';
-                this.showAlert(allErrors, 'error');
-                return;
-            }
-            this.showAlert('Oops... Something went wrong!', 'error');
+            handleErrorResponse(error, (title, messageLines, type) => {
+                const message = (messageLines ?? []).join(', ')
+                this.showAlert(`${title}: ${message}`, type);
+            });
         });
     }
 

resources/js/utils.js

@@ -1,20 +1,36 @@
 import Swal from "sweetalert2";
 
-export const handleErrorResponse = (err) => {
-    if(err.status === 412){
-        // validation error
-        let msg= '';
-        for (let [key, value] of Object.entries(err.response.body.errors)) {
-            if (isNaN(key)) {
-                msg += key + ': ';
-            }
+const createErrorHandler = (customHandler = null) => {
+    const showMessage = (title, message, type) => {
+        if (customHandler && typeof customHandler === 'function') {
+            return customHandler(title, message, type);
+        }
+        const formattedMessage = Array.isArray(message) ? message.join('<br>') : message;
+        return Swal(title, formattedMessage, type);
+    };
 
-            msg += value + '<br>';
+    return (err) => {
+        if (err.status === 412) {
+            // validation error
+            const messageLines = [];
+            for (let [key, value] of Object.entries(err.response.body.errors)) {
+                let line = '';
+                if (isNaN(key)) {
+                    line += key + ': ';
+                }
+                line += value;
+                messageLines.push(line);
+            }
+            return showMessage("Validation error", messageLines, "warning");
         }
-        return Swal("Validation error", msg, "warning");
-    }
-    return Swal("Something went wrong!", null, "error");
-}
+        return showMessage("Something went wrong!", null, "error");
+    };
+};
+
+export const handleErrorResponse = (err, customHandler = null) => {
+    const errorHandler = createErrorHandler(customHandler);
+    return errorHandler(err);
+};
 
 /**
  *