Various minor bug fixes (#4193)

* Minor bug fixes

* Add back schema

app/javascript/components/users/password_management/forms/ChangePwdForm.jsx

@@ -29,6 +29,7 @@ export default function ChangePwdForm() {
           onClick={() => methods.reset({
             old_password: '',
             new_password: '',
+            password_confirmation: '',
           })}
         >
           { t('cancel') }

app/javascript/hooks/mutations/users/useActivateAccount.jsx

 import toast from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { useMutation, useQueryClient } from 'react-query';
+import { useNavigate } from 'react-router-dom';
 import axios from '../../../helpers/Axios';
 
 export default function useActivateAccount(token) {
   const queryClient = useQueryClient();
   const { t } = useTranslation();
+  const navigate = useNavigate();
 
   return useMutation(
     () => axios.post('/verify_account/activate.json', { user: { token } }),
@@ -13,6 +15,7 @@ export default function useActivateAccount(token) {
       onSuccess: () => {
         queryClient.invalidateQueries('useSessions');
         toast.success(t('toast.success.user.account_activated'));
+        navigate('/rooms');
       },
       onError: () => {
         toast.error(t('toast.error.problem_completing_action'));

app/javascript/hooks/mutations/users/useChangePwd.jsx

@@ -10,7 +10,7 @@ export default function useChangePwd() {
     (user) => axios.post('/users/change_password.json', { user }),
     {
       onSuccess: () => {
-        toast.success(t('toast.success.password_updated'));
+        toast.success(t('toast.success.user.password_updated'));
       },
       onError: () => {
         toast.error(t('toast.error.problem_completing_action'));

app/javascript/hooks/mutations/users/useDeleteUser.jsx

@@ -14,7 +14,7 @@ export default function useUpdateUser(userId) {
     {
       onSuccess: () => {
         queryClient.invalidateQueries('useSessions');
-        toast.success(t('toast.success.user_deleted'));
+        toast.success(t('toast.success.user.user_deleted'));
         navigate('/');
       },
       onError: () => {

app/javascript/routes/AuthenticatedOnly.jsx

@@ -9,14 +9,14 @@ export default function AuthenticatedOnly() {
   const { t } = useTranslation();
   const currentUser = useAuth();
 
+  if (!currentUser.verified) {
+    return <VerifyAccount currentUser={currentUser} />;
+  }
+
   if (!currentUser.signed_in) {
     toast.error(t('toast.error.signin_required'));
     return <Navigate to="/" />;
   }
 
-  if (!currentUser.verified) {
-    return <VerifyAccount currentUser={currentUser} />;
-  }
-
   return <Outlet />;
 }

db/seeds.rb

@@ -14,7 +14,8 @@ User.create(
   password: 'Administrator1!',
   provider: 'greenlight',
   language: 'en',
-  role: Role.find_by(name: 'Administrator')
+  role: Role.find_by(name: 'Administrator'),
+  verified: true
 )
 
 Rails.logger.debug 'Successfully created an administrator account'