WIP feat(mfa): new authenticator api

.github/workflows/nodejs.yml

@@ -20,7 +20,7 @@ jobs:
         run: docker-compose up -d
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
       - uses: actions/cache@v2
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
@@ -29,9 +29,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-      - name: Lerna bootstrap
-        run: yarn run lerna bootstrap
+        run: yarn install --immutable
       - name: Check lint
         run: yarn test:lint
       - name: Compile packages
@@ -48,7 +46,6 @@ jobs:
       - name: Test documentation
         run: |
           cd website
-          yarn install --frozen-lockfile
           yarn generate-api-docs
           yarn build
         env:

.gitignore

@@ -9,5 +9,8 @@ yarn-error.log
 packages/*/package-lock.json
 schema.json
 .DS_Store
-
 build/
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+.pnp.*

.prettierignore

@@ -7,3 +7,4 @@ packages/graphql-api/src/models.ts
 packages/graphql-client/src/graphql-operations.ts
 website/.docusaurus
 website/docs/api
+.yarn

.yarnrc.yml

@@ -0,0 +1,10 @@
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-berry.js
+# We use the node linker because some modules are not compatible with Plug'n'Play
+# - graphql-codegen is failing
+nodeLinker: node-modules

CONTRIBUTING.md

@@ -19,7 +19,6 @@ The Accounts project was intended - since its inception - to be a community main
 #### Useful Commands:
 
 - Install project dependencies: `yarn`
-- Link together all the packages: `yarn setup`
 - Compile the packages `yarn compile`
 - Watch the packages for changes and recompile: `yarn start` (You need to run this command in the package subfolder you are updating)
 - If you want to use the accounts project in your own project, use `yarn link @accounts/<name of package>` within your project.
@@ -64,7 +63,7 @@ Anyone can file an expense. If the expense makes sense for the development of th
 ### Contributors
 
 Thank you to all the people who have already contributed to accounts-js!
-<a href="graphs/contributors"><img src="https://opencollective.com/accounts-js/contributors.svg?width=890" /></a>
+<a href="https://github.com/accounts-js/accounts/graphs/contributors"><img src="https://opencollective.com/accounts-js/contributors.svg?width=890" /></a>
 
 ### Backers
 

examples/accounts-boost/package.json

@@ -14,19 +14,19 @@
   },
   "dependencies": {
     "@accounts/boost": "^0.29.0",
-    "@graphql-tools/merge": "6.0.11",
+    "@graphql-tools/merge": "6.0.16",
     "apollo-link-context": "1.0.20",
     "apollo-link-http": "1.5.17",
-    "apollo-server": "2.14.4",
-    "graphql": "14.6.0",
+    "apollo-server": "2.16.1",
+    "graphql": "14.7.0",
     "graphql-tools": "5.0.0",
-    "lodash": "4.17.15",
+    "lodash": "4.17.19",
     "node-fetch": "2.6.0",
-    "tslib": "2.0.0"
+    "tslib": "2.0.1"
   },
   "devDependencies": {
-    "nodemon": "2.0.3",
-    "ts-node": "8.10.1",
-    "typescript": "3.8.3"
+    "nodemon": "2.0.4",
+    "ts-node": "8.10.2",
+    "typescript": "3.9.7"
   }
 }

examples/graphql-server-typeorm-postgres/README.md

@@ -8,7 +8,6 @@ In order to be able to run this example on your machine you first need to do the
 
 - Clone the repository `git clone [email protected]:accounts-js/accounts.git`
 - Install project dependencies: `yarn`
-- Link together all the packages: `yarn setup`
 - Compile the packages `yarn compile`
 - Go to the example folder `cd examples/graphql-server-typeorm-postgres`
 

examples/graphql-server-typeorm-postgres/package.json

@@ -17,18 +17,18 @@
     "@accounts/server": "^0.29.0",
     "@accounts/typeorm": "^0.29.0",
     "@graphql-modules/core": "0.7.17",
-    "@graphql-tools/merge": "6.0.11",
-    "apollo-server": "2.14.4",
+    "@graphql-tools/merge": "6.0.16",
+    "apollo-server": "2.16.1",
     "dotenv": "^8.2.0",
-    "graphql": "14.6.0",
-    "pg": "8.1.0",
+    "graphql": "14.7.0",
+    "pg": "8.3.0",
     "typeorm": "0.2.25"
   },
   "devDependencies": {
     "@accounts/types": "^0.29.0",
-    "@types/node": "14.0.13",
-    "nodemon": "2.0.3",
-    "ts-node": "8.10.1",
-    "typescript": "3.8.3"
+    "@types/node": "14.0.27",
+    "nodemon": "2.0.4",
+    "ts-node": "8.10.2",
+    "typescript": "3.9.7"
   }
 }

examples/graphql-server-typescript/README.md

@@ -8,7 +8,6 @@ In order to be able to run this example on your machine you first need to do the
 
 - Clone the repository `git clone [email protected]:accounts-js/accounts.git`
 - Install project dependencies: `yarn`
-- Link together all the packages: `yarn setup`
 - Compile the packages `yarn compile`
 - Go to the example folder `cd examples/graphql-server-typescript`
 

examples/graphql-server-typescript/package.json

@@ -17,16 +17,16 @@
     "@accounts/rest-express": "^0.29.0",
     "@accounts/server": "^0.29.0",
     "@graphql-modules/core": "0.7.17",
-    "@graphql-tools/merge": "6.0.11",
-    "apollo-server": "2.16.0",
-    "graphql": "14.6.0",
+    "@graphql-tools/merge": "6.0.16",
+    "apollo-server": "2.16.1",
+    "graphql": "14.7.0",
     "lodash": "4.17.19",
-    "mongoose": "5.9.25",
-    "tslib": "2.0.0"
+    "mongoose": "5.9.28",
+    "tslib": "2.0.1"
   },
   "devDependencies": {
-    "@types/mongoose": "5.7.32",
-    "@types/node": "14.0.13",
+    "@types/mongoose": "5.7.36",
+    "@types/node": "14.0.27",
     "nodemon": "2.0.4",
     "ts-node": "8.10.2",
     "typescript": "3.9.7"

examples/react-graphql-typescript/README.md

@@ -8,7 +8,6 @@ In order to be able to run this example on your machine you first need to do the
 
 - Clone the repository `git clone [email protected]:accounts-js/accounts.git`
 - Install project dependencies: `yarn`
-- Link together all the packages: `yarn setup`
 - Compile the packages `yarn compile`
 - Go to the example folder `cd examples/react-graphql-typescript`
 

examples/react-graphql-typescript/package.json

@@ -28,21 +28,21 @@
     "@accounts/client": "^0.29.0",
     "@accounts/client-password": "^0.29.0",
     "@accounts/graphql-client": "^0.29.0",
-    "@apollo/client": "3.0.2",
+    "@apollo/client": "3.1.3",
     "@material-ui/core": "4.11.0",
     "@material-ui/styles": "4.10.0",
-    "graphql": "14.6.0",
-    "graphql-tag": "2.10.4",
+    "graphql": "14.7.0",
+    "graphql-tag": "2.11.0",
     "qrcode.react": "1.0.0",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-router-dom": "5.2.0",
-    "tslib": "2.0.0"
+    "tslib": "2.0.1"
   },
   "devDependencies": {
-    "@types/node": "14.0.13",
+    "@types/node": "14.0.27",
     "@types/qrcode.react": "1.0.1",
-    "@types/react": "16.9.43",
+    "@types/react": "16.9.45",
     "@types/react-dom": "16.9.8",
     "@types/react-router": "5.1.8",
     "@types/react-router-dom": "5.1.5",

examples/react-rest-typescript/README.md

@@ -10,7 +10,6 @@ In order to be able to run this example on your machine you first need to do the
 
 - Clone the repository `git clone [email protected]:accounts-js/accounts.git`
 - Install project dependencies: `yarn`
-- Link together all the packages: `yarn setup`
 - Compile the packages `yarn compile`
 - Go to the example folder `cd examples/react-rest-typescript`
 

examples/react-rest-typescript/package.json

@@ -27,25 +27,25 @@
     "@accounts/client": "^0.29.0",
     "@accounts/client-password": "^0.29.0",
     "@accounts/rest-client": "^0.29.0",
-    "@material-ui/core": "4.9.13",
+    "@material-ui/core": "4.11.0",
     "@material-ui/icons": "4.9.1",
-    "@material-ui/lab": "4.0.0-alpha.50",
-    "@material-ui/styles": "4.9.13",
-    "formik": "2.1.4",
+    "@material-ui/lab": "4.0.0-alpha.56",
+    "@material-ui/styles": "4.10.0",
+    "formik": "2.1.5",
     "qrcode.react": "1.0.0",
     "react": "16.13.1",
     "react-dom": "16.13.1",
-    "react-router-dom": "5.1.2",
-    "tslib": "2.0.0"
+    "react-router-dom": "5.2.0",
+    "tslib": "2.0.1"
   },
   "devDependencies": {
-    "@types/node": "14.0.13",
-    "@types/qrcode.react": "1.0.0",
-    "@types/react": "16.9.36",
+    "@types/node": "14.0.27",
+    "@types/qrcode.react": "1.0.1",
+    "@types/react": "16.9.45",
     "@types/react-dom": "16.9.8",
-    "@types/react-router": "5.1.7",
+    "@types/react-router": "5.1.8",
     "@types/react-router-dom": "5.1.5",
     "react-scripts": "3.4.1",
-    "typescript": "3.7.5"
+    "typescript": "3.9.7"
   }
 }

examples/react-rest-typescript/src/Login.tsx

@@ -17,7 +17,7 @@ import { SnackBarContentError } from './components/SnackBarContentError';
 import { useAuth } from './components/AuthContext';
 import { UnauthenticatedContainer } from './components/UnauthenticatedContainer';
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
   cardContent: {
     padding: theme.spacing(3),
   },
@@ -41,7 +41,6 @@ const ResetPasswordLink = React.forwardRef<RouterLink, any>((props, ref) => (
 interface LoginValues {
   email: string;
   password: string;
-  code: string;
 }
 
 const Login = ({ history }: RouteComponentProps<{}>) => {
@@ -52,9 +51,8 @@ const Login = ({ history }: RouteComponentProps<{}>) => {
     initialValues: {
       email: '',
       password: '',
-      code: '',
     },
-    validate: values => {
+    validate: (values) => {
       const errors: FormikErrors<LoginValues> = {};
       if (!values.email) {
         errors.email = 'Required';
@@ -66,13 +64,16 @@ const Login = ({ history }: RouteComponentProps<{}>) => {
     },
     onSubmit: async (values, { setSubmitting }) => {
       try {
-        await loginWithService('password', {
+        const loginResponse = await loginWithService('password', {
           user: {
             email: values.email,
           },
           password: values.password,
-          code: values.code,
         });
+        if ('mfaToken' in loginResponse) {
+          history.push('/login/mfa', { mfaToken: loginResponse.mfaToken });
+          return;
+        }
         history.push('/');
       } catch (error) {
         setError(error.message);
@@ -130,18 +131,6 @@ const Login = ({ history }: RouteComponentProps<{}>) => {
                   helperText={formik.touched.password && formik.errors.password}
                 />
               </Grid>
-              <Grid item xs={12}>
-                <TextField
-                  label="2fa code if enabled"
-                  variant="outlined"
-                  fullWidth={true}
-                  id="code"
-                  value={formik.values.code}
-                  onChange={formik.handleChange}
-                  error={Boolean(formik.errors.code && formik.touched.code)}
-                  helperText={formik.touched.code && formik.errors.code}
-                />
-              </Grid>
               <Grid item xs={12} md={6}>
                 <Button
                   variant="contained"