diff --git a/.babelrc b/.babelrc index aeb3358..b30bf42 100644 --- a/.babelrc +++ b/.babelrc @@ -5,7 +5,9 @@ }, "modules": "commonjs" }], ["minify", { - "builtIns": false + "builtIns": false, + "keepFnName": true, + "removeDebugger": true }]], "env": { "production": { diff --git a/.env.example b/.env.example index bdf8252..c67ab52 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,6 @@ -API_URL= -WS_URL= +# API URL for REST requests (default: https://api2.2fas.com) +API_URL=https://api2.2fas.com +# Websocket URL (default: wss://ws.2fas.com) +WS_URL=wss://ws.2fas.com +# [ONLY FOR 2FAS TEAM] Key for localise.biz LOCO_KEY= diff --git a/2FAS - Two factor authentication/2FAS - Two Factor Authentication.xcodeproj/project.pbxproj b/2FAS - Two factor authentication/2FAS - Two Factor Authentication.xcodeproj/project.pbxproj index 971557a..f92d139 100644 --- a/2FAS - Two factor authentication/2FAS - Two Factor Authentication.xcodeproj/project.pbxproj +++ b/2FAS - Two factor authentication/2FAS - Two Factor Authentication.xcodeproj/project.pbxproj @@ -431,7 +431,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 54; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ZY8UR5ADFW; ENABLE_HARDENED_RUNTIME = YES; @@ -445,7 +445,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.6.3; + MARKETING_VERSION = 1.6.4; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -467,7 +467,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 54; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ZY8UR5ADFW; ENABLE_HARDENED_RUNTIME = YES; @@ -481,7 +481,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.6.3; + MARKETING_VERSION = 1.6.4; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -505,7 +505,7 @@ CODE_SIGN_ENTITLEMENTS = "macOS (App)/2FAS - Two factor authentication.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 54; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ZY8UR5ADFW; ENABLE_HARDENED_RUNTIME = YES; @@ -520,7 +520,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.6.3; + MARKETING_VERSION = 1.6.4; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -546,7 +546,7 @@ CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 52; + CURRENT_PROJECT_VERSION = 54; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ZY8UR5ADFW; ENABLE_HARDENED_RUNTIME = YES; @@ -561,7 +561,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.6.3; + MARKETING_VERSION = 1.6.4; OTHER_LDFLAGS = ( "-framework", SafariServices, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7525c17..cf608a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,4 +34,28 @@ Please make sure your pull request includes the following: We will review your pull request and provide feedback as soon as possible. Thank you for your contribution! -By sharing ideas and code with the 2FAS community, either through GitHub or Discord, you agree that these contributions become the property of the 2FAS community and may be implemented into the 2FAS open source code. \ No newline at end of file +By sharing ideas and code with the 2FAS community, either through GitHub or Discord, you agree that these contributions become the property of the 2FAS community and may be implemented into the 2FAS open source code. + +## Project setup +### Requirements +Before you start, you should have installed: + - NodeJS (currently used version is always available in `.nvmrc` and `package.json` files). If you have installed `nvm`, you can use `nvm use` command in project directory. + - latest `npm` or `yarn` + +### First build +1. Copy `.env.example` file and save it as `.env` +2. Run `npm install` or `yarn install` +3. Run command for chosen browser (f.e. `npm run chrome-dev` or `yarn chrome-dev` for Chrome browser) + +### Useful scripts +`chrome-dev`, `opera-dev`, `firefox-dev`, `edge-dev`, `safari-dev` - These scripts build extension code for development for chosen browser (without production mode, browserlist-update etc.) + +`chrome-prod`, `opera-prod`, `firefox-prod`, `edge-prod`, `safari-prod` - These scripts build production extension code. + +`chrome-build`, `opera-build`, `firefox-build`, `edge-build` - These scripts build production extension code and creates zip files for it. There is no script for Safari, because Safari version is created by xCode. + +`all-build` - Script that performs build for all browsers (except Safari). + +`firefox-run` - Additional script for `web-ext` tool for Firefox. You can read more about `web-ext` [`here`](https://github.com/mozilla/web-ext). + +Other scripts are only aliases for longer commands. You don't need to know them and you shouldn't run them separately. \ No newline at end of file diff --git a/open-source-licenses.html b/open-source-licenses.html index 752cb3e..d72d130 100644 --- a/open-source-licenses.html +++ b/open-source-licenses.html @@ -1698,3 +1698,103 @@ th, td {
department | related to | name | license period | material / not material | license type | link | remote version | installed version | defined version | author |
---|---|---|---|---|---|---|---|---|---|---|
kessler | stuff | qrcode | perpetual | material | MIT | git://github.com/soldair/node-qrcode.git | 1.5.3 | 1.5.3 | ^1.5.3 | Ryan Day |
kessler | stuff | uuid | perpetual | material | MIT | git+https://github.com/uuidjs/uuid.git | 9.0.1 | 9.0.1 | ^9.0.0 | n/a |
kessler | stuff | @babel/core | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.9 | 7.23.9 | ^7.23.9 | The Babel Team (https://babel.dev/team) |
kessler | stuff | @babel/eslint-parser | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.10 | 7.23.10 | ^7.23.10 | The Babel Team (https://babel.dev/team) |
kessler | stuff | @babel/plugin-transform-runtime | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.9 | 7.23.9 | ^7.23.9 | The Babel Team (https://babel.dev/team) |
kessler | stuff | @babel/preset-env | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.9 | 7.23.9 | ^7.23.9 | The Babel Team (https://babel.dev/team) |
kessler | stuff | @babel/register | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.7 | 7.23.7 | ^7.22.15 | The Babel Team (https://babel.dev/team) |
kessler | stuff | @babel/runtime | perpetual | material | MIT | https://github.com/babel/babel.git | 7.23.9 | 7.23.9 | ^7.23.9 | The Babel Team (https://babel.dev/team) |
kessler | stuff | autoprefixer | perpetual | material | MIT | git+https://github.com/postcss/autoprefixer.git | 10.4.17 | 10.4.17 | ^10.4.17 | Andrey Sitnik |
kessler | stuff | babel-loader | perpetual | material | MIT | https://github.com/babel/babel-loader.git | 9.1.3 | 9.1.3 | ^9.1.3 | Luis Couto |
kessler | stuff | babel-plugin-dynamic-import-node | perpetual | material | MIT | git+https://github.com/airbnb/babel-plugin-dynamic-import-node.git | 2.3.3 | 2.3.3 | ^2.3.3 | Jordan Gensler |
kessler | stuff | babel-plugin-transform-minify-booleans | perpetual | material | MIT | https://github.com/babel/minify/tree/master/packages/babel-plugin-transform-minify-booleans | 6.9.4 | 6.9.4 | ^6.9.4 | amasad |
kessler | stuff | babel-plugin-transform-remove-console | perpetual | material | MIT | https://github.com/babel/minify/tree/master/packages/babel-plugin-transform-remove-console | 6.9.4 | 6.9.4 | ^6.9.4 | amasad |
kessler | stuff | babel-plugin-transform-remove-debugger | perpetual | material | MIT | https://github.com/babel/minify/tree/master/packages/babel-plugin-transform-remove-debugger | 6.9.4 | 6.9.4 | ^6.9.4 | amasad |
kessler | stuff | babel-preset-minify | perpetual | material | MIT | https://github.com/babel/minify/tree/master/packages/babel-preset-minify | 0.5.2 | 0.5.2 | ^0.5.2 | amasad |
kessler | stuff | browserslist | perpetual | material | MIT | git+https://github.com/browserslist/browserslist.git | 4.23.0 | 4.23.0 | ^4.23.0 | Andrey Sitnik |
kessler | stuff | copy-webpack-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/copy-webpack-plugin.git | 12.0.2 | 12.0.2 | ^12.0.2 | Len Boyette |
kessler | stuff | cross-env | perpetual | material | MIT | git+https://github.com/kentcdodds/cross-env.git | 7.0.3 | 7.0.3 | ^7.0.3 | Kent C. Dodds |
kessler | stuff | crypto-browserify | perpetual | material | MIT | git://github.com/crypto-browserify/crypto-browserify.git | 3.12.0 | 3.12.0 | ^3.12.0 | Dominic Tarr |
kessler | stuff | css-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/css-loader.git | 6.10.0 | 6.10.0 | ^6.10.0 | Tobias Koppers @sokra |
kessler | stuff | css-minimizer-webpack-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/css-minimizer-webpack-plugin.git | 6.0.0 | 6.0.0 | ^6.0.0 | Loann Neveu |
kessler | stuff | dotenv | perpetual | material | BSD-2-Clause | git://github.com/motdotla/dotenv.git | 16.4.5 | 16.4.5 | ^16.4.5 | n/a |
kessler | stuff | dotenv-webpack | perpetual | material | MIT | git+https://github.com/mrsteele/dotenv-webpack.git | 8.0.1 | 8.0.1 | ^8.0.1 | Matt Steele |
kessler | stuff | eslint | perpetual | material | MIT | git+https://github.com/eslint/eslint.git | 8.57.0 | 8.57.0 | 8.57.0 | Nicholas C. Zakas |
kessler | stuff | eslint-config-standard | perpetual | material | MIT | git://github.com/standard/eslint-config-standard.git | 17.1.0 | 17.1.0 | ^17.1.0 | Feross Aboukhadijeh feross@feross.org https://feross.org |
kessler | stuff | eslint-friendly-formatter | perpetual | material | MIT | git+https://github.com/royriojas/eslint-friendly-formatter.git | 4.0.1 | 4.0.1 | ^4.0.1 | Roy Riojas http://royriojas.com |
kessler | stuff | eslint-plugin-import | perpetual | material | MIT | git+https://github.com/import-js/eslint-plugin-import.git | 2.29.1 | 2.29.1 | ^2.29.0 | Ben Mosher |
kessler | stuff | eslint-plugin-n | perpetual | material | MIT | git+https://github.com/eslint-community/eslint-plugin-n.git | 16.6.2 | 16.6.2 | ^16.6.2 | Toru Nagashima |
kessler | stuff | eslint-plugin-promise | perpetual | material | ISC | git+https://github.com/eslint-community/eslint-plugin-promise.git | 6.1.1 | 6.1.1 | ^6.1.1 | jden |
kessler | stuff | eslint-plugin-standard | perpetual | material | MIT | git+https://github.com/standard/eslint-plugin-standard.git | 5.0.0 | 5.0.0 | ^5.0.0 | Feross Aboukhadijeh feross@feross.org https://feross.org |
kessler | stuff | eslint-webpack-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/eslint-webpack-plugin.git | 4.0.1 | 4.0.1 | ^4.0.1 | Ricardo Gobbo de Souza |
kessler | stuff | exports-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/exports-loader.git | 5.0.0 | 5.0.0 | ^5.0.0 | Tobias Koppers @sokra |
kessler | stuff | file-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/file-loader.git | 6.2.0 | 6.2.0 | ^6.0.0 | Tobias Koppers @sokra |
kessler | stuff | html-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/html-loader.git | 5.0.0 | 5.0.0 | ^5.0.0 | Tobias Koppers @sokra |
kessler | stuff | html-webpack-plugin | perpetual | material | MIT | git+https://github.com/jantimon/html-webpack-plugin.git | 5.6.0 | 5.6.0 | ^5.5.3 | Jan Nicklas |
kessler | stuff | mini-css-extract-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/mini-css-extract-plugin.git | 2.8.0 | 2.8.0 | ^2.8.0 | Tobias Koppers @sokra |
kessler | stuff | noop-loader | perpetual | material | ISC | git+https://github.com/KnutHelland/noop-loader.git | 1.0.0 | 1.0.0 | ^1.0.0 | Knut Helland |
kessler | stuff | path | perpetual | material | MIT | git://github.com/jinder/path.git | 0.12.7 | 0.12.7 | ^0.12.7 | Joyent http://www.joyent.com |
kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.4.35 | 8.4.35 | ^8.4.35 | Andrey Sitnik |
kessler | stuff | postcss-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/postcss-loader.git | 8.1.0 | 8.1.0 | ^8.1.0 | Andrey Sitnik |
kessler | stuff | postcss-sass | perpetual | material | MIT | git+https://github.com/AleshaOleg/postcss-sass.git | 0.5.0 | 0.5.0 | ^0.5.0 | Oleh Aloshkin |
kessler | stuff | precss | perpetual | material | CC0-1.0 | git+https://github.com/jonathantneal/precss.git | 4.0.0 | 4.0.0 | ^4.0.0 | Jonathan Neal |
kessler | stuff | require-dir | perpetual | material | MIT | git://github.com/aseemk/requireDir.git | 1.2.0 | 1.2.0 | ^1.2.0 | Aseem Kishore |
kessler | stuff | rimraf | perpetual | material | ISC | git://github.com/isaacs/rimraf.git | 5.0.5 | 5.0.5 | ^5.0.1 | Isaac Z. Schlueter (http://blog.izs.me/) |
kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.71.1 | 1.71.1 | ^1.71.1 | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 |
kessler | stuff | sass-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/sass-loader.git | 14.1.1 | 14.1.1 | ^14.1.1 | J. Tangelder |
kessler | stuff | source-map-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/source-map-loader.git | 5.0.0 | 5.0.0 | ^5.0.0 | Tobias Koppers @sokra |
kessler | stuff | stream-browserify | perpetual | material | MIT | git://github.com/browserify/stream-browserify.git | 3.0.0 | 3.0.0 | ^3.0.0 | James Halliday mail@substack.net http://substack.net |
kessler | stuff | streamify | perpetual | material | MIT | git://github.com/fent/node-streamify.git | 1.0.0 | 1.0.0 | ^1.0.0 | fent (https://github.com/fent) |
kessler | stuff | style-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/style-loader.git | 3.3.4 | 3.3.4 | ^3.3.4 | Tobias Koppers @sokra |
kessler | stuff | stylelint | perpetual | material | MIT | git+https://github.com/stylelint/stylelint.git | 15.11.0 | 15.11.0 | ^15.10.3 | stylelint |
kessler | stuff | stylelint-config-recommended-scss | perpetual | material | MIT | git+https://github.com/stylelint-scss/stylelint-config-recommended-scss.git | 13.1.0 | 13.1.0 | ^13.1.0 | kristerkari |
kessler | stuff | stylelint-webpack-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/stylelint-webpack-plugin.git | 4.1.1 | 4.1.1 | ^4.1.1 | Ricardo Gobbo de Souza |
kessler | stuff | svg-inline-loader | perpetual | material | MIT | git+ssh://git@github.com/sairion/svg-inline-loader.git | 0.8.2 | 0.8.2 | ^0.8.2 | Jaeho Lee |
kessler | stuff | terser-webpack-plugin | perpetual | material | MIT | git+https://github.com/webpack-contrib/terser-webpack-plugin.git | 5.3.10 | 5.3.10 | ^5.3.9 | webpack Contrib Team |
kessler | stuff | url-loader | perpetual | material | MIT | git+https://github.com/webpack-contrib/url-loader.git | 4.1.1 | 4.1.1 | ^4.1.0 | Tobias Koppers @sokra |
kessler | stuff | webextension-polyfill | perpetual | material | MPL-2.0 | git+https://github.com/mozilla/webextension-polyfill.git | 0.10.0 | 0.10.0 | ^0.10.0 | Mozilla |
kessler | stuff | webpack | perpetual | material | MIT | git+https://github.com/webpack/webpack.git | 5.90.3 | 5.90.3 | ^5.90.3 | Tobias Koppers @sokra |
kessler | stuff | webpack-cli | perpetual | material | MIT | git+https://github.com/webpack/webpack-cli.git | 5.1.4 | 5.1.4 | ^5.1.4 | n/a |
kessler | stuff | webpack-node-externals | perpetual | material | MIT | git+https://github.com/liady/webpack-node-externals.git | 3.0.0 | 3.0.0 | ^3.0.0 | Liad Yosef https://github.com/liady |
kessler | stuff | ws | perpetual | material | MIT | git+https://github.com/websockets/ws.git | 8.16.0 | 8.16.0 | ^8.14.1 | Einar Otto Stangvik |