feat: add more feedback to UI on inactive and/or unverified accounts

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

Author: romanetar

app/Http/Controllers/UserController.php

@@ -21,7 +21,9 @@
 use App\ModelSerializers\SerializerRegistry;
 use Auth\Exceptions\AuthenticationException;
 use Auth\Exceptions\UnverifiedEmailMemberException;
+use App\Services\Auth\IUserService as AuthUserService;
 use Exception;
+use Illuminate\Http\Request as LaravelRequest;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redirect;
@@ -86,6 +88,10 @@ final class UserController extends OpenIdController
      * @var IUserService
      */
     private $user_service;
+    /**
+     * @var AuthUserService
+     */
+    private $auth_user_service;
     /**
      * @var IUserActionService
      */
@@ -132,6 +138,7 @@ final class UserController extends OpenIdController
      * @param ITrustedSitesService $trusted_sites_service
      * @param DiscoveryController $discovery
      * @param IUserService $user_service
+     * @param AuthUserService $auth_user_service
      * @param IUserActionService $user_action_service
      * @param IClientRepository $client_repository
      * @param IApiScopeRepository $scope_repository
@@ -150,6 +157,7 @@ public function __construct
         ITrustedSitesService $trusted_sites_service,
         DiscoveryController $discovery,
         IUserService $user_service,
+        AuthUserService $auth_user_service,
         IUserActionService $user_action_service,
         IClientRepository $client_repository,
         IApiScopeRepository $scope_repository,
@@ -160,15 +168,14 @@ public function __construct
         LoginHintProcessStrategy $login_hint_process_strategy
     )
     {
-
-
         $this->openid_memento_service = $openid_memento_service;
         $this->oauth2_memento_service = $oauth2_memento_service;
         $this->auth_service = $auth_service;
         $this->server_configuration_service = $server_configuration_service;
         $this->trusted_sites_service = $trusted_sites_service;
         $this->discovery = $discovery;
         $this->user_service = $user_service;
+        $this->auth_user_service = $auth_user_service;
         $this->user_action_service = $user_action_service;
         $this->client_repository = $client_repository;
         $this->scope_repository = $scope_repository;
@@ -263,7 +270,8 @@ public function getAccount()
 
             return $this->ok(
                 [
-                    'can_login' => $user->canLogin(),
+                    'is_active' => $user->isActive(),
+                    'is_verified' => $user->isEmailVerified(),
                     'pic' => $user->getPic(),
                     'full_name' => $user->getFullName(),
                     'has_password_set' => $user->hasPasswordSet(),
@@ -351,6 +359,37 @@ public function emitOTP()
         }
     }
 
+    /**
+     * @return \Illuminate\Http\JsonResponse|mixed
+     */
+    public function resendVerificationEmail(LaravelRequest $request)
+    {
+        try {
+            $payload = $request->all();
+            $validator = Validator::make($payload, [
+                'email' => 'required|string|email|max:255'
+            ]);
+
+            if (!$validator->passes()) {
+                return $this->error412($validator->getMessageBag()->getMessages());
+            }
+            $this->auth_user_service->resendVerificationEmail($payload);
+            return $this->ok();
+        }
+        catch (ValidationException $ex) {
+            Log::warning($ex);
+            return $this->error412($ex->getMessages());
+        }
+        catch (EntityNotFoundException $ex) {
+            Log::warning($ex);
+            return $this->error404();
+        }
+        catch (Exception $ex) {
+            Log::error($ex);
+            return $this->error500($ex);
+        }
+    }
+
     public function postLogin()
     {
         $max_login_attempts_2_show_captcha = $this->server_configuration_service->getConfigValue("MaxFailed.LoginAttempts.2ShowCaptcha");

app/Services/Auth/UserService.php

@@ -224,8 +224,10 @@ public function verifyEmail(string $token): User
     {
         return $this->tx_service->transaction(function () use ($token) {
             $user = $this->user_repository->getByVerificationEmailToken($token);
-            if (is_null($user))
+
+            if (is_null($user) || !$user->isActive())
                 throw new EntityNotFoundException();
+
             $user->verifyEmail();
 
             try {

resources/js/components/custom_snackbar.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { Snackbar } from '@material-ui/core';
+import MuiAlert from '@material-ui/lab/Alert';
+
+function Alert(props) {
+  return <MuiAlert elevation={6} variant="filled" {...props} />;
+}
+
+const CustomSnackbar = ({ message, severity = 'info', onClose }) => {
+  return (
+    <Snackbar open={message !== null} autoHideDuration={8000} onClose={onClose}>
+      <Alert onClose={onClose} severity={severity}>
+        {message}
+      </Alert>
+    </Snackbar>
+  );
+};
+export default CustomSnackbar;

resources/js/login/actions.js

@@ -19,3 +19,11 @@ export const emitOTP = (email, token, connection = 'email', send='code') => {
 
     return postRawRequest(window.EMIT_OTP_ENDPOINT)(params, {'X-CSRF-TOKEN': token});
 }
+
+export const resendVerificationEmail = (email, token) => {
+    const params = {
+      email: email
+    };
+
+    return postRawRequest(window.RESEND_VERIFICATION_EMAIL_ENDPOINT)(params, {'X-CSRF-TOKEN': token});
+}