@oneblink/apps-react 10.3.1 → 11.0.0-beta.1

package/dist/apps/auth-service.d.ts

@@ -1,8 +1,9 @@
 import { MiscTypes } from '@oneblink/types';
 import { getIdToken, getFormsKeyId, setFormsKeyToken } from './services/forms-key';
-import { registerAuthListener, isLoggedIn, loginHostedUI, loginUsernamePassword, changePassword, forgotPassword, handleAuthentication, logoutHostedUI, getUserProfile, getUserFriendlyName, LoginAttemptResponse, checkIsMfaEnabled, disableMfa, setupMfa, generateMfaQrCodeUrl } from './services/cognito';
+import { registerAuthListener, isLoggedIn, loginHostedUI, loginUsernamePassword, changePassword, forgotPassword, handleAuthentication, logoutHostedUI, getUserProfile, getUserFriendlyName, LoginAttemptResponse, MfaMethod, MfaRequirementCheckResult, MfaSettings, checkIsMfaEnabled, getMfaSettings, updateUserPhoneNumber, removeUserPhoneNumber, sendPhoneNumberVerificationCode, verifyUserPhoneNumber, disableMfaMethod, setPreferredMfaMethod, setupMfaAuthenticatorApp, setupSmsMfa, generateMfaAuthenticatorAppQrCodeUrl, DEFAULT_MFA_SETTINGS } from './services/cognito';
 import { getUserToken, setUserToken } from './services/user-token';
