@ampath/esm-login-app 8.0.0-next.20 → 8.0.0-next.21

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"login","online":true,"offline":true},{"component":"root","route":"logout","online":true,"offline":true},{"component":"root","route":"change-password","online":true,"offline":true}],"extensions":[{"name":"location-picker","slot":"location-picker","component":"locationPicker","online":true,"offline":true},{"name":"logout-button","slot":"user-panel-bottom-slot","component":"logoutButton","online":true,"offline":true},{"name":"password-changer","slot":"user-panel-slot","component":"changePasswordLink","online":true,"offline":true},{"name":"location-changer","slot":"top-nav-info-slot","component":"changeLocationLink","online":true,"offline":true,"order":1}],"modals":[{"name":"change-password-modal","component":"changePasswordModal"}],"version":"8.0.0-next.20"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"login","online":true,"offline":true},{"component":"root","route":"logout","online":true,"offline":true},{"component":"root","route":"change-password","online":true,"offline":true}],"extensions":[{"name":"location-picker","slot":"location-picker","component":"locationPicker","online":true,"offline":true},{"name":"logout-button","slot":"user-panel-bottom-slot","component":"logoutButton","online":true,"offline":true},{"name":"password-changer","slot":"user-panel-slot","component":"changePasswordLink","online":true,"offline":true},{"name":"location-changer","slot":"top-nav-info-slot","component":"changeLocationLink","online":true,"offline":true,"order":1}],"modals":[{"name":"change-password-modal","component":"changePasswordModal"}],"version":"8.0.0-next.21"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-login-app",
-  "version": "8.0.0-next.20",
+  "version": "8.0.0-next.21",
   "license": "MPL-2.0",
   "description": "The login microfrontend for the OpenMRS SPA",
   "browser": "dist/esm-login-app.js",

package/src/login/login.component.tsx

@@ -125,12 +125,13 @@ const Login: React.FC = () => {
               const uuid = session.user.person.uuid;
               try {
                 const { email, phone } = await getEmailAndPhone(uuid, username, password);
-                await getOtp(username, password, email, phone);
+                const res = await getOtp(username, password, email, phone);
                 navigate('otp', {
                   state: {
                     username,
                     password,
                     referrer: location?.state?.referrer,
+                    message: res,
                   },
                 });
               } catch (err: any) {
@@ -141,12 +142,13 @@ const Login: React.FC = () => {
               const uuid = session.user.person.uuid;
               const { email, phone } = await getEmailAndPhone(uuid, username, password);
               try {
-                await getOtp(username, password, email, phone);
+                const res = await getOtp(username, password, email, phone);
                 navigate('otp', {
                   state: {
                     username,
                     password,
                     referrer: location?.state?.referrer,
+                    message: res,
                   },
                 });
               } catch (err: any) {

package/src/otp/otp.component.tsx

@@ -20,7 +20,7 @@ const OtpComponent: React.FC = () => {
   const { t } = useTranslation();
   const location = useLocation();
 
-  const { username, password } = location.state || {};
+  const { username, password, message } = location.state || {};
 
   const handleOtpChange = (val: React.SetStateAction<string>) => {
     setOtpValue(val);
@@ -50,10 +50,13 @@ const OtpComponent: React.FC = () => {
 
         let to = '/home';
         if (location.state?.referrer) {
-          to = location.state.referrer.startsWith('/')
-            ? `\${openmrsSpaBase}${location.state.referrer}`
-            : location.state.referrer;
+          to = location.state.referrer;
         }
+        // if (location.state?.referrer) {
+        //   to = location.state.referrer.startsWith('/')
+        //     ? `\${openmrsSpaBase}${location.state.referrer}`
+        //     : location.state.referrer;
+        // }
 
         navigate(to);
       } else {
@@ -84,9 +87,7 @@ const OtpComponent: React.FC = () => {
           </div>
           <div className={styles.container}>
             <h2 className={styles.header}>OTP</h2>
-            <p>
-              Please Check your email <br /> and enter your One Time Password
-            </p>
+            <p>{message || 'Enter the OTP sent to your registered email and phone number to complete login.'}</p>
             <OTPInput length={5} onChange={handleOtpChange} />
             {error && (
               <InlineNotification

package/src/resources/otp.resource.ts

@@ -1,12 +1,12 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { getEtlBaseUrl, getSubDomain } from '../utils/get-base-url';
+import { getEtlBaseUrl, getOtpKey, getSubDomain } from '../utils/get-base-url';
 
 const EMAIL_ATTRIBUTE_TYPE_UUID = 'ecabe213-160b-11ef-ad65-a0d3c1fcd41c';
 const PHONE_NUMBER_ATTRIBUTE_TYPE_UUID = '72a759a8-1359-11df-a1f1-0026b9348838';
 
 type ContactInfo = {
-  email: string | null;
-  phone: string | null;
+  email?: string | null;
+  phone?: string | null;
 };
 
 export async function getEmailAndPhone(uuid: string, username: string, password: string): Promise<ContactInfo> {
@@ -37,15 +37,15 @@ export async function getEmailAndPhone(uuid: string, username: string, password:
     const phoneAttr = data.attributes?.find(
       (attr) => !attr.voided && attr.attributeType?.uuid === PHONE_NUMBER_ATTRIBUTE_TYPE_UUID,
     );
-    const email = emailAttr?.value;
-    const phone = phoneAttr?.value;
+    const email = emailAttr?.value ?? null;
+    const phone = phoneAttr?.value ?? null;
 
-    if (email === undefined || email === null) {
-      throw new Error('Your email has not been configured. Please contact system administrator for assistance.');
-    }
-    if (phone === undefined || phone === null) {
-      throw new Error('Your phone number has not been configured. Please contact system administrator for assistance.');
+    if (!email && !phone) {
+      throw new Error(
+        'Neither email nor phone number has been configured. Please contact system administrator for assistance.',
+      );
     }
+
     return { email, phone };
   } catch (error) {
     throw new Error(error.message ?? 'Failed to fetch contact info');
@@ -54,7 +54,8 @@ export async function getEmailAndPhone(uuid: string, username: string, password:
 
 export async function getOtp(username: string, password: string, email: string, phone: string) {
   const etlBaseUrl = await getEtlBaseUrl();
-  const params = new URLSearchParams({ username, email, phone });
+  const key = await getOtpKey();
+  const params = new URLSearchParams({ username, email, phone, key });
   const credentials = window.btoa(`${username}:${password}`);
 
   try {
@@ -73,7 +74,7 @@ export async function getOtp(username: string, password: string, email: string,
       throw new Error(data.message);
     }
 
-    return data.data.message;
+    return data.data;
   } catch (error) {
     throw new Error(error.message);
   }

package/src/utils/get-base-url.ts

@@ -15,3 +15,8 @@ export async function getSubDomain() {
   const { subDomain } = await getConfig(moduleName);
   return subDomain ?? null;
 }
+
+export async function getOtpKey() {
+  const { otpKey } = await getConfig(moduleName);
+  return otpKey ?? null;
+}