fix: check that application URL and email agent are configured for password reset/generation (#1724)

* fix: check that application URL and email agent are configured for password reset/generation

* refactor: reverse flex direction instead of conditionally changing justify

src/components/Login/LocalLogin.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link';
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import * as Yup from 'yup';
+import useSettings from '../../hooks/useSettings';
 import Button from '../Common/Button';
 import SensitiveInput from '../Common/SensitiveInput';
 
@@ -25,6 +26,7 @@ interface LocalLoginProps {
 
 const LocalLogin: React.FC<LocalLoginProps> = ({ revalidate }) => {
   const intl = useIntl();
+  const settings = useSettings();
   const [loginError, setLoginError] = useState<string | null>(null);
 
   const LoginSchema = Yup.object().shape({
@@ -36,6 +38,10 @@ const LocalLogin: React.FC<LocalLoginProps> = ({ revalidate }) => {
     ),
   });
 
+  const passwordResetEnabled =
+    settings.currentSettings.applicationUrl &&
+    settings.currentSettings.emailEnabled;
+
   return (
     <Formik
       initialValues={{
@@ -60,7 +66,7 @@ const LocalLogin: React.FC<LocalLoginProps> = ({ revalidate }) => {
         return (
           <>
             <Form>
-              <div className="sm:border-t sm:border-gray-800">
+              <div>
                 <label htmlFor="email" className="text-label">
                   {intl.formatMessage(messages.email)}
                 </label>
@@ -101,17 +107,7 @@ const LocalLogin: React.FC<LocalLoginProps> = ({ revalidate }) => {
                 )}
               </div>
               <div className="pt-5 mt-8 border-t border-gray-700">
-                <div className="flex justify-between">
-                  <span className="inline-flex rounded-md shadow-sm">
-                    <Link href="/resetpassword" passHref>
-                      <Button as="a" buttonType="ghost">
-                        <SupportIcon />
-                        <span>
-                          {intl.formatMessage(messages.forgotpassword)}
-                        </span>
-                      </Button>
-                    </Link>
-                  </span>
+                <div className="flex flex-row-reverse justify-between">
                   <span className="inline-flex rounded-md shadow-sm">
                     <Button
                       buttonType="primary"
@@ -126,6 +122,18 @@ const LocalLogin: React.FC<LocalLoginProps> = ({ revalidate }) => {
                       </span>
                     </Button>
                   </span>
+                  {passwordResetEnabled && (
+                    <span className="inline-flex rounded-md shadow-sm">
+                      <Link href="/resetpassword" passHref>
+                        <Button as="a" buttonType="ghost">
+                          <SupportIcon />
+                          <span>
+                            {intl.formatMessage(messages.forgotpassword)}
+                          </span>
+                        </Button>
+                      </Link>
+                    </span>
+                  )}
                 </div>
               </div>
             </Form>

src/components/ResetPassword/RequestResetLink.tsx

@@ -94,7 +94,7 @@ const ResetPassword: React.FC = () => {
                 {({ errors, touched, isSubmitting, isValid }) => {
                   return (
                     <Form>
-                      <div className="sm:border-t sm:border-gray-800">
+                      <div>
                         <label
                           htmlFor="email"
                           className="block my-1 text-sm font-medium leading-5 text-gray-400 sm:mt-px"

src/components/ResetPassword/index.tsx

@@ -108,7 +108,7 @@ const ResetPassword: React.FC = () => {
                 {({ errors, touched, isSubmitting, isValid }) => {
                   return (
                     <Form>
-                      <div className="sm:border-t sm:border-gray-800">
+                      <div>
                         <label
                           htmlFor="password"
                           className="block my-1 text-sm font-medium leading-5 text-gray-400 sm:mt-px"

src/components/Settings/Notifications/NotificationsEmail.tsx

@@ -3,7 +3,7 @@ import { Field, Form, Formik } from 'formik';
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import useSWR from 'swr';
+import useSWR, { mutate } from 'swr';
 import * as Yup from 'yup';
 import globalMessages from '../../../i18n/globalMessages';
 import Badge from '../../Common/Badge';
@@ -159,6 +159,7 @@ const NotificationsEmail: React.FC = () => {
               pgpPassword: values.pgpPassword,
             },
           });
+          mutate('/api/v1/settings/public');
 
           addToast(intl.formatMessage(messages.emailsettingssaved), {
             appearance: 'success',

src/components/UserList/index.tsx

@@ -15,7 +15,6 @@ import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 import * as Yup from 'yup';
 import type { UserResultsResponse } from '../../../server/interfaces/api/userInterfaces';
-import { UserSettingsNotificationsResponse } from '../../../server/interfaces/api/userSettingsInterfaces';
 import { hasPermission } from '../../../server/lib/permissions';
 import useSettings from '../../hooks/useSettings';
 import { useUpdateQueryParams } from '../../hooks/useUpdateQueryParams';
@@ -70,7 +69,7 @@ const messages = defineMessages({
   email: 'Email Address',
   password: 'Password',
   passwordinfodescription:
-    'Enable email notifications to allow automatic password generation.',
+    'Configure an application URL and enable email notifications to allow automatic password generation.',
   autogeneratepassword: 'Automatically Generate Password',
   autogeneratepasswordTip: 'Email a server-generated password to the user',
   validationEmail: 'You must provide a valid email address',
@@ -102,12 +101,6 @@ const UserList: React.FC = () => {
       pageIndex * currentPageSize
     }&sort=${currentSort}`
   );
-  const { data: notificationSettings } =
-    useSWR<UserSettingsNotificationsResponse>(
-      currentUser
-        ? `/api/v1/user/${currentUser?.id}/settings/notifications`
-        : null
-    );
 
   const [isDeleting, setDeleting] = useState(false);
   const [isImporting, setImporting] = useState(false);
@@ -254,6 +247,10 @@ const UserList: React.FC = () => {
   const hasNextPage = data.pageInfo.pages > pageIndex + 1;
   const hasPrevPage = pageIndex > 0;
 
+  const passwordGenerationEnabled =
+    settings.currentSettings.applicationUrl &&
+    settings.currentSettings.emailEnabled;
+
   return (
     <>
       <PageTitle title={intl.formatMessage(messages.users)} />
@@ -366,12 +363,15 @@ const UserList: React.FC = () => {
                     type="warning"
                   />
                 )}
-                {!notificationSettings?.emailEnabled && (
-                  <Alert
-                    title={intl.formatMessage(messages.passwordinfodescription)}
-                    type="info"
-                  />
-                )}
+                {currentHasPermission(Permission.MANAGE_SETTINGS) &&
+                  !passwordGenerationEnabled && (
+                    <Alert
+                      title={intl.formatMessage(
+                        messages.passwordinfodescription
+                      )}
+                      type="info"
+                    />
+                  )}
                 <Form className="section">
                   <div className="form-row">
                     <label htmlFor="displayName" className="text-label">
@@ -408,7 +408,7 @@ const UserList: React.FC = () => {
                   </div>
                   <div
                     className={`form-row ${
-                      notificationSettings?.emailEnabled ? '' : 'opacity-50'
+                      passwordGenerationEnabled ? '' : 'opacity-50'
                     }`}
                   >
                     <label htmlFor="genpassword" className="checkbox-label">
@@ -422,7 +422,7 @@ const UserList: React.FC = () => {
                         type="checkbox"
                         id="genpassword"
                         name="genpassword"
-                        disabled={!notificationSettings?.emailEnabled}
+                        disabled={!passwordGenerationEnabled}
                         onClick={() => setFieldValue('password', '')}
                       />
                     </div>