Thibaut Girka
5b8a4f96de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
dependabot[bot]
3db9fc26a0
Bump uri-js from 4.2.2 to 4.4.0 ( #14706 )
...
Bumps [uri-js](https://github.com/garycourt/uri-js ) from 4.2.2 to 4.4.0.
- [Release notes](https://github.com/garycourt/uri-js/releases )
- [Commits](https://github.com/garycourt/uri-js/compare/4.2.2...4.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:35:56 +09:00
dependabot[bot]
2487b5b9f8
Bump mini-css-extract-plugin from 0.9.0 to 0.11.0 ( #14690 )
...
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin ) from 0.9.0 to 0.11.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.9.0...v0.11.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:35:27 +09:00
dependabot[bot]
327cc65116
Bump whatwg-url from 8.1.0 to 8.2.1 ( #14688 )
...
Bumps [whatwg-url](https://github.com/jsdom/whatwg-url ) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/jsdom/whatwg-url/releases )
- [Commits](https://github.com/jsdom/whatwg-url/compare/v8.1.0...v8.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:33:15 +09:00
dependabot[bot]
fe3e7811b6
Bump loglevel from 1.6.8 to 1.7.0 ( #14692 )
...
Bumps [loglevel](https://github.com/pimterry/loglevel ) from 1.6.8 to 1.7.0.
- [Release notes](https://github.com/pimterry/loglevel/releases )
- [Commits](https://github.com/pimterry/loglevel/compare/v1.6.8...v1.7.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:27:49 +09:00
dependabot[bot]
f35b37dbe5
Bump caniuse-lite from 1.0.30001117 to 1.0.30001120 ( #14695 )
...
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite ) from 1.0.30001117 to 1.0.30001120.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases )
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001117...v1.0.30001120 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:27:20 +09:00
dependabot[bot]
22011815d2
Bump querystringify from 2.1.1 to 2.2.0 ( #14696 )
...
Bumps [querystringify](https://github.com/unshiftio/querystringify ) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/unshiftio/querystringify/releases )
- [Commits](https://github.com/unshiftio/querystringify/compare/2.1.1...2.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:26:55 +09:00
dependabot[bot]
90c442c772
Bump opener from 1.5.1 to 1.5.2 ( #14698 )
...
Bumps [opener](https://github.com/domenic/opener ) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/domenic/opener/releases )
- [Commits](https://github.com/domenic/opener/compare/v1.5.1...v1.5.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:24:57 +09:00
dependabot[bot]
9ab2cde77f
Bump side-channel from 1.0.2 to 1.0.3 ( #14700 )
...
Bumps [side-channel](https://github.com/ljharb/side-channel ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/ljharb/side-channel/releases )
- [Changelog](https://github.com/ljharb/side-channel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/ljharb/side-channel/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:24:37 +09:00
dependabot[bot]
9b9d98b900
Bump @testing-library/jest-dom from 5.11.2 to 5.11.4 ( #14703 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.11.2 to 5.11.4.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.2...v5.11.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:22:02 +09:00
dependabot[bot]
986b1c0e45
Bump postcss-calc from 7.0.2 to 7.0.3 ( #14705 )
...
Bumps [postcss-calc](https://github.com/postcss/postcss-calc ) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/postcss/postcss-calc/releases )
- [Changelog](https://github.com/postcss/postcss-calc/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss-calc/compare/7.0.2...v7.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-01 10:21:16 +09:00
ThibG
6cb7f10134
Update Tesseract.js ( #14708 )
...
* [WiP] Update Tesseract.js
- Update Tesseract.js to 2.2.1
- Use versioned file names
- differentiate two progression states: preparing OCR and detecting picture
* Get rid of copy-webpack-plugin
2020-09-01 00:26:10 +02:00
Thibaut Girka
37e746eab6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream change too close to a glitch-soc change related to
instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Minor conflict due to glitch-soc's handling of Direct Messages,
merged upstream changes.
- `yarn.lock`:
Not really a conflict, caused by glitch-soc-only dependencies
being textually too close to updated upstream dependencies.
Merged upstream changes.
2020-08-30 16:13:08 +02:00
dependabot[bot]
345a8df670
Bump events from 3.1.0 to 3.2.0 ( #14653 )
...
Bumps [events](https://github.com/Gozala/events ) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/Gozala/events/releases )
- [Changelog](https://github.com/Gozala/events/blob/master/History.md )
- [Commits](https://github.com/Gozala/events/compare/v3.1.0...v3.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 09:41:37 +09:00
dependabot[bot]
2250e24de5
Bump jest from 26.4.0 to 26.4.2 ( #14648 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.4.0 to 26.4.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v26.4.0...v26.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 01:53:32 +09:00
dependabot[bot]
a32d15c866
Bump @clusterws/cws from 2.0.0 to 3.0.0 ( #14630 )
...
Bumps [@clusterws/cws](https://github.com/ClusterWS/cWS ) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/ClusterWS/cWS/releases )
- [Changelog](https://github.com/ClusterWS/cWS/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ClusterWS/cWS/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 01:32:53 +09:00
dependabot[bot]
6e1f148916
Bump browserslist from 4.13.0 to 4.14.0 ( #14652 )
...
Bumps [browserslist](https://github.com/browserslist/browserslist ) from 4.13.0 to 4.14.0.
- [Release notes](https://github.com/browserslist/browserslist/releases )
- [Changelog](https://github.com/browserslist/browserslist/blob/master/CHANGELOG.md )
- [Commits](https://github.com/browserslist/browserslist/compare/4.13.0...4.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 01:12:13 +09:00
dependabot[bot]
ba29814597
Bump create-ecdh from 4.0.3 to 4.0.4 ( #14649 )
...
Bumps [create-ecdh](https://github.com/crypto-browserify/createECDH ) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/crypto-browserify/createECDH/releases )
- [Commits](https://github.com/crypto-browserify/createECDH/compare/v4.0.3...v4.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 00:41:15 +09:00
dependabot[bot]
f0c4b1ac8c
Bump css-loader from 3.6.0 to 4.2.2 ( #14664 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.6.0 to 4.2.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.6.0...v4.2.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 00:02:03 +09:00
dependabot[bot]
f9aba59037
Bump compression-webpack-plugin from 4.0.0 to 5.0.1 ( #14647 )
...
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin ) from 4.0.0 to 5.0.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v4.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-26 00:01:46 +09:00
dependabot[bot]
fa44267c5e
Bump imports-loader from 0.8.0 to 1.1.0 ( #14323 )
...
* Bump imports-loader from 0.8.0 to 1.1.0
Bumps [imports-loader](https://github.com/webpack-contrib/imports-loader ) from 0.8.0 to 1.1.0.
- [Release notes](https://github.com/webpack-contrib/imports-loader/releases )
- [Changelog](https://github.com/webpack-contrib/imports-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/imports-loader/compare/v0.8.0...v1.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
* Migrate new syntax
* Add semicolon
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2020-08-25 22:50:47 +09:00
dependabot[bot]
bf4e4f3407
Bump sass-loader from 8.0.2 to 9.0.3 ( #14637 )
...
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader ) from 8.0.2 to 9.0.3.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases )
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.2...v9.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:51:51 +09:00
dependabot[bot]
a5233d695a
Bump aggregate-error from 3.0.1 to 3.1.0 ( #14654 )
...
Bumps [aggregate-error](https://github.com/sindresorhus/aggregate-error ) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/sindresorhus/aggregate-error/releases )
- [Commits](https://github.com/sindresorhus/aggregate-error/compare/v3.0.1...v3.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:48:39 +09:00
dependabot[bot]
a6315a7b88
Bump js-base64 from 2.6.2 to 2.6.4 ( #14650 )
...
Bumps [js-base64](https://github.com/dankogai/js-base64 ) from 2.6.2 to 2.6.4.
- [Release notes](https://github.com/dankogai/js-base64/releases )
- [Commits](https://github.com/dankogai/js-base64/compare/2.6.2...2.6.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:44:10 +09:00
dependabot[bot]
1fbe7d49e1
Bump eventemitter3 from 4.0.4 to 4.0.5 ( #14646 )
...
Bumps [eventemitter3](https://github.com/primus/eventemitter3 ) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/primus/eventemitter3/releases )
- [Commits](https://github.com/primus/eventemitter3/compare/4.0.4...4.0.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:43:00 +09:00
dependabot[bot]
1c86e7c9c4
Bump postgres-date from 1.0.5 to 1.0.6 ( #14642 )
...
Bumps [postgres-date](https://github.com/bendrucker/postgres-date ) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/bendrucker/postgres-date/releases )
- [Commits](https://github.com/bendrucker/postgres-date/compare/v1.0.5...v1.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:38:20 +09:00
dependabot[bot]
f86f57ad7e
Bump autoprefixer from 9.8.5 to 9.8.6 ( #14641 )
...
Bumps [autoprefixer](https://github.com/postcss/autoprefixer ) from 9.8.5 to 9.8.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases )
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.5...9.8.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:35:57 +09:00
dependabot[bot]
8b9b24eb72
Bump @babel/runtime from 7.10.5 to 7.11.2 ( #14639 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.10.5 to 7.11.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.2/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:33:31 +09:00
dependabot[bot]
2ba22403d2
Bump @babel/plugin-transform-runtime from 7.10.5 to 7.11.0 ( #14645 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.5 to 7.11.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.0/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:32:29 +09:00
dependabot[bot]
dec928c156
Bump browserify-sign from 4.2.0 to 4.2.1 ( #14636 )
...
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign ) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/crypto-browserify/browserify-sign/releases )
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.0...v4.2.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:30:11 +09:00
dependabot[bot]
c1710ba63f
Bump babel-jest from 26.1.0 to 26.3.0 ( #14634 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 26.1.0 to 26.3.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.3.0/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:15:38 +09:00
dependabot[bot]
529a7d461b
Bump copy-webpack-plugin from 6.0.2 to 6.0.3 ( #14633 )
...
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin ) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v6.0.2...v6.0.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:13:39 +09:00
dependabot[bot]
e9196d7ff0
Bump minizlib from 2.1.0 to 2.1.2 ( #14632 )
...
Bumps [minizlib](https://github.com/isaacs/minizlib ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/isaacs/minizlib/releases )
- [Commits](https://github.com/isaacs/minizlib/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:13:13 +09:00
dependabot[bot]
c9616af743
Bump webpack from 4.44.0 to 4.44.1 ( #14628 )
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.44.0 to 4.44.1.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.44.0...v4.44.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-25 21:10:01 +09:00
santiagorodriguez96
f142983484
Add WebAuthn as an alternative 2FA method ( #14466 )
...
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
2020-08-24 16:46:27 +02:00
dependabot[bot]
ee032daa72
Bump jest-cli from 26.4.0 to 26.4.2 ( #14614 )
...
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli ) from 26.4.0 to 26.4.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.4.2/packages/jest-cli )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-22 23:09:18 +09:00
dependabot[bot]
8573954a4e
Bump jsdom from 16.3.0 to 16.4.0 ( #14587 )
...
Bumps [jsdom](https://github.com/jsdom/jsdom ) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/jsdom/jsdom/releases )
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md )
- [Commits](https://github.com/jsdom/jsdom/compare/16.3.0...16.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-22 22:48:23 +09:00
dependabot[bot]
25330537b2
Bump duplexer from 0.1.1 to 0.1.2 ( #14593 )
...
Bumps [duplexer](https://github.com/Raynos/duplexer ) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/Raynos/duplexer/releases )
- [Commits](https://github.com/Raynos/duplexer/compare/v0.1.1...v0.1.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:29:36 +09:00
dependabot[bot]
fe43cb94cc
Bump portfinder from 1.0.26 to 1.0.28 ( #14594 )
...
Bumps [portfinder](https://github.com/http-party/node-portfinder ) from 1.0.26 to 1.0.28.
- [Release notes](https://github.com/http-party/node-portfinder/releases )
- [Commits](https://github.com/http-party/node-portfinder/compare/v1.0.26...v1.0.28 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:28:14 +09:00
dependabot[bot]
759dff28a6
Bump intersection-observer from 0.10.0 to 0.11.0 ( #14589 )
...
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver ) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases )
- [Commits](https://github.com/w3c/IntersectionObserver/commits )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:16:57 +09:00
dependabot[bot]
aa21664a93
Bump jest from 26.2.2 to 26.4.0 ( #14585 )
...
Bumps [jest](https://github.com/facebook/jest ) from 26.2.2 to 26.4.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/compare/v26.2.2...v26.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:12:03 +09:00
dependabot[bot]
79c6f940ab
Bump har-validator from 5.1.3 to 5.1.5 ( #14580 )
...
Bumps [har-validator](https://github.com/ahmadnassri/node-har-validator ) from 5.1.3 to 5.1.5.
- [Release notes](https://github.com/ahmadnassri/node-har-validator/releases )
- [Changelog](https://github.com/ahmadnassri/node-har-validator/blob/master/.releaserc )
- [Commits](https://github.com/ahmadnassri/node-har-validator/compare/v5.1.3...v5.1.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-21 05:11:09 +09:00
Thibaut Girka
f800c99b60
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-19 19:16:41 +02:00
dependabot[bot]
3d42e6cd6e
Bump abab from 2.0.3 to 2.0.4 ( #14550 )
...
Bumps [abab](https://github.com/jsdom/abab ) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/jsdom/abab/releases )
- [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jsdom/abab/compare/2.0.3...2.0.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:32:06 +09:00
dependabot[bot]
f70cfd823c
Bump jest-haste-map from 26.1.0 to 26.2.2 ( #14552 )
...
Bumps [jest-haste-map](https://github.com/facebook/jest/tree/HEAD/packages/jest-haste-map ) from 26.1.0 to 26.2.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.2.2/packages/jest-haste-map )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:29:10 +09:00
dependabot[bot]
06004417d8
Bump use-latest from 1.0.0 to 1.1.0 ( #14541 )
...
Bumps [use-latest](https://github.com/Andarist/use-latest ) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/Andarist/use-latest/releases )
- [Commits](https://github.com/Andarist/use-latest/compare/v1.0.0...v1.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:20:01 +09:00
dependabot[bot]
b3e9b0bb25
Bump @babel/core from 7.10.5 to 7.11.1 ( #14554 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.10.5 to 7.11.1.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.11.1/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-17 02:08:26 +09:00
Thibaut Girka
be0475e5a1
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-08 19:10:40 +02:00
dependabot[bot]
6b527f042f
Bump node-notifier from 7.0.1 to 7.0.2 ( #14499 )
...
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier ) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases )
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v7.0.1...v7.0.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-07 00:41:07 +09:00
dependabot[bot]
8c3a2a828e
Bump minipass-pipeline from 1.2.3 to 1.2.4 ( #14504 )
...
Bumps minipass-pipeline from 1.2.3 to 1.2.4.
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-07 00:39:58 +09:00