Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: mfa #1064

Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: "CodeQL"

on:
push:
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
schedule:
- cron: '0 14 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
7 changes: 2 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -48,7 +46,6 @@ jobs:
- name: Test documentation
run: |
cd website
yarn install --frozen-lockfile
yarn generate-api-docs
yarn build
env:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@ yarn-error.log
packages/*/package-lock.json
schema.json
.DS_Store

build/
.yarn/*
!.yarn/releases
!.yarn/plugins
.pnp.*
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ packages/graphql-api/src/models.ts
packages/graphql-client/src/graphql-operations.ts
website/.docusaurus
website/docs/api
.yarn
38 changes: 38 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

106,764 changes: 106,764 additions & 0 deletions .yarn/releases/yarn-berry.js

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions examples/accounts-boost/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/accounts-boost",
"private": true,
"version": "0.29.0",
"version": "0.30.0-alpha.1",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
Expand All @@ -13,20 +13,20 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/boost": "^0.29.0",
"@graphql-tools/merge": "6.0.11",
"@accounts/boost": "^0.30.0-alpha.1",
"@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.20",
"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"
}
}
1 change: 0 additions & 1 deletion examples/graphql-server-typeorm-postgres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
28 changes: 14 additions & 14 deletions examples/graphql-server-typeorm-postgres/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/graphql-typeorm-typescript",
"private": true,
"version": "0.29.0",
"version": "0.30.0-alpha.1",
"main": "lib/index.js",
"license": "Unlicensed",
"scripts": {
Expand All @@ -12,23 +12,23 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/graphql-api": "^0.29.0",
"@accounts/password": "^0.29.0",
"@accounts/server": "^0.29.0",
"@accounts/typeorm": "^0.29.0",
"@accounts/graphql-api": "^0.30.0-alpha.1",
"@accounts/password": "^0.30.0-alpha.1",
"@accounts/server": "^0.30.0-alpha.1",
"@accounts/typeorm": "^0.30.0-alpha.1",
"@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"
"@accounts/types": "^0.30.0-alpha.1",
"@types/node": "14.0.27",
"nodemon": "2.0.4",
"ts-node": "8.10.2",
"typescript": "3.9.7"
}
}
1 change: 0 additions & 1 deletion examples/graphql-server-typescript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
30 changes: 15 additions & 15 deletions examples/graphql-server-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/graphql-server-typescript",
"private": true,
"version": "0.29.0",
"version": "0.30.0-alpha.1",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
Expand All @@ -10,23 +10,23 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/database-manager": "^0.29.0",
"@accounts/graphql-api": "^0.29.0",
"@accounts/mongo": "^0.29.0",
"@accounts/password": "^0.29.0",
"@accounts/rest-express": "^0.29.0",
"@accounts/server": "^0.29.0",
"@accounts/database-manager": "^0.30.0-alpha.1",
"@accounts/graphql-api": "^0.30.0-alpha.1",
"@accounts/mongo": "^0.30.0-alpha.1",
"@accounts/password": "^0.30.0-alpha.1",
"@accounts/rest-express": "^0.30.0-alpha.1",
"@accounts/server": "^0.30.0-alpha.1",
"@graphql-modules/core": "0.7.17",
"@graphql-tools/merge": "6.0.11",
"apollo-server": "2.16.0",
"graphql": "14.6.0",
"lodash": "4.17.19",
"mongoose": "5.9.25",
"tslib": "2.0.0"
"@graphql-tools/merge": "6.0.16",
"apollo-server": "2.16.1",
"graphql": "14.7.0",
"lodash": "4.17.20",
"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"
Expand Down
1 change: 0 additions & 1 deletion examples/react-graphql-typescript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
22 changes: 11 additions & 11 deletions examples/react-graphql-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@examples/react-graphql-typescript",
"version": "0.29.0",
"version": "0.30.0-alpha.1",
"private": true,
"scripts": {
"start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",
Expand All @@ -24,25 +24,25 @@
]
},
"dependencies": {
"@accounts/apollo-link": "^0.29.0",
"@accounts/client": "^0.29.0",
"@accounts/client-password": "^0.29.0",
"@accounts/graphql-client": "^0.29.0",
"@apollo/client": "3.0.2",
"@accounts/apollo-link": "^0.30.0-alpha.1",
"@accounts/client": "^0.30.0-alpha.1",
"@accounts/client-password": "^0.30.0-alpha.1",
"@accounts/graphql-client": "^0.30.0-alpha.1",
"@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",
Expand Down
1 change: 0 additions & 1 deletion examples/react-rest-typescript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
30 changes: 15 additions & 15 deletions examples/react-rest-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@examples/react-rest-typescript",
"version": "0.29.0",
"version": "0.30.0-alpha.1",
"private": true,
"scripts": {
"start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",
Expand All @@ -24,28 +24,28 @@
]
},
"dependencies": {
"@accounts/client": "^0.29.0",
"@accounts/client-password": "^0.29.0",
"@accounts/rest-client": "^0.29.0",
"@material-ui/core": "4.9.13",
"@accounts/client": "^0.30.0-alpha.1",
"@accounts/client-password": "^0.30.0-alpha.1",
"@accounts/rest-client": "^0.30.0-alpha.1",
"@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"
}
}
Loading