@aws-amplify/ui-react-core 2.1.5 → 2.1.7

package/dist/esm/Authenticator/hooks/useAuthenticator/useAuthenticator.js

@@ -5,7 +5,7 @@ import { getServiceFacade } from '@aws-amplify/ui';
 import 'react/jsx-runtime';
 import { AuthenticatorContext } from '../../context/AuthenticatorContext.js';
 import { USE_AUTHENTICATOR_ERROR } from './constants.js';
-import { getMachineFields, getTotpSecretCodeCallback, getComparator, defaultComparator } from './utils.js';
+import { getQRFields, getMachineFields, getTotpSecretCodeCallback, getComparator, defaultComparator } from './utils.js';
 
 /**
  * [📖 Docs](https://ui.docs.amplify.aws/react/connected-components/authenticator/headless#useauthenticator-hook)
@@ -24,13 +24,17 @@ function useAuthenticator(selector) {
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
     // `fields` from updating with current form state on value changes
     const serviceSnapshot = service.getSnapshot();
+    // legacy `QRFields` values only used for SetupTOTP page to retrieve issuer information, will be removed in future
+    const QRFields = useMemo(() => getQRFields(serviceSnapshot), [serviceSnapshot]);
     // legacy `formFields` values required until form state is removed from state machine
     const fields = useMemo(() => getMachineFields(route, serviceSnapshot, unverifiedContactMethods), [route, serviceSnapshot, unverifiedContactMethods]);
     return Object.assign(Object.assign({}, rest), { getTotpSecretCode: getTotpSecretCodeCallback(user), route,
         unverifiedContactMethods,
         user,
         /** @deprecated For internal use only */
-        fields });
+        fields,
+        /** @deprecated For internal use only */
+        QRFields });
 }
 
 export { useAuthenticator as default };

package/dist/esm/Authenticator/hooks/useAuthenticator/utils.js

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../node_modules/tslib/tslib.es6.js';
 import { Auth } from 'aws-amplify';
-import { getSortedFormFields } from '@aws-amplify/ui';
+import { getActorContext, getSortedFormFields } from '@aws-amplify/ui';
 import isString from 'lodash/isString';
 import { areEmptyArrays, areEmptyObjects } from '../../../utils/index.js';
 import { isComponentRouteKey } from '../utils.js';
@@ -29,6 +29,12 @@ const getComparator = (selector) => (currentFacade, nextFacade) => {
     // Shallow compare the array values
     return areSelectorDepsEqual(currentSelectorDeps, nextSelectorDeps);
 };
+const getQRFields = (state) => {
+    var _a, _b, _c;
+    const fields = getActorContext(state);
+    const QR = (_c = (_b = (_a = fields === null || fields === void 0 ? void 0 : fields.formFields) === null || _a === void 0 ? void 0 : _a.setupTOTP) === null || _b === void 0 ? void 0 : _b.QR) !== null && _c !== void 0 ? _c : {};
+    return Object.assign({}, QR);
+};
 const getTotpSecretCodeCallback = (user) => function getTotpSecretCode() {
     return __awaiter(this, void 0, void 0, function* () {
         return yield Auth.setupTOTP(user);
@@ -58,4 +64,4 @@ const getMachineFields = (route, state, unverifiedContactMethods) => {
     return [];
 };
 
-export { areSelectorDepsEqual, defaultComparator, getComparator, getMachineFields, getTotpSecretCodeCallback };
+export { areSelectorDepsEqual, defaultComparator, getComparator, getMachineFields, getQRFields, getTotpSecretCodeCallback };

package/dist/index.js

@@ -172,6 +172,12 @@ const getComparator = (selector) => (currentFacade, nextFacade) => {
     // Shallow compare the array values
     return areSelectorDepsEqual(currentSelectorDeps, nextSelectorDeps);
 };
+const getQRFields = (state) => {
+    var _a, _b, _c;
+    const fields = ui.getActorContext(state);
+    const QR = (_c = (_b = (_a = fields === null || fields === void 0 ? void 0 : fields.formFields) === null || _a === void 0 ? void 0 : _a.setupTOTP) === null || _b === void 0 ? void 0 : _b.QR) !== null && _c !== void 0 ? _c : {};
+    return Object.assign({}, QR);
+};
 const getTotpSecretCodeCallback = (user) => function getTotpSecretCode() {
     return __awaiter(this, void 0, void 0, function* () {
         return yield awsAmplify.Auth.setupTOTP(user);
@@ -218,13 +224,17 @@ function useAuthenticator(selector) {
     // do not memoize output. `service.getSnapshot` reference remains stable preventing
     // `fields` from updating with current form state on value changes
     const serviceSnapshot = service.getSnapshot();
+    // legacy `QRFields` values only used for SetupTOTP page to retrieve issuer information, will be removed in future
+    const QRFields = React.useMemo(() => getQRFields(serviceSnapshot), [serviceSnapshot]);
     // legacy `formFields` values required until form state is removed from state machine
     const fields = React.useMemo(() => getMachineFields(route, serviceSnapshot, unverifiedContactMethods), [route, serviceSnapshot, unverifiedContactMethods]);
     return Object.assign(Object.assign({}, rest), { getTotpSecretCode: getTotpSecretCodeCallback(user), route,
         unverifiedContactMethods,
         user,
         /** @deprecated For internal use only */
-        fields });
+        fields,
+        /** @deprecated For internal use only */
+        QRFields });
 }
 
 /**

package/dist/types/Authenticator/hooks/useAuthenticator/types.d.ts

@@ -17,6 +17,11 @@ export declare type UseAuthenticatorSelector = (context: AuthenticatorMachineCon
 export interface UseAuthenticator extends AuthenticatorServiceFacade {
     getTotpSecretCode: () => Promise<string>;
     /** @deprecated For internal use only */
+    QRFields: {
+        totpIssuer?: string;
+        totpUsername?: string;
+    };
+    /** @deprecated For internal use only */
     fields: AuthenticatorLegacyFields;
 }
 export declare type Comparator = (currentMachineContext: AuthenticatorMachineContext, nextMachineContext: AuthenticatorMachineContext) => boolean;

package/dist/types/Authenticator/hooks/useAuthenticator/utils.d.ts

@@ -8,6 +8,10 @@ export declare const defaultComparator: () => false;
  */
 export declare function areSelectorDepsEqual<T>(currentDeps: T[], nextDeps: T[]): boolean;
 export declare const getComparator: (selector: UseAuthenticatorSelector) => Comparator;
+export declare const getQRFields: (state: AuthMachineState) => {
+    totpIssuer?: string;
+    totpUsername?: string;
+};
 export declare const getTotpSecretCodeCallback: (user: AmplifyUser) => () => Promise<string>;
 /**
  * Retrieves default and custom (RWA only, to be updated) form field values from state machine

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-core",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
   "react-native": "dist/index.js",
@@ -28,7 +28,7 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.4.0",
+    "@aws-amplify/ui": "5.4.2",
     "@xstate/react": "3.0.1",
     "lodash": "4.17.21",
     "xstate": "^4.33.6"