Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Tsn616 mfa for amplify (#1391)

Stanimir439e6f1c5843
diff --git a/.gitignore b/.gitignore
index 34e5a8fe0..09355eba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,5 +107,6 @@ web/sw-con
/app/aws-exports.js
/app/graphql/*
+/app/models/*
cordova/platforms/ios/www/yarn.lock
cordova/platforms/ios/www/package.json
diff --git a/app/components/HelpFeedbackPanel.tsx b/app/components/HelpFeedbackPanel.tsx
index 8a7390dd3..0d30e8b9e 100644
--- a/app/components/HelpFeedbackPanel.tsx
+++ b/app/components/HelpFeedbackPanel.tsx
@@ -16,9 +16,10 @@
*
*/
-import React from 'react';
+import React, { useRef, useState } from 'react';
import { withStyles } from '@material-ui/core/styles';
import classNames from 'classnames';
+import QRCode from 'qrcode.react';
import Typography from '@material-ui/core/Typography';
import CardActions from '@material-ui/core/CardActions';
import CardContent from '@material-ui/core/CardContent';
@@ -34,7 +35,7 @@ import AboutIcon from '@material-ui/icons/BlurOn';
import ChangeLogIcon from '@material-ui/icons/ImportContacts';
import OnboardingIcon from '@material-ui/icons/Explore';
import WebClipperIcon from '@material-ui/icons/Transform';
-import AccountIcon from '@material-ui/icons/AccountCircle';
+// import AccountIcon from '@material-ui/icons/AccountCircle';
import EmailIcon from '@material-ui/icons/Email';
import IssueIcon from '@material-ui/icons/BugReport';
import TranslationIcon from '@material-ui/icons/Translate';
@@ -47,7 +48,11 @@ import ProTeaserIcon from '@material-ui/icons/FlightTakeoff';
import ExitToAppIcon from '@material-ui/icons/ExitToApp';
import { connect } from 'react-redux';
import { CognitoUserInterface } from '@aws-amplify/ui-components';
-import { Auth } from 'aws-amplify';
+import Auth from '@aws-amplify/auth';
+import InputLabel from '@material-ui/core/InputLabel';
+import Input from '@material-ui/core/Input';
+import { FormHelperText } from '@material-ui/core';
+import FormControl from '@material-ui/core/FormControl';
import CustomLogo from './CustomLogo';
import ProTeaser from '../assets/images/spacerocket_undraw.svg';
import styles from './SidePanels.css';
@@ -55,6 +60,7 @@ import AppConfig from '../config';
import i18n from '../services/i18n';
import { Pro } from '../pro';
import { clearAllURLParams } from '-/utils/misc';
+import TOTPSetup from '-/containers/TOTPSetup';
interface Props {
classes?: any;
@@ -75,6 +81,10 @@ const signOut = () => {
};
const HelpFeedbackPanel = (props: Props) => {
+ const [code, setCode] = useState<string>(undefined);
+ const verifyCode = useRef<string>(undefined);
+ const verifyTotpToken = useRef(undefined);
+
const {
classes,
openURLExternally,
@@ -99,6 +109,12 @@ const HelpFeedbackPanel = (props: Props) => {
}
}
+ /* const MFATypeOptions = {
+ SMS: true,
+ Optional: true,
+ TOTP: true
+ }; */
+
return (
<div className={classes.panel} style={props.style}>
<CustomLogo />
@@ -129,6 +145,113 @@ const HelpFeedbackPanel = (props: Props) => {
{email}
</Typography>
</ListItem>
+ {'SOFTWARE_TOKEN_MFA'.indexOf(props.user.preferredMFA) === -1 ? (
+ <Box
+ style={{
+ width: '100%',
+ textAlign: 'center'
+ }}
+ >
+ {/* <AmplifySelectMfaType
+ MFATypes={MFATypeOptions}
+ authData={props.user}
+ handleSubmit={verify}
+ /> */}
+ {/* <AmplifyTotpSetup
+ headerText="My Custom TOTP Setup Text"
+ // slot="totp-setup"
+ issuer="TagSpaces"
+ user={props.user}
+ /> */}
+ {/* <TOTPSetup/> */}
+ <Button
+ data-tid="setupTOTP"
+ title={i18n.t('core:setupTOTP')}
+ className={classes.mainActionButton}
+ onClick={async () => {
+ verifyTotpToken.current = await TOTPSetup(
+ props.user,
+ setCode
+ );
+ }}
+ size="small"
+ variant="outlined"
+ color="primary"
+ style={{ width: '95%' }}
+ >
+ {i18n.t('core:setupTOTP')}
+ </Button>
+ {code && (
+ <>
+ <QRCode value={code} />
+ <FormControl
+ fullWidth={true} /* error={cloudErrorTextName} */
+ >
+ <InputLabel htmlFor="validationCode">
+ {i18n.t('core:validationCodeLabel')}
+ </InputLabel>
+ <Input
+ required
+ autoFocus
+ margin="dense"
+ name="validationCode"
+ inputProps={{ autoCorrect: 'off' }}
+ fullWidth={true}
+ data-tid="validationCodeTID"
+ onChange={event => {
+ verifyCode.current = event.target.value;
+ return true;
+ }}
+ />
+ <FormHelperText>
+ scan QR with Google Authenticator App and write the
+ response
+ </FormHelperText>
+ </FormControl>
+ <Button
+ data-tid="verifyTOTP"
+ title={i18n.t('core:verifyTOTP')}
+ className={classes.mainActionButton}
+ onClick={async () => {
+ await verifyTotpToken.current(verifyCode.current);
+ }}
+ size="small"
+ variant="outlined"
+ color="primary"
+ style={{ width: '95%' }}
+ >
+ {i18n.t('core:verifyTOTP')}
+ </Button>
+ </>
+ )}
+ </Box>
+ ) : (
+ <Box
+ style={{
+ width: '100%',
+ textAlign: 'center',
+ marginBottom: 10
+ }}
+ >
+ <Button
+ className={classes.mainActionButton}
+ onClick={async () => {
+ try {
+ await Auth.setPreferredMFA(props.user, 'NOMFA');
+ signOut();
+ } catch (error) {
+ console.error(error);
+ }
+ }}
+ size="small"
+ variant="outlined"
+ color="primary"
+ style={{ width: '95%' }}
+ >
+ {i18n.t('core:MFA TOTP enabled')}
+ </Button>
+ </Box>
+ )}
<Box
style={{
width: '100%',
diff --git a/app/containers/Root.tsx b/app/containers/Root.tsx
index 1ac7b6c77..429f0c640 100644
--- a/app/containers/Root.tsx
+++ b/app/containers/Root.tsx
@@ -19,15 +19,16 @@
import React from 'react';
import { Provider } from 'react-redux';
import { PersistGate } from 'redux-persist/integration/react';
+import { Store } from 'redux';
import LoadingScreen from '../components/LoadingScreen';
import { actions as AppActions } from '../reducers/app';
import AppConfig from '-/config';
import App from '-/containers/App';
import MainPage from '-/containers/MainPage';
-import Auth from '-/containers/Auth';
+import TsAuth from '-/containers/TsAuth';
type RootType = {
- store: {};
+ store: Store<{}>;
persistor: {};
};
@@ -39,7 +40,7 @@ export default function Root({ store, persistor }: RootType) {
);
if (AppConfig.isWeb) {
- appContent = <Auth>{appContent}</Auth>;
+ appContent = <TsAuth>{appContent}</TsAuth>;
}
return (
diff --git a/app/containers/TOTPSetup.ts b/app/containers/TOTPSetup.ts
new file mode 100644
index 000000000..8b3589648
--- /dev/null
+++ b/app/containers/TOTPSetup.ts
@@ -0,0 +1,32 @@
+import Auth from '@aws-amplify/auth';
+import { CognitoUserInterface } from '@aws-amplify/ui-components';
+import i18n from '../services/i18n';
+
+export default async function TOTPSetup(user: CognitoUserInterface, setCode) {
+ const issuer = i18n.t('core:name');
+ const verifyTotpToken = async (totpCode: string) => {
+ try {
+ await Auth.verifyTotpToken(user, totpCode);
+ await Auth.setPreferredMFA(user, 'TOTP');
+
+ console.log('SETUP_TOTP SUCCESS');
+ } catch (error) {
+ console.error(error);
+ }
+ };
+
+ function buildOtpAuthPath(secretKey: string) {
+ return `otpauth://totp/${issuer}:${user.username}?secret=${secretKey}&issuer=${issuer}`;
+ }
+
+ // if (user && 'SOFTWARE_TOKEN_MFA'.indexOf(user.preferredMFA) === -1) {
+ try {
+ const secretKey = await Auth.setupTOTP(user);
+ console.debug('secret key', secretKey);
+ setCode(buildOtpAuthPath(secretKey));
+ } catch (error) {
+ console.debug(error);
+ }
+
+ return verifyTotpToken;
+}
diff --git a/app/containers/Auth.tsx b/app/containers/TsAuth.tsx
similarity index 88%
rename from app/containers/Auth.tsx
rename to app/containers/TsAuth.tsx
index cf8851b7a..f08ee6f1b 100644
--- a/app/containers/Auth.tsx
+++ b/app/containers/TsAuth.tsx
@@ -20,13 +20,15 @@ import React from 'react';
import {
AmplifyAuthenticator,
AmplifySignIn,
- AmplifySignUp
+ AmplifySignUp,
+ AmplifyTotpSetup
} from '@aws-amplify/ui-react';
import { Amplify } from 'aws-amplify';
import HandleAuth from '-/utils/HandleAuth';
import LogoIcon from '-/assets/images/icon100x100.svg';
+import i18n from '-/services/i18n';
-const Auth: React.FC<any> = props => {
+const TsAuth: React.FC<any> = props => {
let awsconfig;
try {
// eslint-disable-next-line global-require
@@ -55,6 +57,12 @@ const Auth: React.FC<any> = props => {
'--amplify-primary-shade': '#4A5568'
}}
>
+ <AmplifyTotpSetup
+ headerText="TagSpaces Time-Based One-Time Password Login"
+ slot="totp-setup"
+ issuer={i18n.t('core:name')}
+ // user={props.user}
+ />
<AmplifySignUp
slot="sign-up"
usernameAlias="email"
@@ -92,4 +100,4 @@ const Auth: React.FC<any> = props => {
return <h1>Loading...</h1>;
};
-export default Auth;
+export default TsAuth;
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index 3e1853360..b91802210 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -2038,6 +2038,8 @@ export const actions = {
};
// Selectors
+export const currentUser = (state: any) =>
+ state.app.user;
export const getDirectoryContent = (state: any) =>
state.app.currentDirectoryEntries;
export const getCurrentDirectoryColor = (state: any) =>
diff --git a/app/utils/HandleAuth.ts b/app/utils/HandleAuth.tsx
similarity index 91%
rename from app/utils/HandleAuth.ts
rename to app/utils/HandleAuth.tsx
index 8b0d76725..4f726a634 100644
--- a/app/utils/HandleAuth.ts
+++ b/app/utils/HandleAuth.tsx
@@ -23,6 +23,8 @@ const HandleAuth = React.memo((props: Props) => {
React.useEffect(() => {
onAuthUIStateChange((nextAuthState, authData) => {
if (nextAuthState === AuthState.SignedIn) {
+ // verifyTotpToken.current = useTOTPSetup(authData, setCode);
+
let queries;
try {
// eslint-disable-next-line global-require
@@ -41,9 +43,10 @@ const HandleAuth = React.memo((props: Props) => {
if (username.current !== authData.username && queries) {
fetchTenant()
.then(async tenant => {
- await addLocations(tenant, queries.getExtconfig);
- await addTagGroups(tenant, queries.tagGroupsByTenant);
-
+ if (tenant) {
+ await addLocations(tenant, queries.getExtconfig);
+ await addTagGroups(tenant, queries.tagGroupsByTenant);
+ }
return true;
})
.catch(e => {
@@ -102,7 +105,10 @@ const HandleAuth = React.memo((props: Props) => {
.then(session => {
const accessToken = session.getAccessToken();
const cognitogroups = accessToken.payload['cognito:groups'];
- return cognitogroups[0];
+ if (cognitogroups) {
+ return cognitogroups[0];
+ }
+ return undefined;
})
.catch(e => {
console.error(e);
diff --git a/package.json b/package.json
index d85052b36..cfa4d303f 100644
--- a/package.json
+++ b/package.json
@@ -237,14 +237,14 @@
"yarn": "^1.22.10"
},
"dependencies": {
- "@aws-amplify/ui-react": "^1.0.6",
+ "@aws-amplify/ui-react": "^1.0.7",
"@date-io/date-fns": "^1.3.9",
"@gorillastack/jmespath": "^1.3.0",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"@material-ui/pickers": "^3.2.10",
- "aws-amplify": "^3.3.26",
+ "aws-amplify": "^3.3.27",
"aws-sdk": "^2.887.0",
"babel-polyfill": "^6.26.0",
"bytesize-icons": "^1.4.0",
@@ -273,6 +273,7 @@
"open-location-code-typescript": "^1.5.0",
"path": "^0.12.7",
"pdfjs-dist": "^2.4.456",
+ "qrcode.react": "^1.0.1",
"rc-table": "^7.8.0",
"react": "^16.13.1",
"react-beautiful-dnd": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2b38c6215..9fd957291 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,13 +7,13 @@
resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
-"@aws-amplify/[email protected]":
- version "4.0.17"
- resolved "https://registry.yarnpkg.com/@aws-amplify/analytics/-/analytics-4.0.17.tgz#d88f65872b8d2148112ab72c4b57378da6ec3e46"
- integrity sha512-HnxKrGJedRmNgt8/nDuSo8U7gyozGfOWcvB3+ak5NOT7rzf7ye/igkZYUIvrCcxFXxq5tJrf9a1bqSrWVtigKQ==
+"@aws-amplify/[email protected]":
+ version "4.0.18"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/analytics/-/analytics-4.0.18.tgz#95b34ad53a25d68cc6fe43dedf57ef861eb6c8e0"
+ integrity sha512-nOwpubv0jGOo0IhzHKIui0kiAEQoZ+PchBv47D4yCffV2pYiMua6NllFsAmxkHLD8EYTg3MYe932HNmM6+gSzg==
dependencies:
- "@aws-amplify/cache" "3.1.54"
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/cache" "3.1.55"
+ "@aws-amplify/core" "3.8.22"
"@aws-sdk/client-firehose" "3.6.1"
"@aws-sdk/client-kinesis" "3.6.1"
"@aws-sdk/client-personalize-events" "3.6.1"
@@ -22,57 +22,57 @@
lodash "^4.17.20"
uuid "^3.2.1"
-"@aws-amplify/[email protected]":
- version "1.2.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/api-graphql/-/api-graphql-1.2.29.tgz#cdf4286f0ce3479d22a22d2914ebac2becb4ae20"
- integrity sha512-KUDq2rfvDMCa3WIHm2iWk4gpqXvxFfiGe+Bud6HflCgXZWb34LYCN3LTv/jZ6D5sJNGtbml6fKCod3CX239NgQ==
+"@aws-amplify/[email protected]":
+ version "1.2.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/api-graphql/-/api-graphql-1.2.30.tgz#dd30cee7d46a64664dbcb7c2cd8b259d1bf588f0"
+ integrity sha512-qbkgKu8e0DD0ZXtMQ5b3uVJlqlC8EeEwhs3zy/BEKz51dUFDI5p6KMUYjbYVw8oNAgsFBXkMGCkhY+etXJNc6w==
dependencies:
- "@aws-amplify/api-rest" "1.2.29"
- "@aws-amplify/auth" "3.4.29"
- "@aws-amplify/cache" "3.1.54"
- "@aws-amplify/core" "3.8.21"
- "@aws-amplify/pubsub" "3.2.27"
+ "@aws-amplify/api-rest" "1.2.30"
+ "@aws-amplify/auth" "3.4.30"
+ "@aws-amplify/cache" "3.1.55"
+ "@aws-amplify/core" "3.8.22"
+ "@aws-amplify/pubsub" "3.2.28"
graphql "14.0.0"
uuid "^3.2.1"
zen-observable-ts "0.8.19"
-"@aws-amplify/[email protected]":
- version "1.2.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/api-rest/-/api-rest-1.2.29.tgz#30874e5ddc4c41a7f80ead2a5bb5b506df75aa31"
- integrity sha512-vFfdKnhZVWlNZybDe8f7+7FTYo6Yx2nvvGbRyzfVggoq5SZ43SWWgy+JTqOmSYr9DPjFsUHIeoDFm3z1id+vNA==
+"@aws-amplify/[email protected]":
+ version "1.2.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/api-rest/-/api-rest-1.2.30.tgz#ab2cf0ca0aeb960abbfcc0a4a9d0d5c119b78eda"
+ integrity sha512-mvcQ+u+j9dv1v2rSMZ2I31sSimIAi45UXmOTAUAjHEac/u8OYlUyLKG2DcTs1QmFKxNL0CHWqi060amjIIhfYg==
dependencies:
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/core" "3.8.22"
axios "0.21.1"
-"@aws-amplify/[email protected]":
- version "3.2.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/api/-/api-3.2.29.tgz#e6311d8f1964e9a7360794de09ba00aef9734096"
- integrity sha512-Np4w+doU7jLVWhXBY9pf8PjbTv9iWU34gtaOQ03SbxD9va/6zbxTxghBMoFZ2SEDBaWevyLtanoQckI/SFRxkw==
+"@aws-amplify/[email protected]":
+ version "3.2.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/api/-/api-3.2.30.tgz#687d23417555580e311de31cf78c6923769b9f77"
+ integrity sha512-3nTDDNMuWA81kAUc+2eV7aMJSYdWR7z4CtvMB7UGcfiKlXjyCZdXahbYLqyn3UGvNoGkoITD2J7jZ9Rc4ndXJQ==
dependencies:
- "@aws-amplify/api-graphql" "1.2.29"
- "@aws-amplify/api-rest" "1.2.29"
+ "@aws-amplify/api-graphql" "1.2.30"
+ "@aws-amplify/api-rest" "1.2.30"
-"@aws-amplify/[email protected]":
- version "3.4.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/auth/-/auth-3.4.29.tgz#25949ac9c931047888f226ef0b787d993bd182f5"
- integrity sha512-8Fm4XUb0YP92Hfpp2kgEetBgtfMKMAT+NRxckK+vxKTWKz5suK25J4EEOdt3DMlEY8qeDlOQpMpvt33ll0CJxg==
+"@aws-amplify/[email protected]":
+ version "3.4.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/auth/-/auth-3.4.30.tgz#9e36e1b56a431f91a92876ad819805a3ece5f87f"
+ integrity sha512-DYBDKU8JGZB8LRSVUj3BUKU/4qOcWkjfYoaVr3T3fvJvE2n2YOcXBVsYXUq24q1UlAuTfIbZQCrsbL7kBAxtAg==
dependencies:
- "@aws-amplify/cache" "3.1.54"
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/cache" "3.1.55"
+ "@aws-amplify/core" "3.8.22"
amazon-cognito-identity-js "4.6.0"
crypto-js "^3.3.0"
-"@aws-amplify/[email protected]":
- version "3.1.54"
- resolved "https://registry.yarnpkg.com/@aws-amplify/cache/-/cache-3.1.54.tgz#a2cc06836ae3d8f2ee08d616756ff31bb4c96dcd"
- integrity sha512-NjGCVVF7AZH477a54Y7yqmTCL/Ep7NAexV010XPLAo0GHD4QVR6il6DWpwc21LfS0E55Pr2FHPLPNZ/y+k7qAA==
+"@aws-amplify/[email protected]":
+ version "3.1.55"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/cache/-/cache-3.1.55.tgz#9fe1f2192e741bc27abeac29521881d9d060f8c0"
+ integrity sha512-3txk5bmC9wtijTaeKoAsype2rZiCfmYk6s8f5oiPo+dIU4a1mIliSHd8IAduKdOIbGdvJbzkzlplqXDQGJD+ng==
dependencies:
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/core" "3.8.22"
-"@aws-amplify/[email protected]":
- version "3.8.21"
- resolved "https://registry.yarnpkg.com/@aws-amplify/core/-/core-3.8.21.tgz#cede3638098db74a919d25a2f623dbe64ef4a33f"
- integrity sha512-yrN0/QW3O3wiihwoXOVgVt/9jphnZMOswziuzGhN5u/V3XFMdlI/uDtVyZMP4jskChlZtFEPkrI3NyoBrrT3NQ==
+"@aws-amplify/[email protected]":
+ version "3.8.22"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/core/-/core-3.8.22.tgz#9a872772b6ac90f9474eadbcb178430739ee0bfb"
+ integrity sha512-Plw0Gr6ik223bjBch/YicIUAhYTIEc8W3hx52u8jawpGMi1bcwmNAiuMMBvlSl50edbhmPgIw24GtyZNHLYDgQ==
dependencies:
"@aws-crypto/sha256-js" "1.0.0-alpha.0"
"@aws-sdk/client-cognito-identity" "3.6.1"
@@ -82,14 +82,14 @@
universal-cookie "^4.0.4"
zen-observable-ts "0.8.19"
-"@aws-amplify/[email protected]":
- version "2.9.15"
- resolved "https://registry.yarnpkg.com/@aws-amplify/datastore/-/datastore-2.9.15.tgz#d0724cdebc92e5263337fad5ebf366054d04377d"
- integrity sha512-nVXUZSSwlnkVglUd0pk9VwheLJDFTStyQdz7OVU5b9MwlJFKgVdTZeOLlTGd2Ou6hyhdkTI3sayzfqm6nD1pgw==
+"@aws-amplify/[email protected]":
+ version "2.9.16"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/datastore/-/datastore-2.9.16.tgz#fb31219803744fd34bf6b2b18825af7c4de5a3b9"
+ integrity sha512-YCJryQdpqVNF4S2dxkm46PoZ46rW0IJAcb2jHQuuUKa8lFXA5a2q4/cT8pakCGgVjmdaJXNUWlAZQu0CHapgRg==
dependencies:
- "@aws-amplify/api" "3.2.29"
- "@aws-amplify/core" "3.8.21"
- "@aws-amplify/pubsub" "3.2.27"
+ "@aws-amplify/api" "3.2.30"
+ "@aws-amplify/core" "3.8.22"
+ "@aws-amplify/pubsub" "3.2.28"
idb "5.0.6"
immer "8.0.1"
ulid "2.3.0"
@@ -97,21 +97,21 @@
zen-observable-ts "0.8.19"
zen-push "0.2.1"
-"@aws-amplify/[email protected]":
- version "3.3.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/interactions/-/interactions-3.3.29.tgz#59ee5896e6607d1132f0f24c3ebdc571ab67efb0"
- integrity sha512-+e5eb9IJSOhQP1QOgJBnphP+zfndWVzwcAqrW8F/pZInH02UnERSFATnnplsItJO4+4X4AYuyvjdFnGP4/wB4A==
+"@aws-amplify/[email protected]":
+ version "3.3.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/interactions/-/interactions-3.3.30.tgz#29a5e748584cf3530fe952b5905c265dabb040c5"
+ integrity sha512-RFDU+pptmxR+cPD4JlFz5JMFG5wIbY1M8PIpzOEhWPf1cnpSAVeDq9zvXDnyir45UrLfHxvJ8I3ocAZeAEa51g==
dependencies:
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/core" "3.8.22"
"@aws-sdk/client-lex-runtime-service" "3.6.1"
-"@aws-amplify/[email protected]":
- version "3.2.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/predictions/-/predictions-3.2.29.tgz#89b9c118a7ade9f16d713439f1789fe9b65ecad0"
- integrity sha512-r5lbSD3UMQY3lhn7KYyu9HYjACA55HK8lV/GOG/VYJV4l5VZE3yYxP2I8h/5yzb6fES1QpZjmgte4pqu9Vuc1Q==
+"@aws-amplify/[email protected]":
+ version "3.2.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/predictions/-/predictions-3.2.30.tgz#6ea868ab18b51fcfce64bca83a2293352296f94a"
+ integrity sha512-dFv+FC4F/+RiX4m9/+SGWG4UHsssZiHTdrUxjHyXi2/9csFieG4GS78lhcEnk1/k4LGYvYwU0qtMwzO5tcZH4g==
dependencies:
- "@aws-amplify/core" "3.8.21"
- "@aws-amplify/storage" "3.3.29"
+ "@aws-amplify/core" "3.8.22"
+ "@aws-amplify/storage" "3.4.0"
"@aws-sdk/client-comprehend" "3.6.1"
"@aws-sdk/client-polly" "3.6.1"
"@aws-sdk/client-rekognition" "3.6.1"
@@ -121,25 +121,25 @@
"@aws-sdk/util-utf8-node" "3.6.1"
uuid "^3.2.1"
-"@aws-amplify/[email protected]":
- version "3.2.27"
- resolved "https://registry.yarnpkg.com/@aws-amplify/pubsub/-/pubsub-3.2.27.tgz#6e6965bdc6615fd50604b252575eed9a290a5127"
- integrity sha512-zx4tyPdseqlrvvgzLxG3Jt+Xqyby3x50GrdziJugGIkLHTRHO4hMSFZViTPw6VkNFHmKRLYqN1ZF/PlrDJlLGQ==
+"@aws-amplify/[email protected]":
+ version "3.2.28"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/pubsub/-/pubsub-3.2.28.tgz#efb22b3252969687a4b4daf0c347d4077799d124"
+ integrity sha512-fsOHrs+EfKZDcJpIh9SgUodRR4/fXlQ1SCcc91XaDDcmLKY27TVPzDqIE08MVnqCKYQjCrqnhmzkiFcs3KV0hA==
dependencies:
- "@aws-amplify/auth" "3.4.29"
- "@aws-amplify/cache" "3.1.54"
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/auth" "3.4.30"
+ "@aws-amplify/cache" "3.1.55"
+ "@aws-amplify/core" "3.8.22"
graphql "14.0.0"
paho-mqtt "^1.1.0"
uuid "^3.2.1"
zen-observable-ts "0.8.19"
-"@aws-amplify/[email protected]":
- version "3.3.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/storage/-/storage-3.3.29.tgz#9decade18b522cd3a4d745ff933767a64a38f1ae"
- integrity sha512-g1ofVo1qyzflGm6B5tb/8YTUlsZWf6/YpiI+0CdQJWwVYw56wbHAFEu+MIFozH56sY0XCkScG0gSkiq1KMpiQw==
+"@aws-amplify/[email protected]":
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/storage/-/storage-3.4.0.tgz#148d38ef9a54237062df15ed992c96c26c91ab66"
+ integrity sha512-76SzmtbTAQo/CZgzJKe9O/DwSyi2JVG8LAwau57wK/8Sn8QHwpycf1QI6BEedFcaopvtVqPWumzmLoWzL9kLjA==
dependencies:
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/core" "3.8.22"
"@aws-sdk/client-s3" "3.6.1"
"@aws-sdk/s3-request-presigner" "3.6.1"
"@aws-sdk/util-create-request" "3.6.1"
@@ -148,32 +148,32 @@
events "^3.1.0"
sinon "^7.5.0"
-"@aws-amplify/[email protected]":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@aws-amplify/ui-components/-/ui-components-1.1.1.tgz#2eac8be3b10a1ab742ca74f38cf0bceb372cbfb1"
- integrity sha512-MftaCLnWWtVrWImQmNgNJZ9Rq6u2xsiI8HIxlE941DPjdqJfoCARN1JaDSttYCrWPijEsaGr8krf+3dlqf2mew==
+"@aws-amplify/[email protected]":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/ui-components/-/ui-components-1.2.0.tgz#d8f271c5f9e33282e3c831768f7f94abad634aa3"
+ integrity sha512-qr06y/Hy/tTVHtJoPq5/0Qt7Xh8c5lN96ILHwEAVPz1M8YhuRwzh2lIBU0ijoDKAhVfY2QRq1PNV0VSj0BGBeA==
dependencies:
qrcode "^1.4.4"
uuid "^8.2.0"
-"@aws-amplify/ui-react@^1.0.6":
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/@aws-amplify/ui-react/-/ui-react-1.0.6.tgz#41d54e61f564944630a5780b9fc64f3382be5d6c"
- integrity sha512-wb1dSC/3/KFtlTZwuU5dFB8DJxcx/OZpOvUZ0M18ipjoFTZOU6OWyLy24zRPoZndJT7fnZY6v0qgXflW2HFM/w==
+"@aws-amplify/ui-react@^1.0.7":
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/ui-react/-/ui-react-1.0.7.tgz#e1e52089df66c302e53dabb0b919aa457c60e916"
+ integrity sha512-NDTwhlOA/ZT3Rw6CvNpsk2jy/pfTnhQYkvOS7Opcxl9bYuHy4hK2Ah5Qufb65cjM2Rt8fOqGkGfP36vpzDgIZw==
dependencies:
- "@aws-amplify/ui-components" "1.1.1"
+ "@aws-amplify/ui-components" "1.2.0"
"@aws-amplify/[email protected]":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@aws-amplify/ui/-/ui-2.0.2.tgz#56bfc3674454f2a12d1cec247f38a444aa13ea09"
integrity sha512-OLdZmUCVK29+JV8PrkgVPjg+GIFtBnNjhC0JSRgrps+ynOFkibMQQPKeFXlTYtlukuCuepCelPSkjxvhcLq2ZA==
-"@aws-amplify/[email protected]":
- version "2.2.29"
- resolved "https://registry.yarnpkg.com/@aws-amplify/xr/-/xr-2.2.29.tgz#726a9f5ae229d4a80a2954974f68d07ad85f4c06"
- integrity sha512-uqGWkQvaVVtW+k64GfI4VIPVPmlvehZ6KEJzulQH2mSYvRHuSDrKU4kpzD6S5fhLXN1BJEy6Db2muNuz3RoTEw==
+"@aws-amplify/[email protected]":
+ version "2.2.30"
+ resolved "https://registry.yarnpkg.com/@aws-amplify/xr/-/xr-2.2.30.tgz#c3172bd25ac7ac2c243d74b510802ed11c28d6fa"
+ integrity sha512-BzfpLoiucYR4YoJIctFBoRefwcx77GKCOf5Pas8LnVIVvizozv1FIZZ3FE2lhNqd3fvd2+e1ogh/Y+chohDTGQ==
dependencies:
- "@aws-amplify/core" "3.8.21"
+ "@aws-amplify/core" "3.8.22"
"@aws-crypto/crc32@^1.0.0":
version "1.0.0"
@@ -5003,23 +5003,23 @@ autoprefixer@^9.0.0:
postcss "^7.0.32"
postcss-value-parser "^4.1.0"
-aws-amplify@^3.3.26:
- version "3.3.26"
- resolved "https://registry.yarnpkg.com/aws-amplify/-/aws-amplify-3.3.26.tgz#91cb232cc40b6d93176f56ce1072189a79ce500f"
- integrity sha512-zlC2oJI0Ta3B9Vb0G4IIA9Ar+AqLDquWZTxTA7IwIWM0bVFShAVl7bVHpk5VJpUQC4vJCWq+DXJGqz1pa4jdpw==
- dependencies:
- "@aws-amplify/analytics" "4.0.17"
- "@aws-amplify/api" "3.2.29"
- "@aws-amplify/auth" "3.4.29"
- "@aws-amplify/cache" "3.1.54"
- "@aws-amplify/core" "3.8.21"
- "@aws-amplify/datastore" "2.9.15"
- "@aws-amplify/interactions" "3.3.29"
- "@aws-amplify/predictions" "3.2.29"
- "@aws-amplify/pubsub" "3.2.27"
- "@aws-amplify/storage" "3.3.29"
+aws-amplify@^3.3.27:
+ version "3.3.27"
+ resolved "https://registry.yarnpkg.com/aws-amplify/-/aws-amplify-3.3.27.tgz#40dd691c988f33f1b2c15c4de8967cd92285783b"
+ integrity sha512-3roZdw59ss5C5hjEzZH4+OTRjuQURGOmgEFEcygcHqEHSVmGsH42+cRLD32H9ACMN+YfC0DvZ5gHoMuybRj1vg==
+ dependencies:
+ "@aws-amplify/analytics" "4.0.18"
+ "@aws-amplify/api" "3.2.30"
+ "@aws-amplify/auth" "3.4.30"
+ "@aws-amplify/cache" "3.1.55"
+ "@aws-amplify/core" "3.8.22"
+ "@aws-amplify/datastore" "2.9.16"
+ "@aws-amplify/interactions" "3.3.30"
+ "@aws-amplify/predictions" "3.2.30"
+ "@aws-amplify/pubsub" "3.2.28"
+ "@aws-amplify/storage" "3.4.0"
"@aws-amplify/ui" "2.0.2"
- "@aws-amplify/xr" "2.2.29"
+ "@aws-amplify/xr" "2.2.30"
aws-sdk@^2.887.0:
version "2.887.0"
@@ -15070,6 +15070,20 @@ q@^1.1.2:
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+ version "0.0.0"
+ resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
+ integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
+
+qrcode.react@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-1.0.1.tgz#2834bb50e5e275ffe5af6906eff15391fe9e38a5"
+ integrity sha512-8d3Tackk8IRLXTo67Y+c1rpaiXjoz/Dd2HpcMdW//62/x8J1Nbho14Kh8x974t9prsLHN6XqVgcnRiBGFptQmg==
+ dependencies:
+ loose-envify "^1.4.0"
+ prop-types "^15.6.0"
+ qr.js "0.0.0"
+
qrcode@^1.4.4:
version "1.4.4"
resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"