Merge branch 'main' into migrate-liveness-app

aws-amplify · Sep 20, 2023 · 127019e · 127019e
2 parents 327dea6 + b3f4b6c
commit 127019e
Show file tree

Hide file tree

Showing 48 changed files with 202 additions and 121 deletions.
diff --git a/.changeset/breezy-rabbits-change.md b/.changeset/breezy-rabbits-change.md
diff --git a/.changeset/cold-news-jump.md b/.changeset/cold-news-jump.md
diff --git a/.changeset/five-ghosts-hug.md b/.changeset/five-ghosts-hug.md
diff --git a/.changeset/loud-dodos-confess.md b/.changeset/loud-dodos-confess.md
diff --git a/.changeset/mean-vans-attend.md b/.changeset/mean-vans-attend.md
diff --git a/.changeset/modern-melons-doubt.md b/.changeset/modern-melons-doubt.md
diff --git a/docs/package.json b/docs/package.json
@@ -23,8 +23,8 @@
     "test:links": "node --require esbuild-register ./scripts/link-checker-puppeteer.ts"
   },
   "dependencies": {
-    "@aws-amplify/ui-react": "5.3.0",
-    "@aws-amplify/ui-react-storage": "2.3.0",
+    "@aws-amplify/ui-react": "5.3.1",
+    "@aws-amplify/ui-react-storage": "2.3.1",
     "@cucumber/gherkin": "^19.0.3",
     "@cucumber/messages": "^16.0.1",
     "@docsearch/react": "3",

diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -20,7 +20,7 @@
     "@angular/platform-browser": "^14.3.0",
     "@angular/platform-browser-dynamic": "^14.3.0",
     "@angular/router": "^14.3.0",
-    "@aws-amplify/ui-angular": "^4.0.8",
+    "@aws-amplify/ui-angular": "^4.0.9",
     "aws-amplify": "latest",
     "rxjs": "~6.6.0",
     "tslib": "^2.0.0",

diff --git a/examples/next/package.json b/examples/next/package.json
@@ -10,9 +10,9 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@aws-amplify/ui-react": "^5.3.0",
-    "@aws-amplify/ui-react-storage": "^2.3.0",
-    "@aws-amplify/ui-react-notifications": "^1.0.12",
+    "@aws-amplify/ui-react": "^5.3.1",
+    "@aws-amplify/ui-react-storage": "^2.3.1",
+    "@aws-amplify/ui-react-notifications": "^1.0.13",
     "@aws-amplify/ui-react-geo": "^1.0.2",
     "@aws-sdk/credential-providers": "^3.370.0",
     "aws-amplify": "latest",

diff --git a/examples/vue/package.json b/examples/vue/package.json
@@ -10,7 +10,7 @@
     "start": "vite preview --port 3000"
   },
   "dependencies": {
-    "@aws-amplify/ui-vue": "^3.1.27",
+    "@aws-amplify/ui-vue": "^3.1.28",
     "aws-amplify": "latest",
     "vue": "^3.0.5",
     "vue-router": "4"

diff --git a/packages/angular/projects/ui-angular/CHANGELOG.md b/packages/angular/projects/ui-angular/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @aws-amplify/ui-angular
 
+## 4.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`d570694c7`](https://github.com/aws-amplify/amplify-ui/commit/d570694c7e0d9d112449d3aade2d567773555926), [`6a5a4d79c`](https://github.com/aws-amplify/amplify-ui/commit/6a5a4d79ce60124fba2dc00d86b9e1a9b5f21c39)]:
+  - @aws-amplify/ui@5.8.1
+
 ## 4.0.8
 
 ### Patch Changes

diff --git a/packages/angular/projects/ui-angular/package.json b/packages/angular/projects/ui-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-angular",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "scripts": {
     "build": "yarn --cwd ../../ build",
     "dev": "yarn --cwd ../../ dev",
@@ -19,7 +19,7 @@
     "aws-amplify": "^5.0.1"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.8.0",
+    "@aws-amplify/ui": "5.8.1",
     "classnames": "2.3.1",
     "nanoid": "3.1.31",
     "qrcode": "1.5.0",

diff --git a/packages/angular/projects/ui-angular/src/version.ts b/packages/angular/projects/ui-angular/src/version.ts
@@ -1 +1 @@
-export const VERSION = '4.0.8';
+export const VERSION = '4.0.9';
diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -30,7 +30,7 @@
     ]
   },
   "devDependencies": {
-    "@aws-amplify/ui": "^5.8.0",
+    "@aws-amplify/ui": "^5.8.1",
     "@badeball/cypress-cucumber-preprocessor": "^16.0.3",
     "@bahmutov/cypress-esbuild-preprocessor": "~2.2.0",
     "@cucumber/cucumber": "^9.3.0",

diff --git a/packages/react-core-notifications/CHANGELOG.md b/packages/react-core-notifications/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @aws-amplify/ui-react-core-notifications
 
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`d570694c7`](https://github.com/aws-amplify/amplify-ui/commit/d570694c7e0d9d112449d3aade2d567773555926), [`6a5a4d79c`](https://github.com/aws-amplify/amplify-ui/commit/6a5a4d79ce60124fba2dc00d86b9e1a9b5f21c39)]:
+  - @aws-amplify/ui@5.8.1
+  - @aws-amplify/ui-react-core@2.1.33
+
 ## 1.0.9
 
 ### Patch Changes

diff --git a/packages/react-core-notifications/package.json b/packages/react-core-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-core-notifications",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -36,8 +36,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.8.0",
-    "@aws-amplify/ui-react-core": "2.1.32"
+    "@aws-amplify/ui": "5.8.1",
+    "@aws-amplify/ui-react-core": "2.1.33"
   },
   "peerDependencies": {
     "aws-amplify": "^5.0.1",

diff --git a/packages/react-core/CHANGELOG.md b/packages/react-core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @aws-amplify/ui-react-core
 
+## 2.1.33
+
+### Patch Changes
+
+- Updated dependencies [[`d570694c7`](https://github.com/aws-amplify/amplify-ui/commit/d570694c7e0d9d112449d3aade2d567773555926), [`6a5a4d79c`](https://github.com/aws-amplify/amplify-ui/commit/6a5a4d79ce60124fba2dc00d86b9e1a9b5f21c39)]:
+  - @aws-amplify/ui@5.8.1
+
 ## 2.1.32
 
 ### Patch Changes

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-core",
-  "version": "2.1.32",
+  "version": "2.1.33",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "react-native": "dist/index.js",
@@ -31,7 +31,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "5.8.0",
+    "@aws-amplify/ui": "5.8.1",
     "@xstate/react": "3.0.1",
     "lodash": "4.17.21",
     "xstate": "^4.33.6"

diff --git a/packages/react-liveness/CHANGELOG.md b/packages/react-liveness/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @aws-amplify/ui-react-liveness
 
+## 2.0.8
+
+### Patch Changes
+
+- [#4441](https://github.com/aws-amplify/amplify-ui/pull/4441) [`717b00955`](https://github.com/aws-amplify/amplify-ui/commit/717b0095573eb0fc44ef47441eb27e1c3122f6f9) Thanks [@thaddmt](https://github.com/thaddmt)! - chore(liveness): remove predictions super class
+
+- [#4446](https://github.com/aws-amplify/amplify-ui/pull/4446) [`ac3cfa8aa`](https://github.com/aws-amplify/amplify-ui/commit/ac3cfa8aaa430df2b73e51a6b6f0916f1f6f6382) Thanks [@thaddmt](https://github.com/thaddmt)! - fix(liveness): add missing liveness dependencies
+
+- [#4450](https://github.com/aws-amplify/amplify-ui/pull/4450) [`8ca045036`](https://github.com/aws-amplify/amplify-ui/commit/8ca0450363a194016fe7d1e5c4fc8359e2f4dba2) Thanks [@thaddmt](https://github.com/thaddmt)! - chore(liveness): export error types
+
+- Updated dependencies [[`d570694c7`](https://github.com/aws-amplify/amplify-ui/commit/d570694c7e0d9d112449d3aade2d567773555926), [`6a5a4d79c`](https://github.com/aws-amplify/amplify-ui/commit/6a5a4d79ce60124fba2dc00d86b9e1a9b5f21c39), [`c393b74af`](https://github.com/aws-amplify/amplify-ui/commit/c393b74af6574593b2e7a5c9f00d27b052966a12), [`7e11a3b7e`](https://github.com/aws-amplify/amplify-ui/commit/7e11a3b7e4761a39a973ecd9a632a619660e18dd)]:
+  - @aws-amplify/ui-react@5.3.1
+  - @aws-amplify/ui@5.8.1
+
 ## 2.0.7
 
 ### Patch Changes

diff --git a/packages/react-liveness/jest.config.js b/packages/react-liveness/jest.config.js
@@ -10,7 +10,7 @@ module.exports = {
   coverageThreshold: {
     global: {
       branches: 80,
-      functions: 83,
+      functions: 82,
       lines: 89,
       statements: 89,
     },

diff --git a/packages/react-liveness/package.json b/packages/react-liveness/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-liveness",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {

diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/index.ts b/packages/react-liveness/src/components/FaceLivenessDetector/index.ts
@@ -10,4 +10,5 @@ export {
   AwsCredentialProvider,
   AwsTemporaryCredentials,
   AwsCredentials,
+  ErrorState,
 } from './service';
diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/service/machine/index.ts b/packages/react-liveness/src/components/FaceLivenessDetector/service/machine/index.ts
@@ -19,6 +19,7 @@ import {
   IlluminationState,
   StreamActorCallback,
   LivenessError,
+  ErrorState,
 } from '../types';
 import {
   BlazeFaceFaceDetection,
@@ -717,7 +718,7 @@ export const livenessMachine = createMachine<LivenessContext, LivenessEvent>(
       // callbacks
       callUserPermissionDeniedCallback: assign({
         errorState: (context, event) => {
-          let errorState: LivenessErrorState;
+          let errorState: ErrorState;
 
           if ((event.data!.message as string).includes('15 fps')) {
             errorState = LivenessErrorState.CAMERA_FRAMERATE_ERROR;

diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/service/types/error.ts b/packages/react-liveness/src/components/FaceLivenessDetector/service/types/error.ts
@@ -2,14 +2,16 @@
  * The liveness error states
  */
 
-export enum LivenessErrorState {
-  TIMEOUT = 'TIMEOUT',
-  RUNTIME_ERROR = 'RUNTIME_ERROR',
-  FRESHNESS_TIMEOUT = 'FRESHNESS_TIMEOUT',
-  SERVER_ERROR = 'SERVER_ERROR',
-  CAMERA_FRAMERATE_ERROR = 'CAMERA_FRAMERATE_ERROR',
-  CAMERA_ACCESS_ERROR = 'CAMERA_ACCESS_ERROR',
-  FACE_DISTANCE_ERROR = 'FACE_DISTANCE_ERROR',
-  MOBILE_LANDSCAPE_ERROR = 'MOBILE_LANDSCAPE_ERROR',
-  MULTIPLE_FACES_ERROR = 'MULTIPLE_FACES_ERROR',
-}
+export const LivenessErrorState = {
+  TIMEOUT: 'TIMEOUT',
+  RUNTIME_ERROR: 'RUNTIME_ERROR',
+  FRESHNESS_TIMEOUT: 'FRESHNESS_TIMEOUT',
+  SERVER_ERROR: 'SERVER_ERROR',
+  CAMERA_FRAMERATE_ERROR: 'CAMERA_FRAMERATE_ERROR',
+  CAMERA_ACCESS_ERROR: 'CAMERA_ACCESS_ERROR',
+  FACE_DISTANCE_ERROR: 'FACE_DISTANCE_ERROR',
+  MOBILE_LANDSCAPE_ERROR: 'MOBILE_LANDSCAPE_ERROR',
+  MULTIPLE_FACES_ERROR: 'MULTIPLE_FACES_ERROR',
+} as const;
+
+export type ErrorState = keyof typeof LivenessErrorState;
diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/service/types/liveness.ts b/packages/react-liveness/src/components/FaceLivenessDetector/service/types/liveness.ts
@@ -1,5 +1,5 @@
 import { AwsCredentialProvider } from './credentials';
-import { LivenessErrorState } from './error';
+import { ErrorState } from './error';
 
 /**
  * The props for the FaceLivenessDetectorCore which allows for full configuration of auth
@@ -124,6 +124,6 @@ export enum FaceMatchState {
 }
 
 export interface LivenessError {
-  state: LivenessErrorState;
+  state: ErrorState;
   error: Error;
 }
diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/service/types/machine.ts b/packages/react-liveness/src/components/FaceLivenessDetector/service/types/machine.ts
@@ -13,7 +13,7 @@ import {
   LivenessOvalDetails,
   IlluminationState,
 } from './liveness';
-import { LivenessErrorState } from './error';
+import { ErrorState } from './error';
 import {
   VideoRecorder,
   LivenessStreamProvider,
@@ -67,7 +67,7 @@ export interface HydratedLivenessContext {
   ovalAssociatedParams: OvalAssociatedParams;
   faceMatchAssociatedParams: FaceMatchAssociatedParams;
   freshnessColorAssociatedParams: FreshnessColorAssociatedParams;
-  errorState: LivenessErrorState;
+  errorState: ErrorState;
   livenessStreamProvider: LivenessStreamProvider;
   responseStreamActorRef: ActorRef<any>;
   shouldDisconnect: boolean;

diff --git a/packages/react-liveness/src/components/FaceLivenessDetector/service/utils/liveness.ts b/packages/react-liveness/src/components/FaceLivenessDetector/service/utils/liveness.ts
@@ -6,6 +6,7 @@ import {
   FaceMatchState,
   BoundingBox,
   LivenessErrorState,
+  ErrorState,
 } from '../types';
 import { FaceDetection } from '../types/faceDetection';
 import { ClientFreshnessColorSequence } from '../types/service';
@@ -459,7 +460,7 @@ export function isCameraDeviceVirtual(device: MediaDeviceInfo): boolean {
   return device.label.toLowerCase().includes('virtual');
 }
 
-export const LivenessErrorStateStringMap: Record<LivenessErrorState, string> = {
+export const LivenessErrorStateStringMap = {
   [LivenessErrorState.RUNTIME_ERROR]: 'RUNTIME_ERROR',
   [LivenessErrorState.SERVER_ERROR]: 'SERVER_ERROR',
   [LivenessErrorState.TIMEOUT]: 'TIMEOUT',
@@ -741,18 +742,13 @@ export async function isFaceDistanceBelowThreshold({
   isMobile?: boolean;
 }): Promise<{
   isDistanceBelowThreshold: boolean;
-  error?:
-    | LivenessErrorState.FACE_DISTANCE_ERROR
-    | LivenessErrorState.MULTIPLE_FACES_ERROR;
+  error?: ErrorState;
 }> {
   const detectedFaces = await faceDetector.detectFaces(videoEl);
   let detectedFace: Face;
 
   let isDistanceBelowThreshold = false;
-  let error:
-    | LivenessErrorState.FACE_DISTANCE_ERROR
-    | LivenessErrorState.MULTIPLE_FACES_ERROR
-    | undefined;
+  let error: ErrorState | undefined;
 
   switch (detectedFaces.length) {
     case 0: {

diff --git a/...ages/react-liveness/src/components/FaceLivenessDetector/shared/FaceLivenessErrorModal.tsx b/...ages/react-liveness/src/components/FaceLivenessDetector/shared/FaceLivenessErrorModal.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Flex, Button, Text } from '@aws-amplify/ui-react';
 import { AlertIcon } from '@aws-amplify/ui-react/internal';
 
-import { LivenessErrorState } from '../service';
+import { LivenessErrorState, ErrorState } from '../service';
 
 import { Toast } from './Toast';
 import { Overlay } from './Overlay';
@@ -21,7 +21,7 @@ export interface FaceLivenessErrorModalProps {
 }
 
 const renderToastErrorModal = (props: {
-  error: LivenessErrorState;
+  error: ErrorState;
   displayText: Required<ErrorDisplayText>;
 }) => {
   const { error: errorState, displayText } = props;
@@ -80,7 +80,7 @@ export const renderErrorModal = ({
   errorState,
   overrideErrorDisplayText,
 }: {
-  errorState: LivenessErrorState;
+  errorState: ErrorState;
   overrideErrorDisplayText?: ErrorDisplayText;
 }): JSX.Element | null => {
   const displayText: Required<ErrorDisplayText> = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const VERSION = '4.0.8';
		export const VERSION = '4.0.9';