-export { registerAuthListener, loginHostedUI, loginUsernamePassword, handleAuthentication, logoutHostedUI, changePassword, forgotPassword, isLoggedIn, getIdToken, getUserProfile, getFormsKeyId, setFormsKeyToken, getUserToken, setUserToken, getUserFriendlyName, LoginAttemptResponse, checkIsMfaEnabled, disableMfa, setupMfa, generateMfaQrCodeUrl, };
+export { registerAuthListener, loginHostedUI, loginUsernamePassword, handleAuthentication, logoutHostedUI, changePassword, forgotPassword, isLoggedIn, getIdToken, getUserProfile, getFormsKeyId, setFormsKeyToken, getUserToken, setUserToken, getUserFriendlyName, checkIsMfaEnabled, getMfaSettings, updateUserPhoneNumber, removeUserPhoneNumber, sendPhoneNumberVerificationCode, verifyUserPhoneNumber, disableMfaMethod, setPreferredMfaMethod, setupMfaAuthenticatorApp, setupSmsMfa, generateMfaAuthenticatorAppQrCodeUrl, DEFAULT_MFA_SETTINGS, };
+export type { LoginAttemptResponse, MfaMethod, MfaRequirementCheckResult, MfaSettings, };
 /**
  * Log the current user out and remove an data stored locally by the user e.g.
  * drafts.

package/dist/apps/auth-service.js

@@ -1,11 +1,11 @@
 import OneBlinkAppsError from './services/errors/oneBlinkAppsError';
 import { getIdToken, getFormsKeyId, setFormsKeyToken, } from './services/forms-key';
-import { init as initCognito, registerAuthListener, isLoggedIn, loginHostedUI, loginUsernamePassword, changePassword, forgotPassword, handleAuthentication, logoutHostedUI, logout as logoutCognito, getUserProfile, getUsername, getUserFriendlyName, checkIsMfaEnabled, disableMfa, setupMfa, generateMfaQrCodeUrl, } from './services/cognito';
+import { init as initCognito, registerAuthListener, isLoggedIn, loginHostedUI, loginUsernamePassword, changePassword, forgotPassword, handleAuthentication, logoutHostedUI, logout as logoutCognito, getUserProfile, getUsername, getUserFriendlyName, checkIsMfaEnabled, getMfaSettings, updateUserPhoneNumber, removeUserPhoneNumber, sendPhoneNumberVerificationCode, verifyUserPhoneNumber, disableMfaMethod, setPreferredMfaMethod, setupMfaAuthenticatorApp, setupSmsMfa, generateMfaAuthenticatorAppQrCodeUrl, DEFAULT_MFA_SETTINGS, } from './services/cognito';
 import { getRequest, postRequest } from './services/fetch';
 import tenants from './tenants';
 import { getUserToken, setUserToken } from './services/user-token';
 import utilsService from './services/utils';
-export { registerAuthListener, loginHostedUI, loginUsernamePassword, handleAuthentication, logoutHostedUI, changePassword, forgotPassword, isLoggedIn, getIdToken, getUserProfile, getFormsKeyId, setFormsKeyToken, getUserToken, setUserToken, getUserFriendlyName, checkIsMfaEnabled, disableMfa, setupMfa, generateMfaQrCodeUrl, };
+export { registerAuthListener, loginHostedUI, loginUsernamePassword, handleAuthentication, logoutHostedUI, changePassword, forgotPassword, isLoggedIn, getIdToken, getUserProfile, getFormsKeyId, setFormsKeyToken, getUserToken, setUserToken, getUserFriendlyName, checkIsMfaEnabled, getMfaSettings, updateUserPhoneNumber, removeUserPhoneNumber, sendPhoneNumberVerificationCode, verifyUserPhoneNumber, disableMfaMethod, setPreferredMfaMethod, setupMfaAuthenticatorApp, setupSmsMfa, generateMfaAuthenticatorAppQrCodeUrl, DEFAULT_MFA_SETTINGS, };
 import Sentry from './Sentry';
 /**
  * Log the current user out and remove an data stored locally by the user e.g.

package/dist/apps/auth-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../src/apps/auth-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { MiscTypes } from '@oneblink/types'\nimport OneBlinkAppsError from './services/errors/oneBlinkAppsError'\nimport {\n  getIdToken,\n  getFormsKeyId,\n  setFormsKeyToken,\n} from './services/forms-key'\nimport {\n  init as initCognito,\n  registerAuthListener,\n  isLoggedIn,\n  loginHostedUI,\n  loginUsernamePassword,\n  changePassword,\n  forgotPassword,\n  handleAuthentication,\n  logoutHostedUI,\n  logout as logoutCognito,\n  getUserProfile,\n  getUsername,\n  getUserFriendlyName,\n  LoginAttemptResponse,\n  checkIsMfaEnabled,\n  disableMfa,\n  setupMfa,\n  generateMfaQrCodeUrl,\n} from './services/cognito'\nimport { getRequest, postRequest, HTTPError } from './services/fetch'\nimport tenants from './tenants'\nimport { getUserToken, setUserToken } from './services/user-token'\nimport utilsService from './services/utils'\n\nexport {\n  registerAuthListener,\n  loginHostedUI,\n  loginUsernamePassword,\n  handleAuthentication,\n  logoutHostedUI,\n  changePassword,\n  forgotPassword,\n  isLoggedIn,\n  getIdToken,\n  getUserProfile,\n  getFormsKeyId,\n  setFormsKeyToken,\n  getUserToken,\n  setUserToken,\n  getUserFriendlyName,\n  LoginAttemptResponse,\n  checkIsMfaEnabled,\n  disableMfa,\n  setupMfa,\n  generateMfaQrCodeUrl,\n}\nimport Sentry from './Sentry'\n\n/**\n * Log the current user out and remove an data stored locally by the user e.g.\n * drafts.\n *\n * #### Example\n *\n * ```js\n * await authService.logout()\n * ```\n */\nexport async function logout() {\n  console.log('Logging out...')\n\n  try {\n    await utilsService.localForage.clear()\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Could not clear localForage before logging out', error)\n  }\n\n  await logoutCognito()\n}\n\n/**\n * Initialize the service with required configuration. **This must be done\n * before using before some of the function in this service.**\n *\n * #### Example\n *\n * ```js\n * authService.init({\n *   oAuthClientId: 'YOUR_OAUTH_CLIENT_ID',\n * })\n * ```\n *\n * @param options\n */\nexport function init({ oAuthClientId }: { oAuthClientId: string }) {\n  initCognito({\n    region: tenants.current.awsRegion,\n    loginDomain: tenants.current.loginDomain,\n    oAuthClientId,\n    redirectUri: window.location.origin + '/callback',\n    logoutUri: window.location.origin + '/logout',\n  })\n\n  const listener = () => {\n    Sentry.setTag('username', getUsername() || undefined)\n  }\n  listener()\n  registerAuthListener(listener)\n}\n\n/**\n * Determine if the current user is a OneBlink App User for a OneBlink Forms\n * App. Returns `false` if the current user is not logged in.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * const isAuthorised = await authService.isAuthorised(formsAppId)\n * if (!isAuthorised) {\n *   // handle unauthorised user\n * }\n * ```\n *\n * @param formsAppId\n * @param abortSignal\n * @returns\n */\nexport async function isAuthorised(\n  formsAppId: number,\n  abortSignal?: AbortSignal,\n): Promise<boolean> {\n  return getCurrentFormsAppUser(formsAppId, abortSignal)\n    .then(() => true)\n    .catch((error) => {\n      if (error.status >= 400 && error.status < 500) {\n        return false\n      } else {\n        Sentry.captureException(error)\n        console.log(\n          'Could not determine if the current user has access to this forms app',\n          error,\n        )\n        return false\n      }\n    })\n}\n\n/**\n * Get the current user's App User details for a OneBlink Forms App. Returns\n * `undefined` if the current user is not logged in.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * const formsAppUserDetails =\n *   await authService.getCurrentFormsAppUser(formsAppId)\n * if (!formsAppUserDetails) {\n *   // handle unauthorised user\n * }\n * ```\n *\n * @param formsAppId\n * @returns\n */\nexport async function getCurrentFormsAppUser(\n  formsAppId: number,\n  abortSignal?: AbortSignal,\n): Promise<\n  | {\n      userProfile?: MiscTypes.UserProfile\n      formsAppId: number\n      groups: string[]\n    }\n  | undefined\n> {\n  if (getFormsKeyId()) {\n    return {\n      formsAppId,\n      groups: [],\n    }\n  }\n\n  const userProfile = getUserProfile()\n\n  if (!userProfile) {\n    return undefined\n  }\n\n  const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/my-forms-app-user`\n  return await getRequest<{\n    userProfile?: MiscTypes.UserProfile\n    formsAppId: number\n    groups: string[]\n  }>(url, abortSignal)\n}\n\n/**\n * If the current user is not a Forms App User, this function will send a\n * request on behalf of the current user to the OneBlink Forms App\n * administrators to request access.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * await authService.requestAccess(formsAppId)\n * // Display a message to user indicating a request has been sent to the application administrators\n * ```\n *\n * @param formsAppId\n */\nexport async function requestAccess(formsAppId: number): Promise<void> {\n  if (!isLoggedIn()) {\n    throw new OneBlinkAppsError(\n      'You must login before requesting access to this application',\n      {\n        requiresLogin: true,\n      },\n    )\n  }\n\n  try {\n    const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/request-access`\n    await postRequest(url)\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Error while requesting access to forms app', error)\n\n    throw new OneBlinkAppsError(\n      'Sorry, we could not request access automatically right now, please try again. If the problem persists, please contact your administrator yourself.',\n      {\n        originalError: error as Error,\n        title: 'Error Requesting Access',\n        httpStatusCode: (error as HTTPError).status,\n      },\n    )\n  }\n}\n\n/**\n * Allow a user to sign up to a forms app.\n *\n * #### Example\n *\n * ```js\n * await authService.signUp({\n *   formsAppId: 1,\n *   email: 'test@oneblink.io',\n *   firstName: 'first',\n *   lastName: 'last',\n * })\n * ```\n *\n * @param {formsAppId, email, generatePassword, firstName, lastName}\n * @returns\n */\n\nexport async function signUp({\n  formsAppId,\n  email,\n  firstName,\n  lastName,\n}: {\n  formsAppId: number\n  email: string\n  firstName?: string\n  lastName?: string\n}): Promise<void> {\n  try {\n    const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/sign-up`\n    return await postRequest(url, {\n      email,\n      firstName,\n      lastName,\n    })\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Error while calling sign-up to forms app', error)\n\n    throw new OneBlinkAppsError(\n      'Sorry, we could not create you a account right now, please try again. If the problem persists, please contact your administrator yourself.',\n      {\n        originalError: error as Error,\n        title: 'Error Signing up',\n        httpStatusCode: (error as HTTPError).status,\n      },\n    )\n  }\n}\n"]}
+{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../src/apps/auth-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { MiscTypes } from '@oneblink/types'\nimport OneBlinkAppsError from './services/errors/oneBlinkAppsError'\nimport {\n  getIdToken,\n  getFormsKeyId,\n  setFormsKeyToken,\n} from './services/forms-key'\nimport {\n  init as initCognito,\n  registerAuthListener,\n  isLoggedIn,\n  loginHostedUI,\n  loginUsernamePassword,\n  changePassword,\n  forgotPassword,\n  handleAuthentication,\n  logoutHostedUI,\n  logout as logoutCognito,\n  getUserProfile,\n  getUsername,\n  getUserFriendlyName,\n  LoginAttemptResponse,\n  MfaMethod,\n  MfaRequirementCheckResult,\n  MfaSettings,\n  checkIsMfaEnabled,\n  getMfaSettings,\n  updateUserPhoneNumber,\n  removeUserPhoneNumber,\n  sendPhoneNumberVerificationCode,\n  verifyUserPhoneNumber,\n  disableMfaMethod,\n  setPreferredMfaMethod,\n  setupMfaAuthenticatorApp,\n  setupSmsMfa,\n  generateMfaAuthenticatorAppQrCodeUrl,\n  DEFAULT_MFA_SETTINGS,\n} from './services/cognito'\nimport { getRequest, postRequest, HTTPError } from './services/fetch'\nimport tenants from './tenants'\nimport { getUserToken, setUserToken } from './services/user-token'\nimport utilsService from './services/utils'\n\nexport {\n  registerAuthListener,\n  loginHostedUI,\n  loginUsernamePassword,\n  handleAuthentication,\n  logoutHostedUI,\n  changePassword,\n  forgotPassword,\n  isLoggedIn,\n  getIdToken,\n  getUserProfile,\n  getFormsKeyId,\n  setFormsKeyToken,\n  getUserToken,\n  setUserToken,\n  getUserFriendlyName,\n  checkIsMfaEnabled,\n  getMfaSettings,\n  updateUserPhoneNumber,\n  removeUserPhoneNumber,\n  sendPhoneNumberVerificationCode,\n  verifyUserPhoneNumber,\n  disableMfaMethod,\n  setPreferredMfaMethod,\n  setupMfaAuthenticatorApp,\n  setupSmsMfa,\n  generateMfaAuthenticatorAppQrCodeUrl,\n  DEFAULT_MFA_SETTINGS,\n}\nexport type {\n  LoginAttemptResponse,\n  MfaMethod,\n  MfaRequirementCheckResult,\n  MfaSettings,\n}\nimport Sentry from './Sentry'\n\n/**\n * Log the current user out and remove an data stored locally by the user e.g.\n * drafts.\n *\n * #### Example\n *\n * ```js\n * await authService.logout()\n * ```\n */\nexport async function logout() {\n  console.log('Logging out...')\n\n  try {\n    await utilsService.localForage.clear()\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Could not clear localForage before logging out', error)\n  }\n\n  await logoutCognito()\n}\n\n/**\n * Initialize the service with required configuration. **This must be done\n * before using before some of the function in this service.**\n *\n * #### Example\n *\n * ```js\n * authService.init({\n *   oAuthClientId: 'YOUR_OAUTH_CLIENT_ID',\n * })\n * ```\n *\n * @param options\n */\nexport function init({ oAuthClientId }: { oAuthClientId: string }) {\n  initCognito({\n    region: tenants.current.awsRegion,\n    loginDomain: tenants.current.loginDomain,\n    oAuthClientId,\n    redirectUri: window.location.origin + '/callback',\n    logoutUri: window.location.origin + '/logout',\n  })\n\n  const listener = () => {\n    Sentry.setTag('username', getUsername() || undefined)\n  }\n  listener()\n  registerAuthListener(listener)\n}\n\n/**\n * Determine if the current user is a OneBlink App User for a OneBlink Forms\n * App. Returns `false` if the current user is not logged in.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * const isAuthorised = await authService.isAuthorised(formsAppId)\n * if (!isAuthorised) {\n *   // handle unauthorised user\n * }\n * ```\n *\n * @param formsAppId\n * @param abortSignal\n * @returns\n */\nexport async function isAuthorised(\n  formsAppId: number,\n  abortSignal?: AbortSignal,\n): Promise<boolean> {\n  return getCurrentFormsAppUser(formsAppId, abortSignal)\n    .then(() => true)\n    .catch((error) => {\n      if (error.status >= 400 && error.status < 500) {\n        return false\n      } else {\n        Sentry.captureException(error)\n        console.log(\n          'Could not determine if the current user has access to this forms app',\n          error,\n        )\n        return false\n      }\n    })\n}\n\n/**\n * Get the current user's App User details for a OneBlink Forms App. Returns\n * `undefined` if the current user is not logged in.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * const formsAppUserDetails =\n *   await authService.getCurrentFormsAppUser(formsAppId)\n * if (!formsAppUserDetails) {\n *   // handle unauthorised user\n * }\n * ```\n *\n * @param formsAppId\n * @returns\n */\nexport async function getCurrentFormsAppUser(\n  formsAppId: number,\n  abortSignal?: AbortSignal,\n): Promise<\n  | {\n      userProfile?: MiscTypes.UserProfile\n      formsAppId: number\n      groups: string[]\n    }\n  | undefined\n> {\n  if (getFormsKeyId()) {\n    return {\n      formsAppId,\n      groups: [],\n    }\n  }\n\n  const userProfile = getUserProfile()\n\n  if (!userProfile) {\n    return undefined\n  }\n\n  const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/my-forms-app-user`\n  return await getRequest<{\n    userProfile?: MiscTypes.UserProfile\n    formsAppId: number\n    groups: string[]\n  }>(url, abortSignal)\n}\n\n/**\n * If the current user is not a Forms App User, this function will send a\n * request on behalf of the current user to the OneBlink Forms App\n * administrators to request access.\n *\n * #### Example\n *\n * ```js\n * const formsAppId = 1\n * await authService.requestAccess(formsAppId)\n * // Display a message to user indicating a request has been sent to the application administrators\n * ```\n *\n * @param formsAppId\n */\nexport async function requestAccess(formsAppId: number): Promise<void> {\n  if (!isLoggedIn()) {\n    throw new OneBlinkAppsError(\n      'You must login before requesting access to this application',\n      {\n        requiresLogin: true,\n      },\n    )\n  }\n\n  try {\n    const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/request-access`\n    await postRequest(url)\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Error while requesting access to forms app', error)\n\n    throw new OneBlinkAppsError(\n      'Sorry, we could not request access automatically right now, please try again. If the problem persists, please contact your administrator yourself.',\n      {\n        originalError: error as Error,\n        title: 'Error Requesting Access',\n        httpStatusCode: (error as HTTPError).status,\n      },\n    )\n  }\n}\n\n/**\n * Allow a user to sign up to a forms app.\n *\n * #### Example\n *\n * ```js\n * await authService.signUp({\n *   formsAppId: 1,\n *   email: 'test@oneblink.io',\n *   firstName: 'first',\n *   lastName: 'last',\n * })\n * ```\n *\n * @param {formsAppId, email, generatePassword, firstName, lastName}\n * @returns\n */\n\nexport async function signUp({\n  formsAppId,\n  email,\n  firstName,\n  lastName,\n}: {\n  formsAppId: number\n  email: string\n  firstName?: string\n  lastName?: string\n}): Promise<void> {\n  try {\n    const url = `${tenants.current.apiOrigin}/forms-apps/${formsAppId}/sign-up`\n    return await postRequest(url, {\n      email,\n      firstName,\n      lastName,\n    })\n  } catch (error) {\n    Sentry.captureException(error)\n    console.warn('Error while calling sign-up to forms app', error)\n\n    throw new OneBlinkAppsError(\n      'Sorry, we could not create you a account right now, please try again. If the problem persists, please contact your administrator yourself.',\n      {\n        originalError: error as Error,\n        title: 'Error Signing up',\n        httpStatusCode: (error as HTTPError).status,\n      },\n    )\n  }\n}\n"]}

package/dist/apps/services/AWSCognitoClient.d.ts

@@ -1,7 +1,29 @@
 import { AuthenticationResultType, CognitoIdentityProviderClient, InitiateAuthResponse } from '@aws-sdk/client-cognito-identity-provider';
+import { MiscTypes } from '@oneblink/types';
+export type MfaMethod = 'authenticator' | 'sms';
+export type MfaSettings = {
+    authenticator: {
+        enabled: boolean;
+        preferred: boolean;
+    };
+    sms: {
+        enabled: boolean;
+        preferred: boolean;
+        phoneNumber: string | undefined;
+        isPhoneNumberVerified: boolean;
+    };
+};
+export declare const DEFAULT_MFA_SETTINGS: MfaSettings;
+export type MfaRequirementCheckResult = {
+    mfaSettings: MfaSettings;
+    userMeetsMfaRequirement: boolean;
+};
 export type LoginAttemptResponse = {
     resetPasswordCallback?: (newPassword: string) => Promise<LoginAttemptResponse>;
-    mfaCodeCallback?: (code: string) => Promise<LoginAttemptResponse>;
+    mfa?: {
+        codeCallback: (code: string) => Promise<LoginAttemptResponse>;
+        method: MfaMethod;
+    };
 };
 export default class AWSCognitoClient {
     clientId: string;
@@ -46,9 +68,22 @@ export default class AWSCognitoClient {
     logout(): Promise<void>;
     getIdToken(): Promise<string | undefined>;
     getAccessToken(): Promise<string | undefined>;
-    checkIsMfaEnabled(): Promise<boolean>;
-    disableMfa(): Promise<void>;
-    setupMfa(): Promise<{
+    getMfaSettings(abortSignal?: AbortSignal): Promise<MfaSettings>;
+    checkIsMfaEnabled(mfaRequirement: MiscTypes.MfaRequirement | undefined): Promise<MfaRequirementCheckResult>;
+    updateUserPhoneNumber(phoneNumber: string): Promise<{
+        isPhoneNumberVerified: boolean;
+    }>;
+    removeUserPhoneNumber(): Promise<void>;
+    sendPhoneNumberVerificationCode(): Promise<import("@aws-sdk/client-cognito-identity-provider").GetUserAttributeVerificationCodeCommandOutput | undefined>;
+    verifyUserPhoneNumber(code: string): Promise<void>;
+    setPreferredMfaMethod(method: MfaMethod): Promise<void>;
+    disableMfaMethod(method: MfaMethod): Promise<void>;
+    setupSmsMfa({ preferred }?: {
+        preferred?: boolean;
+    }): Promise<void>;
+    setupMfaAuthenticatorApp({ preferred }?: {
+        preferred?: boolean;
+    }): Promise<{
         secretCode: string | undefined;
         mfaCodeCallback: (code: string) => Promise<void>;
     } | undefined>;

package/dist/apps/services/AWSCognitoClient.js

@@ -1,6 +1,29 @@
-import { AssociateSoftwareTokenCommand, ChangePasswordCommand, CognitoIdentityProviderClient, ConfirmForgotPasswordCommand, GetUserCommand, GlobalSignOutCommand, InitiateAuthCommand, RespondToAuthChallengeCommand, SetUserMFAPreferenceCommand, VerifySoftwareTokenCommand, } from '@aws-sdk/client-cognito-identity-provider';
+import { AssociateSoftwareTokenCommand, ChangePasswordCommand, CognitoIdentityProviderClient, ConfirmForgotPasswordCommand, DeleteUserAttributesCommand, GetUserAttributeVerificationCodeCommand, GetUserCommand, GlobalSignOutCommand, InitiateAuthCommand, RespondToAuthChallengeCommand, SetUserMFAPreferenceCommand, UpdateUserAttributesCommand, VerifySoftwareTokenCommand, VerifyUserAttributeCommand, } from '@aws-sdk/client-cognito-identity-provider';
 import Sentry from '../Sentry';
 import { OneBlinkAppsError } from '..';
+export const DEFAULT_MFA_SETTINGS = {
+    authenticator: { enabled: false, preferred: false },
+    sms: {
+        enabled: false,
+        preferred: false,
+        phoneNumber: undefined,
+        isPhoneNumberVerified: false,
+    },
+};
+const MFA_REQUIREMENT_METHOD_CHECKS = {
+    sms: (mfaSettings) => mfaSettings.sms.enabled,
+    authenticatorApp: (mfaSettings) => mfaSettings.authenticator.enabled,
+};
+function checkUserMeetsMfaRequirement(mfaRequirement, mfaSettings) {
+    if (!mfaRequirement) {
+        return true;
+    }
+    const requiredMethods = Object.keys(MFA_REQUIREMENT_METHOD_CHECKS).filter((method) => mfaRequirement[method]);
+    if (requiredMethods.length === 0) {
+        return true;
+    }
+    return requiredMethods.some((method) => MFA_REQUIREMENT_METHOD_CHECKS[method](mfaSettings));
+}
 export default class AWSCognitoClient {
     constructor({ clientId, region, loginDomain, redirectUri, logoutUri, }) {
         if (!clientId) {
@@ -146,17 +169,42 @@ export default class AWSCognitoClient {
             }
             case 'SOFTWARE_TOKEN_MFA': {
                 return {
-                    mfaCodeCallback: async (code) => {
-                        const resetPasswordResult = await this.cognitoIdentityProviderClient.send(new RespondToAuthChallengeCommand({
-                            ChallengeName,
-                            ClientId: this.clientId,
-                            Session: initiateAuthResponse.Session,
-                            ChallengeResponses: {
-                                USERNAME: username,
-                                SOFTWARE_TOKEN_MFA_CODE: code,
-                            },
-                        }));
-                        return await this.responseToAuthChallenge(username, resetPasswordResult);
+                    mfa: {
+                        method: 'authenticator',
+                        codeCallback: async (code) => {
+                            const resetPasswordResult = await this.cognitoIdentityProviderClient.send(new RespondToAuthChallengeCommand({
+                                ChallengeName,
+                                ClientId: this.clientId,
+                                Session: initiateAuthResponse.Session,
+                                ChallengeResponses: {
+                                    USERNAME: username,
+                                    SOFTWARE_TOKEN_MFA_CODE: code,
+                                },
+                            }));
+                            return await this.responseToAuthChallenge(username, resetPasswordResult);
+                        },
+                    },
+                };
+            }
+            case 'EMAIL_OTP': {
+                throw new Error('Email OTP is not supported');
+            }
+            case 'SMS_MFA': {
+                return {
+                    mfa: {
+                        method: 'sms',
+                        codeCallback: async (code) => {
+                            const smsChallengeResult = await this.cognitoIdentityProviderClient.send(new RespondToAuthChallengeCommand({
+                                ChallengeName,
+                                ClientId: this.clientId,
+                                Session: initiateAuthResponse.Session,
+                                ChallengeResponses: {
+                                    USERNAME: username,
+                                    SMS_MFA_CODE: code,
+                                },
+                            }));
+                            return await this.responseToAuthChallenge(username, smsChallengeResult);
+                        },
                     },
                 };
             }
@@ -315,31 +363,185 @@ export default class AWSCognitoClient {
         await this._refreshSession();
         return this._getAccessToken();
     }
-    async checkIsMfaEnabled() {
-        var _a;
+    async getMfaSettings(abortSignal) {
+        var _a, _b, _c, _d;
         const accessToken = await this.getAccessToken();
         if (!accessToken) {
-            return false;
+            return DEFAULT_MFA_SETTINGS;
         }
         const user = await this.cognitoIdentityProviderClient.send(new GetUserCommand({
             AccessToken: accessToken,
+        }), { abortSignal });
+        const mfaList = user.UserMFASettingList || [];
+        const preferredMfaSetting = user.PreferredMfaSetting;
+        const phoneNumber = (_b = (_a = user.UserAttributes) === null || _a === void 0 ? void 0 : _a.find((attribute) => attribute.Name === 'phone_number')) === null || _b === void 0 ? void 0 : _b.Value;
+        const isPhoneNumberVerified = ((_d = (_c = user.UserAttributes) === null || _c === void 0 ? void 0 : _c.find((attribute) => attribute.Name === 'phone_number_verified')) === null || _d === void 0 ? void 0 : _d.Value) === 'true';
+        return {
+            authenticator: {
+                enabled: mfaList.includes('SOFTWARE_TOKEN_MFA'),
+                preferred: preferredMfaSetting === 'SOFTWARE_TOKEN_MFA',
+            },
+            sms: {
+                enabled: mfaList.includes('SMS_MFA'),
+                preferred: preferredMfaSetting === 'SMS_MFA',
+                phoneNumber,
+                isPhoneNumberVerified,
+            },
+        };
+    }
+    async checkIsMfaEnabled(mfaRequirement) {
+        const mfaSettings = await this.getMfaSettings();
+        return {
+            mfaSettings,
+            userMeetsMfaRequirement: checkUserMeetsMfaRequirement(mfaRequirement, mfaSettings),
+        };
+    }
+    async updateUserPhoneNumber(phoneNumber) {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return { isPhoneNumberVerified: false };
+        }
+        await this.cognitoIdentityProviderClient.send(new UpdateUserAttributesCommand({
+            AccessToken: accessToken,
+            UserAttributes: [
+                {
+                    Name: 'phone_number',
+                    Value: phoneNumber,
+                },
+            ],
+        }));
+        const mfaSettings = await this.getMfaSettings();
+        return { isPhoneNumberVerified: mfaSettings.sms.isPhoneNumberVerified };
+    }
+    async removeUserPhoneNumber() {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return;
+        }
+        await this.cognitoIdentityProviderClient.send(new DeleteUserAttributesCommand({
+            AccessToken: accessToken,
+            UserAttributeNames: ['phone_number'],
+        }));
+    }
+    async sendPhoneNumberVerificationCode() {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return;
+        }
+        return await this.cognitoIdentityProviderClient.send(new GetUserAttributeVerificationCodeCommand({
+            AccessToken: accessToken,
+            AttributeName: 'phone_number',
+        }));
+    }
+    async verifyUserPhoneNumber(code) {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return;
+        }
+        await this.cognitoIdentityProviderClient.send(new VerifyUserAttributeCommand({
+            AccessToken: accessToken,
+            AttributeName: 'phone_number',
+            Code: code,
         }));
-        return !!((_a = user.UserMFASettingList) === null || _a === void 0 ? void 0 : _a.length);
     }
-    async disableMfa() {
+    async setPreferredMfaMethod(method) {
         const accessToken = await this.getAccessToken();
         if (!accessToken) {
             return;
         }
+        const currentSettings = await this.getMfaSettings();
         await this.cognitoIdentityProviderClient.send(new SetUserMFAPreferenceCommand({
-            SoftwareTokenMfaSettings: {
-                Enabled: false,
-                PreferredMfa: false,
-            },
             AccessToken: accessToken,
+            ...(currentSettings.authenticator.enabled
+                ? {
+                    SoftwareTokenMfaSettings: {
+                        Enabled: true,
+                        PreferredMfa: method === 'authenticator',
+                    },
+                }
+                : {}),
+            ...(currentSettings.sms.enabled
+                ? {
+                    SMSMfaSettings: {
+                        Enabled: true,
+                        PreferredMfa: method === 'sms',
+                    },
+                }
+                : {}),
         }));
     }
-    async setupMfa() {
+    async disableMfaMethod(method) {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return;
+        }
+        const currentSettings = await this.getMfaSettings();
+        const wasPreferred = method === 'authenticator'
+            ? currentSettings.authenticator.preferred
+            : currentSettings.sms.preferred;
+        const otherMethod = method === 'authenticator' ? 'sms' : 'authenticator';
+        const otherSettings = method === 'authenticator'
+            ? currentSettings.sms
+            : currentSettings.authenticator;
+        await this.cognitoIdentityProviderClient.send(new SetUserMFAPreferenceCommand({
+            AccessToken: accessToken,
+            ...(method === 'authenticator'
+                ? {
+                    SoftwareTokenMfaSettings: {
+                        Enabled: false,
+                        PreferredMfa: false,
+                    },
+                }
+                : {
+                    SMSMfaSettings: {
+                        Enabled: false,
+                        PreferredMfa: false,
+                    },
+                }),
+            ...(wasPreferred && otherSettings.enabled
+                ? otherMethod === 'authenticator'
+                    ? {
+                        SoftwareTokenMfaSettings: {
+                            Enabled: true,
+                            PreferredMfa: true,
+                        },
+                    }
+                    : {
+                        SMSMfaSettings: {
+                            Enabled: true,
+                            PreferredMfa: true,
+                        },
+                    }
+                : {}),
+        }));
+    }
+    async setupSmsMfa({ preferred } = {}) {
+        const accessToken = await this.getAccessToken();
+        if (!accessToken) {
+            return;
+        }
+        const currentSettings = await this.getMfaSettings();
+        const hasPreferredMethod = (currentSettings.authenticator.enabled &&
+            currentSettings.authenticator.preferred) ||
+            (currentSettings.sms.enabled && currentSettings.sms.preferred);
+        const shouldBePreferred = preferred !== null && preferred !== void 0 ? preferred : (!hasPreferredMethod && !currentSettings.sms.enabled);
+        await this.cognitoIdentityProviderClient.send(new SetUserMFAPreferenceCommand({
+            AccessToken: accessToken,
+            SMSMfaSettings: {
+                Enabled: true,
+                PreferredMfa: shouldBePreferred,
+            },
+            ...(shouldBePreferred && currentSettings.authenticator.enabled
+                ? {
+                    SoftwareTokenMfaSettings: {
+                        Enabled: true,
+                        PreferredMfa: false,
+                    },
+                }
+                : {}),
+        }));
+    }
+    async setupMfaAuthenticatorApp({ preferred } = {}) {
         const accessToken = await this.getAccessToken();
         if (!accessToken) {
             return;
@@ -354,11 +556,24 @@ export default class AWSCognitoClient {
                     AccessToken: accessToken,
                     UserCode: code,
                 }));
+                const currentSettings = await this.getMfaSettings();
+                const hasPreferredMethod = (currentSettings.authenticator.enabled &&
+                    currentSettings.authenticator.preferred) ||
+                    (currentSettings.sms.enabled && currentSettings.sms.preferred);
+                const shouldBePreferred = preferred !== null && preferred !== void 0 ? preferred : (!hasPreferredMethod && !currentSettings.authenticator.enabled);
                 await this.cognitoIdentityProviderClient.send(new SetUserMFAPreferenceCommand({
                     SoftwareTokenMfaSettings: {
                         Enabled: true,
-                        PreferredMfa: true,
+                        PreferredMfa: shouldBePreferred,
                     },
+                    ...(shouldBePreferred && currentSettings.sms.enabled
+                        ? {
+                            SMSMfaSettings: {
+                                Enabled: true,
+                                PreferredMfa: false,
+                            },
+                        }
+                        : {}),
                     AccessToken: accessToken,
                 }));
             },