@openmrs/esm-login-app 10.0.1-pre.5607 → 10.0.1-pre.5619

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-login-app",
-  "version": "10.0.1-pre.5607",
+  "version": "10.0.1-pre.5619",
   "license": "MPL-2.0",
   "description": "The login microfrontend for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-login-app.js",
@@ -59,7 +59,7 @@
     "@vitest/coverage-v8": "^4.1.2",
     "cross-env": "^10.1.0",
     "happy-dom": "^20.6.0",
-    "openmrs": "10.0.1-pre.5607",
+    "openmrs": "10.0.1-pre.5619",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^16.0.0",

package/src/login.resource.ts

@@ -2,15 +2,7 @@ import { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import useSwrInfinite, { type SWRInfiniteResponse } from 'swr/infinite';
 import useSwrImmutable from 'swr/immutable';
-import {
-  fhirBaseUrl,
-  openmrsFetch,
-  refetchCurrentUser,
-  restBaseUrl,
-  type FetchResponse,
-  type Session,
-  useDebounce,
-} from '@openmrs/esm-framework';
+import { fhirBaseUrl, openmrsFetch, type FetchResponse, useDebounce } from '@openmrs/esm-framework';
 import type { LocationEntry, LocationResponse } from './types';
 
 // "swr/infinite" doesn't export InfiniteKeyedMutator directly
@@ -106,21 +98,6 @@ export function useLoginLocations(
   return memoizedLocations;
 }
 
-export async function performLogin(username: string, password: string): Promise<{ data: Session }> {
-  const abortController = new AbortController();
-  const token = window.btoa(`${username}:${password}`);
-  const url = `${restBaseUrl}/session`;
-
-  return openmrsFetch(url, {
-    headers: {
-      Authorization: `Basic ${token}`,
-    },
-    signal: abortController.signal,
-  }).then((res) => {
-    refetchCurrentUser();
-    return res;
-  });
-}
 export function useValidateLocationUuid(userPreferredLocationUuid: string) {
   const url = userPreferredLocationUuid ? `${fhirBaseUrl}/Location?_id=${userPreferredLocationUuid}` : null;
   const { data, error, isLoading } = useSwrImmutable<FetchResponse<LocationResponse>>(url, openmrsFetch, {

package/src/redirect-logout/logout.resource.ts

@@ -1,19 +1,10 @@
 import { mutate } from 'swr';
-import { clearCurrentUser, openmrsFetch, refetchCurrentUser, restBaseUrl } from '@openmrs/esm-framework';
+import { logout } from '@openmrs/esm-framework/src/internal';
 
 export async function performLogout() {
-  await openmrsFetch(`${restBaseUrl}/session`, {
-    method: 'DELETE',
-  });
+  await logout();
 
   // clear the SWR cache on logout, do not revalidate
   // taken from the SWR docs
   mutate(() => true, undefined, { revalidate: false });
-
-  clearCurrentUser();
-  try {
-    await refetchCurrentUser();
-  } catch (_) {
-    // do nothing, silence the user-visible error
-  }
 }

package/src/redirect-logout/redirect-logout.test.tsx

@@ -2,33 +2,23 @@ import React from 'react';
 import { mutate } from 'swr';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { render, waitFor } from '@testing-library/react';
-import {
-  type FetchResponse,
-  type Session,
-  clearCurrentUser,
-  navigate,
-  openmrsFetch,
-  restBaseUrl,
-  setUserLanguage,
-  useConfig,
-  useSession,
-} from '@openmrs/esm-framework';
+import { type Session, navigate, setUserLanguage, useConfig, useSession } from '@openmrs/esm-framework';
+import { logout } from '@openmrs/esm-framework/src/internal';
 import RedirectLogout from './redirect-logout.component';
 
 vi.mock('swr', () => ({
   mutate: vi.fn(),
 }));
 
-const mockClearCurrentUser = vi.mocked(clearCurrentUser);
+const mockLogout = vi.mocked(logout);
 const mockNavigate = vi.mocked(navigate);
-const mockOpenmrsFetch = vi.mocked(openmrsFetch);
 const mockSetUserLanguage = vi.mocked(setUserLanguage);
 const mockUseConfig = vi.mocked(useConfig);
 const mockUseSession = vi.mocked(useSession);
 
 describe('RedirectLogout', () => {
   beforeEach(() => {
-    mockOpenmrsFetch.mockResolvedValue({} as FetchResponse<unknown>);
+    mockLogout.mockResolvedValue(undefined);
 
     mockUseSession.mockReturnValue({
       authenticated: true,
@@ -47,13 +37,10 @@ describe('RedirectLogout', () => {
   it('should redirect to login page upon logout', async () => {
     render(<RedirectLogout />);
 
-    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`${restBaseUrl}/session`, {
-      method: 'DELETE',
-    });
+    expect(mockLogout).toHaveBeenCalled();
 
     await waitFor(() => expect(mutate).toHaveBeenCalled());
 
-    expect(mockClearCurrentUser).toHaveBeenCalled();
     expect(mockSetUserLanguage).toHaveBeenCalledWith({
       locale: 'km',
       authenticated: false,
@@ -71,13 +58,10 @@ describe('RedirectLogout', () => {
 
     render(<RedirectLogout />);
 
-    expect(mockOpenmrsFetch).toHaveBeenCalledWith(`${restBaseUrl}/session`, {
-      method: 'DELETE',
-    });
+    expect(mockLogout).toHaveBeenCalled();
 
     await waitFor(() => expect(mutate).toHaveBeenCalled());
 
-    expect(mockClearCurrentUser).toHaveBeenCalled();
     expect(mockSetUserLanguage).toHaveBeenCalledWith({
       locale: 'km',
       authenticated: false,
@@ -98,7 +82,7 @@ describe('RedirectLogout', () => {
 
   it('should handle logout failure gracefully', async () => {
     const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
-    mockOpenmrsFetch.mockRejectedValue(new Error('Logout failed'));
+    mockLogout.mockRejectedValue(new Error('Logout failed'));
 
     render(<RedirectLogout />);
 

package/src/two-factor-auth/verification-challenge/totp-verification-challenge-page.component.tsx

@@ -4,13 +4,12 @@ import { useTranslation } from 'react-i18next';
 import { Button, Checkbox } from '@carbon/react';
 import {
   useConfig,
-  openmrsFetch,
-  refetchCurrentUser,
   navigate as openmrsNavigate,
   ArrowRightIcon,
   OpenmrsFetchError,
   ArrowLeftIcon,
 } from '@openmrs/esm-framework';
+import { verifyTotpCode } from '@openmrs/esm-framework/src/internal';
 import type { ConfigSchema } from '../../config-schema';
 import VerificationCodeInput from './verification-code-input.component';
 import LoginPageWrapper from '../../login-page-wrapper/login-page-wrapper.component';
@@ -33,20 +32,10 @@ const TotpVerificationChallengePage: React.FC = () => {
       setIsVerifying(true);
       setVerificationError('');
 
-      const sessionUrl = rememberDevice ? '/ws/rest/v1/session?rememberMe=true' : '/ws/rest/v1/session';
+      const session = await verifyTotpCode(code, rememberDevice);
 
-      const response = await openmrsFetch(sessionUrl, {
-        method: 'GET',
-        headers: {
-          'X-Totp-Code': code,
-        },
-      });
-
-      if (response.data && response.data.authenticated) {
-        const sessionStore = await refetchCurrentUser();
-        const session = sessionStore?.session;
-
-        if (session?.sessionLocation) {
+      if (session?.authenticated) {
+        if (session.sessionLocation) {
           let to = loginLinks?.loginSuccess || '/home';
           const referrer = location?.state?.referrer || sessionStorage.getItem('loginReferrer');
 

package/src/two-factor-auth/verification-challenge/totp-verification-challenge-page.test.tsx

@@ -3,14 +3,8 @@ import { beforeEach, describe, vi, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
-import {
-  useConfig,
-  openmrsFetch,
-  type FetchResponse,
-  OpenmrsFetchError,
-  refetchCurrentUser,
-  navigate as openmrsNavigate,
-} from '@openmrs/esm-framework';
+import { useConfig, type Session, navigate as openmrsNavigate } from '@openmrs/esm-framework';
+import { verifyTotpCode } from '@openmrs/esm-framework/src/internal';
 import type { ConfigSchema } from '../../config-schema';
 import TotpVerificationChallengePage from './totp-verification-challenge-page.component';
 
@@ -20,8 +14,7 @@ vi.mock('@openmrs/esm-framework', async () => {
     ...actual,
     useConfig: vi.fn(),
     interpolateUrl: vi.fn(),
-    openmrsFetch: vi.fn(),
-    refetchCurrentUser: vi.fn(),
+    verifyTotpCode: vi.fn(),
     navigate: vi.fn(),
   };
 });
@@ -67,10 +60,8 @@ describe('TotpVerificationChallengePage', () => {
     expect(verifyButton).toBeDisabled();
   });
 
-  it('should append rememberMe=true to the request only when the checkbox is checked', async () => {
-    vi.mocked(openmrsFetch).mockResolvedValue({
-      data: { authenticated: true },
-    } as unknown as FetchResponse<unknown>);
+  it('should ask the server to remember the device only when the checkbox is checked', async () => {
+    vi.mocked(verifyTotpCode).mockResolvedValue({ authenticated: true } as Session);
 
     const { user } = setup();
     const inputs = screen.getAllByRole('textbox');
@@ -81,27 +72,21 @@ describe('TotpVerificationChallengePage', () => {
     const verifyButton = screen.getByRole('button', { name: /verify/i });
     const rememberMeCheckbox = screen.getByLabelText(/Remember this device/i);
     await user.click(verifyButton);
-    expect(openmrsFetch).toHaveBeenCalledWith(
-      '/ws/rest/v1/session?rememberMe=true',
-      expect.objectContaining({ method: 'GET' }),
-    );
+    expect(verifyTotpCode).toHaveBeenLastCalledWith('123456', true);
 
     await user.click(rememberMeCheckbox);
     expect(rememberMeCheckbox).not.toBeChecked();
 
     await user.click(verifyButton);
-    expect(openmrsFetch).toHaveBeenCalledWith('/ws/rest/v1/session', expect.objectContaining({ method: 'GET' }));
+    expect(verifyTotpCode).toHaveBeenLastCalledWith('123456', false);
   });
 
   it('should use the original referrer from sessionStorage and clear it after successful verification', async () => {
     sessionStorage.setItem('loginReferrer', '/patient-chart');
-    vi.mocked(openmrsFetch).mockResolvedValue({
-      data: { authenticated: true },
-    } as unknown as FetchResponse<unknown>);
-
-    vi.mocked(refetchCurrentUser).mockResolvedValue({
-      session: { sessionLocation: { uuid: 'location-123', display: 'Pharmacy' } },
-    } as any);
+    vi.mocked(verifyTotpCode).mockResolvedValue({
+      authenticated: true,
+      sessionLocation: { uuid: 'location-123', display: 'Pharmacy' },
+    } as Session);
 
     const { user } = setup();
 
@@ -116,13 +101,10 @@ describe('TotpVerificationChallengePage', () => {
   });
 
   it('should verify successfully and navigate to home if the user has a session location', async () => {
-    vi.mocked(openmrsFetch).mockResolvedValue({
-      data: { authenticated: true },
-    } as unknown as FetchResponse<unknown>);
-
-    vi.mocked(refetchCurrentUser).mockResolvedValue({
-      session: { sessionLocation: { uuid: 'location-123', display: 'Pharmacy' } },
-    } as any);
+    vi.mocked(verifyTotpCode).mockResolvedValue({
+      authenticated: true,
+      sessionLocation: { uuid: 'location-123', display: 'Pharmacy' },
+    } as Session);
 
     const { user } = setup();
 
@@ -132,15 +114,21 @@ describe('TotpVerificationChallengePage', () => {
 
     const verifyButton = screen.getByRole('button', { name: /verify/i });
     await user.click(verifyButton);
-    expect(openmrsFetch).toHaveBeenCalledWith(
-      expect.stringContaining('/ws/rest/v1/session'),
-      expect.objectContaining({
-        method: 'GET',
-        headers: { 'X-Totp-Code': '123456' },
-      }),
-    );
-
-    expect(refetchCurrentUser).toHaveBeenCalled();
+    expect(verifyTotpCode).toHaveBeenCalledWith('123456', true);
     expect(openmrsNavigate).toHaveBeenCalledWith({ to: '/home' });
   });
+
+  it('should show an error and stay on the page when the code is not accepted', async () => {
+    vi.mocked(verifyTotpCode).mockResolvedValue({ authenticated: false } as Session);
+
+    const { user } = setup();
+
+    const inputs = screen.getAllByRole('textbox');
+    await user.click(inputs[0]);
+    await user.paste('123456');
+    await user.click(screen.getByRole('button', { name: /verify/i }));
+
+    expect(screen.getByText(/We could not verify that code/i)).toBeInTheDocument();
+    expect(openmrsNavigate).not.toHaveBeenCalled();
+  });
 });