From b12d0387f6e1a6df89d842010dee90c6c8e031ca Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 7 Jun 2021 20:13:58 +0200 Subject: [PATCH] Add jslib as a "real" dependency (#951) * Add jslib as a dependency * Cleanup tsconfig, webpack, add jslib-angular to package.json * Update all import paths * Add back @types/node. * Lint * Remove dummy module * Remove merge conflict * Group imports * Bump jslib --- jslib | 2 +- package-lock.json | 475 +++++++++++------- package.json | 32 +- .../accounts/accept-emergency.component.ts | 10 +- .../accounts/accept-organization.component.ts | 21 +- src/app/accounts/hint.component.ts | 8 +- src/app/accounts/lock.component.ts | 22 +- src/app/accounts/login.component.ts | 24 +- src/app/accounts/recover-delete.component.ts | 6 +- .../accounts/recover-two-factor.component.ts | 10 +- src/app/accounts/register.component.ts | 26 +- src/app/accounts/set-password.component.ts | 20 +- src/app/accounts/sso.component.ts | 18 +- .../accounts/two-factor-options.component.ts | 8 +- src/app/accounts/two-factor.component.ts | 18 +- .../accounts/verify-email-token.component.ts | 8 +- .../verify-recover-delete.component.ts | 6 +- src/app/app-routing.module.ts | 8 +- src/app/app.component.ts | 42 +- src/app/app.module.ts | 34 +- src/app/components/avatar.component.ts | 6 +- .../components/password-strength.component.ts | 2 +- src/app/layouts/footer.component.ts | 2 +- src/app/layouts/frontend-layout.component.ts | 2 +- src/app/layouts/navbar.component.ts | 6 +- .../layouts/organization-layout.component.ts | 12 +- src/app/modal.component.ts | 6 +- .../manage/bulk-status.component.ts | 2 +- .../manage/collection-add-edit.component.ts | 22 +- .../manage/collections.component.ts | 22 +- .../manage/entity-events.component.ts | 8 +- .../manage/entity-users.component.ts | 14 +- .../organizations/manage/events.component.ts | 18 +- .../manage/group-add-edit.component.ts | 20 +- .../organizations/manage/groups.component.ts | 14 +- .../organizations/manage/manage.component.ts | 4 +- .../organizations/manage/people.component.ts | 44 +- .../manage/policies.component.ts | 14 +- .../manage/policy-edit.component.ts | 10 +- .../manage/reset-password.component.ts | 20 +- .../manage/user-add-edit.component.ts | 26 +- .../manage/user-confirm.component.ts | 7 +- .../manage/user-groups.component.ts | 10 +- .../settings/account.component.ts | 16 +- .../settings/adjust-seats.component.ts | 6 +- .../settings/change-plan.component.ts | 8 +- .../settings/delete-organization.component.ts | 8 +- .../settings/download-license.component.ts | 4 +- .../organization-billing.component.ts | 6 +- .../organization-subscription.component.ts | 12 +- .../settings/settings.component.ts | 4 +- .../settings/two-factor-setup.component.ts | 10 +- .../organizations/tools/export.component.ts | 12 +- .../exposed-passwords-report.component.ts | 12 +- .../organizations/tools/import.component.ts | 8 +- .../inactive-two-factor-report.component.ts | 8 +- .../reused-passwords-report.component.ts | 10 +- .../organizations/tools/tools.component.ts | 6 +- .../unsecured-websites-report.component.ts | 8 +- .../tools/weak-passwords-report.component.ts | 12 +- .../organizations/vault/add-edit.component.ts | 38 +- .../vault/attachments.component.ts | 20 +- .../organizations/vault/ciphers.component.ts | 22 +- .../vault/collections.component.ts | 18 +- .../vault/groupings.component.ts | 22 +- .../organizations/vault/vault.component.ts | 18 +- src/app/send/access.component.ts | 26 +- src/app/send/add-edit.component.ts | 16 +- src/app/send/send.component.ts | 20 +- src/app/services/event.service.ts | 13 +- .../services/organization-guard.service.ts | 4 +- .../organization-type-guard.service.ts | 4 +- src/app/services/router.service.ts | 2 +- src/app/services/services.module.ts | 130 ++--- src/app/settings/account.component.ts | 4 +- src/app/settings/add-credit.component.ts | 10 +- src/app/settings/adjust-payment.component.ts | 8 +- src/app/settings/adjust-storage.component.ts | 8 +- src/app/settings/api-key.component.ts | 8 +- src/app/settings/change-email.component.ts | 14 +- src/app/settings/change-kdf.component.ts | 14 +- src/app/settings/change-password.component.ts | 44 +- .../settings/create-organization.component.ts | 4 +- .../deauthorize-sessions.component.ts | 10 +- src/app/settings/delete-account.component.ts | 10 +- src/app/settings/domain-rules.component.ts | 6 +- .../emergency-access-add-edit.component.ts | 10 +- .../emergency-access-attachments.component.ts | 16 +- .../emergency-access-confirm.component.ts | 10 +- .../emergency-access-takeover.component.ts | 33 +- .../emergency-access-view.component.ts | 14 +- .../settings/emergency-access.component.ts | 26 +- .../settings/emergency-add-edit.component.ts | 28 +- src/app/settings/link-sso.component.ts | 20 +- src/app/settings/options.component.ts | 16 +- .../settings/organization-plans.component.ts | 34 +- src/app/settings/organizations.component.ts | 24 +- src/app/settings/payment.component.ts | 6 +- src/app/settings/premium.component.ts | 14 +- src/app/settings/profile.component.ts | 12 +- src/app/settings/purge-vault.component.ts | 8 +- src/app/settings/settings.component.ts | 6 +- src/app/settings/tax-info.component.ts | 8 +- .../two-factor-authenticator.component.ts | 14 +- src/app/settings/two-factor-base.component.ts | 10 +- src/app/settings/two-factor-duo.component.ts | 12 +- .../settings/two-factor-email.component.ts | 16 +- .../settings/two-factor-recovery.component.ts | 6 +- .../settings/two-factor-setup.component.ts | 14 +- .../settings/two-factor-verify.component.ts | 10 +- .../settings/two-factor-webauthn.component.ts | 16 +- .../settings/two-factor-yubikey.component.ts | 12 +- src/app/settings/update-key.component.ts | 22 +- src/app/settings/update-license.component.ts | 4 +- src/app/settings/user-billing.component.ts | 14 +- .../settings/user-subscription.component.ts | 10 +- src/app/settings/verify-email.component.ts | 4 +- src/app/tools/breach-report.component.ts | 6 +- src/app/tools/cipher-report.component.ts | 8 +- src/app/tools/export.component.ts | 12 +- .../exposed-passwords-report.component.ts | 12 +- src/app/tools/import.component.ts | 6 +- .../inactive-two-factor-report.component.ts | 12 +- .../password-generator-history.component.ts | 8 +- src/app/tools/password-generator.component.ts | 8 +- .../reused-passwords-report.component.ts | 10 +- src/app/tools/tools.component.ts | 4 +- .../unsecured-websites-report.component.ts | 10 +- .../tools/weak-passwords-report.component.ts | 12 +- src/app/vault/add-edit.component.ts | 34 +- src/app/vault/attachments.component.ts | 16 +- src/app/vault/bulk-actions.component.ts | 8 +- src/app/vault/bulk-delete.component.ts | 10 +- src/app/vault/bulk-move.component.ts | 8 +- src/app/vault/bulk-restore.component.ts | 4 +- src/app/vault/bulk-share.component.ts | 14 +- src/app/vault/ciphers.component.ts | 26 +- src/app/vault/collections.component.ts | 12 +- src/app/vault/folder-add-edit.component.ts | 8 +- src/app/vault/groupings.component.ts | 10 +- src/app/vault/share.component.ts | 14 +- src/app/vault/vault.component.ts | 20 +- src/services/broadcasterMessaging.service.ts | 4 +- src/services/htmlStorage.service.ts | 6 +- src/services/i18n.service.ts | 2 +- src/services/memoryStorage.service.ts | 2 +- src/services/webPlatformUtils.service.ts | 10 +- tsconfig.json | 15 +- webpack.config.js | 4 - 149 files changed, 1303 insertions(+), 1213 deletions(-) diff --git a/jslib b/jslib index ca61e13b57..1016bbfb9e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit ca61e13b57e32f1b4526c415573a03444247123a +Subproject commit 1016bbfb9eb28c220de8d2ab86d1f2757328f254 diff --git a/package-lock.json b/package-lock.json index 7caac9081c..f21d2cb0fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,28 +1,18 @@ { "name": "bitwarden-web", - "version": "2.20.3", + "version": "2.20.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bitwarden-web", - "version": "2.20.3", + "version": "2.20.4", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { - "@angular/animations": "^11.2.11", - "@angular/cdk": "^11.2.10", - "@angular/common": "^11.2.11", - "@angular/compiler": "^11.2.11", - "@angular/core": "^11.2.11", - "@angular/forms": "^11.2.11", - "@angular/platform-browser": "^11.2.11", - "@angular/platform-browser-dynamic": "^11.2.11", - "@angular/router": "^11.2.11", - "@microsoft/signalr": "3.1.13", - "@microsoft/signalr-protocol-msgpack": "3.1.13", + "@bitwarden/jslib-angular": "file:jslib/angular", + "@bitwarden/jslib-common": "file:jslib/common", "angular2-toaster": "11.0.1", - "big-integer": "1.6.48", "bootstrap": "4.6.0", "braintree-web-drop-in": "1.28.0", "browser-hrtime": "^1.1.8", @@ -31,32 +21,20 @@ "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#5f9a1a8598d2cda494c4f5ee0e38b31474abfee9", "font-awesome": "4.7.0", "jquery": "3.6.0", - "lunr": "2.3.9", - "ngx-infinite-scroll": "10.0.1", - "node-forge": "0.10.0", - "papaparse": "5.3.0", "popper.js": "1.16.1", "qrious": "4.0.2", - "rxjs": "^6.6.7", "sweetalert2": "^10.16.6", - "tslib": "^2.2.0", "webcrypto-shim": "0.1.7", - "whatwg-fetch": "3.6.2", - "zone.js": "0.11.4", - "zxcvbn": "4.4.2" + "whatwg-fetch": "3.6.2" }, "devDependencies": { "@angular/compiler-cli": "^11.2.11", "@ngtools/webpack": "^11.2.10", "@types/duo_web_sdk": "^2.7.0", "@types/jquery": "^3.5.5", - "@types/lunr": "^2.3.3", - "@types/node": "^14.14.43", - "@types/node-forge": "^0.9.7", - "@types/papaparse": "^5.2.5", + "@types/node": "^14.17.2", "@types/webcrypto": "^0.0.28", "@types/webpack": "^4.4.27", - "@types/zxcvbn": "^4.4.1", "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^6.4.0", "cross-env": "^7.0.3", @@ -87,6 +65,56 @@ "npm": "~7" } }, + "jslib/angular": { + "name": "@bitwarden/jslib-common", + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@angular/animations": "^11.2.11", + "@angular/cdk": "^11.2.10", + "@angular/common": "^11.2.11", + "@angular/compiler": "^11.2.11", + "@angular/core": "^11.2.11", + "@angular/forms": "^11.2.11", + "@angular/platform-browser": "^11.2.11", + "@angular/platform-browser-dynamic": "^11.2.11", + "@angular/router": "^11.2.11", + "@bitwarden/jslib-common": "file:../common", + "ngx-infinite-scroll": "10.0.1", + "rxjs": "6.6.7", + "tldjs": "^2.3.1", + "zone.js": "0.11.4" + }, + "devDependencies": { + "rimraf": "^3.0.2", + "typescript": "4.1.5" + } + }, + "jslib/common": { + "version": "0.0.0", + "license": "GPL-3.0", + "dependencies": { + "@microsoft/signalr": "3.1.13", + "@microsoft/signalr-protocol-msgpack": "3.1.13", + "big-integer": "1.6.48", + "browser-hrtime": "^1.1.8", + "lunr": "^2.3.9", + "node-forge": "^0.10.0", + "papaparse": "^5.3.0", + "tldjs": "^2.3.1", + "zxcvbn": "^4.4.2" + }, + "devDependencies": { + "@types/lunr": "^2.3.3", + "@types/node": "^14.17.1", + "@types/node-forge": "^0.9.7", + "@types/papaparse": "^5.2.5", + "@types/tldjs": "^2.3.0", + "@types/zxcvbn": "^4.4.1", + "rimraf": "^3.0.2", + "typescript": "4.1.5" + } + }, "node_modules/@angular-devkit/core": { "version": "11.2.13", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.13.tgz", @@ -296,9 +324,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz", + "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==", "dev": true }, "node_modules/@babel/core": { @@ -361,14 +389,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz", + "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.13.15", + "@babel/compat-data": "^7.14.4", "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", + "browserslist": "^4.16.6", "semver": "^6.3.0" }, "peerDependencies": { @@ -439,15 +467,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz", - "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz", + "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==", "dev": true, "dependencies": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2" + "@babel/types": "^7.14.4" } }, "node_modules/@babel/helper-simple-access": { @@ -503,9 +531,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz", - "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -542,15 +570,23 @@ } }, "node_modules/@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.14.0", "to-fast-properties": "^2.0.0" } }, + "node_modules/@bitwarden/jslib-angular": { + "resolved": "jslib/angular", + "link": true + }, + "node_modules/@bitwarden/jslib-common": { + "resolved": "jslib/common", + "link": true + }, "node_modules/@braintree/asset-loader": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-0.4.4.tgz", @@ -752,9 +788,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.17.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", - "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", + "version": "14.17.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz", + "integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==", "dev": true }, "node_modules/@types/node-forge": { @@ -793,6 +829,12 @@ "integrity": "sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==", "dev": true }, + "node_modules/@types/tldjs": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@types/tldjs/-/tldjs-2.3.0.tgz", + "integrity": "sha512-+gqspH/N6YjpApp96/XzM2AZK4R0Bk2qb4e5o16indSvgblfFaAIxNV8BdJmbqfSAYUyZubLzvrmpvdVEmBq3A==", + "dev": true + }, "node_modules/@types/uglify-js": { "version": "3.13.0", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz", @@ -1780,15 +1822,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, "node_modules/bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -2165,9 +2198,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001230", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", - "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==", + "version": "1.0.30001233", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001233.tgz", + "integrity": "sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==", "dev": true, "funding": { "type": "opencollective", @@ -2884,9 +2917,9 @@ } }, "node_modules/core-js": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz", - "integrity": "sha512-iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz", + "integrity": "sha512-JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -3691,9 +3724,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.3.739", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz", - "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==", + "version": "1.3.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.744.tgz", + "integrity": "sha512-o/vep/PvSXg+7buwCbVJXHY3zbjYVmFPwnMMnchESXgAzrfcasvbX/hQZHCFGG7YdZgdtwt1KTMyK9CyBxPbLA==", "dev": true }, "node_modules/elliptic": { @@ -3821,9 +3854,9 @@ } }, "node_modules/es-abstract": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.2.tgz", - "integrity": "sha512-byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw==", + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", + "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", @@ -4037,9 +4070,9 @@ } }, "node_modules/execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz", + "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -4261,15 +4294,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "node_modules/express/node_modules/qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, "node_modules/ext": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", @@ -4854,9 +4878,9 @@ } }, "node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, "engines": { "node": ">= 0.6" @@ -7824,19 +7848,19 @@ } }, "node_modules/mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", "dependencies": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" }, "engines": { "node": ">= 0.6" @@ -8793,9 +8817,9 @@ "dev": true }, "node_modules/papaparse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.0.tgz", - "integrity": "sha512-Lb7jN/4bTpiuGPrYy4tkKoUS8sTki8zacB5ke1p5zolhcSE4TlWgrlsxjrDTbG/dFVh07ck7X36hUf/b5V68pg==" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.1.tgz", + "integrity": "sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA==" }, "node_modules/parallel-transform": { "version": "1.2.0", @@ -9275,12 +9299,12 @@ "integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==" }, "node_modules/proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "dependencies": { - "forwarded": "~0.1.2", + "forwarded": "0.2.0", "ipaddr.js": "1.9.1" }, "engines": { @@ -9353,9 +9377,10 @@ "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==" }, "node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true, "engines": { "node": ">=0.6" } @@ -9848,6 +9873,14 @@ "node": ">= 6" } }, + "node_modules/request/node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -10063,9 +10096,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/sass": { - "version": "1.34.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz", - "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==", + "version": "1.34.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz", + "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0" @@ -11408,6 +11441,23 @@ "node": ">=0.6.0" } }, + "node_modules/tldjs": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz", + "integrity": "sha512-W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw==", + "hasInstallScript": true, + "dependencies": { + "punycode": "^1.4.1" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/tldjs/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, "node_modules/to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", @@ -12170,6 +12220,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", "bin": { "uuid": "bin/uuid" } @@ -14133,9 +14184,9 @@ "dev": true }, "node_modules/ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "dependencies": { "async-limiter": "~1.0.0" } @@ -14360,9 +14411,9 @@ } }, "@babel/compat-data": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz", - "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz", + "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==", "dev": true }, "@babel/core": { @@ -14416,14 +14467,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.13.16", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz", - "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz", + "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==", "dev": true, "requires": { - "@babel/compat-data": "^7.13.15", + "@babel/compat-data": "^7.14.4", "@babel/helper-validator-option": "^7.12.17", - "browserslist": "^4.14.5", + "browserslist": "^4.16.6", "semver": "^6.3.0" } }, @@ -14491,15 +14542,15 @@ } }, "@babel/helper-replace-supers": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz", - "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz", + "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.13.12", "@babel/helper-optimise-call-expression": "^7.12.13", "@babel/traverse": "^7.14.2", - "@babel/types": "^7.14.2" + "@babel/types": "^7.14.4" } }, "@babel/helper-simple-access": { @@ -14555,9 +14606,9 @@ } }, "@babel/parser": { - "version": "7.14.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz", - "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==", "dev": true }, "@babel/template": { @@ -14588,15 +14639,58 @@ } }, "@babel/types": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.2.tgz", - "integrity": "sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.0", "to-fast-properties": "^2.0.0" } }, + "@bitwarden/jslib-angular": { + "version": "file:jslib/angular", + "requires": { + "@angular/animations": "^11.2.11", + "@angular/cdk": "^11.2.10", + "@angular/common": "^11.2.11", + "@angular/compiler": "^11.2.11", + "@angular/core": "^11.2.11", + "@angular/forms": "^11.2.11", + "@angular/platform-browser": "^11.2.11", + "@angular/platform-browser-dynamic": "^11.2.11", + "@angular/router": "^11.2.11", + "@bitwarden/jslib-common": "file:../common", + "ngx-infinite-scroll": "10.0.1", + "rimraf": "^3.0.2", + "rxjs": "6.6.7", + "tldjs": "^2.3.1", + "typescript": "4.1.5", + "zone.js": "0.11.4" + } + }, + "@bitwarden/jslib-common": { + "version": "file:jslib/common", + "requires": { + "@microsoft/signalr": "3.1.13", + "@microsoft/signalr-protocol-msgpack": "3.1.13", + "@types/lunr": "^2.3.3", + "@types/node": "^14.17.1", + "@types/node-forge": "^0.9.7", + "@types/papaparse": "^5.2.5", + "@types/tldjs": "^2.3.0", + "@types/zxcvbn": "^4.4.1", + "big-integer": "1.6.48", + "browser-hrtime": "^1.1.8", + "lunr": "^2.3.9", + "node-forge": "^0.10.0", + "papaparse": "^5.3.0", + "rimraf": "^3.0.2", + "tldjs": "^2.3.1", + "typescript": "4.1.5", + "zxcvbn": "^4.4.2" + } + }, "@braintree/asset-loader": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/@braintree/asset-loader/-/asset-loader-0.4.4.tgz", @@ -14772,9 +14866,9 @@ "dev": true }, "@types/node": { - "version": "14.17.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz", - "integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==", + "version": "14.17.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz", + "integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==", "dev": true }, "@types/node-forge": { @@ -14813,6 +14907,12 @@ "integrity": "sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==", "dev": true }, + "@types/tldjs": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@types/tldjs/-/tldjs-2.3.0.tgz", + "integrity": "sha512-+gqspH/N6YjpApp96/XzM2AZK4R0Bk2qb4e5o16indSvgblfFaAIxNV8BdJmbqfSAYUyZubLzvrmpvdVEmBq3A==", + "dev": true + }, "@types/uglify-js": { "version": "3.13.0", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz", @@ -15638,12 +15738,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true } } }, @@ -15967,9 +16061,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001230", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", - "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==", + "version": "1.0.30001233", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001233.tgz", + "integrity": "sha512-BmkbxLfStqiPA7IEzQpIk0UFZFf3A4E6fzjPJ6OR+bFC2L8ES9J8zGA/asoi47p8XDVkev+WJo2I2Nc8c/34Yg==", "dev": true }, "canonical-path": { @@ -16561,9 +16655,9 @@ } }, "core-js": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz", - "integrity": "sha512-iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog==" + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz", + "integrity": "sha512-JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ==" }, "core-util-is": { "version": "1.0.2", @@ -17211,9 +17305,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.739", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz", - "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==", + "version": "1.3.744", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.744.tgz", + "integrity": "sha512-o/vep/PvSXg+7buwCbVJXHY3zbjYVmFPwnMMnchESXgAzrfcasvbX/hQZHCFGG7YdZgdtwt1KTMyK9CyBxPbLA==", "dev": true }, "elliptic": { @@ -17321,9 +17415,9 @@ } }, "es-abstract": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.2.tgz", - "integrity": "sha512-byRiNIQXE6HWNySaU6JohoNXzYgbBjztwFnBLUTiJmWXjaU9bSq3urQLUlNLQ292tc+gc07zYZXNZjaOoAX3sw==", + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz", + "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -17493,9 +17587,9 @@ } }, "execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz", + "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==", "dev": true, "requires": { "cross-spawn": "^7.0.3", @@ -17683,12 +17777,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true } } }, @@ -18160,9 +18248,9 @@ } }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true }, "fragment-cache": { @@ -20522,16 +20610,16 @@ "dev": true }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==" + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==" }, "mime-types": { - "version": "2.1.30", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz", - "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==", + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", "requires": { - "mime-db": "1.47.0" + "mime-db": "1.48.0" } }, "mimic-fn": { @@ -21294,9 +21382,9 @@ "dev": true }, "papaparse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.0.tgz", - "integrity": "sha512-Lb7jN/4bTpiuGPrYy4tkKoUS8sTki8zacB5ke1p5zolhcSE4TlWgrlsxjrDTbG/dFVh07ck7X36hUf/b5V68pg==" + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.3.1.tgz", + "integrity": "sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA==" }, "parallel-transform": { "version": "1.2.0", @@ -21665,12 +21753,12 @@ "integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g==" }, "proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, @@ -21739,9 +21827,10 @@ "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==" }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true }, "query-string": { "version": "4.3.4", @@ -22139,6 +22228,13 @@ "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + } } }, "require-directory": { @@ -22306,9 +22402,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.34.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz", - "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==", + "version": "1.34.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz", + "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0" @@ -23412,6 +23508,21 @@ "setimmediate": "^1.0.4" } }, + "tldjs": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz", + "integrity": "sha512-W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw==", + "requires": { + "punycode": "^1.4.1" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + } + } + }, "to-absolute-glob": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", @@ -25610,9 +25721,9 @@ "dev": true }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", "requires": { "async-limiter": "~1.0.0" } diff --git a/package.json b/package.json index 62c47b5cc3..e3e2e68d7a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "sub:init": "git submodule update --init --recursive", "sub:update": "git submodule update --remote", "sub:pull": "git submodule foreach git pull origin master", - "postinstall": "npm run sub:init", + "preinstall": "npm run sub:init", "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:mac": "npm run symlink:lin", "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", @@ -36,13 +36,9 @@ "@ngtools/webpack": "^11.2.10", "@types/duo_web_sdk": "^2.7.0", "@types/jquery": "^3.5.5", - "@types/lunr": "^2.3.3", - "@types/node": "^14.14.43", - "@types/node-forge": "^0.9.7", - "@types/papaparse": "^5.2.5", + "@types/node": "^14.17.2", "@types/webcrypto": "^0.0.28", "@types/webpack": "^4.4.27", - "@types/zxcvbn": "^4.4.1", "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^6.4.0", "cross-env": "^7.0.3", @@ -69,19 +65,9 @@ "webpack-dev-server": "^3.11.2" }, "dependencies": { - "@angular/animations": "^11.2.11", - "@angular/cdk": "^11.2.10", - "@angular/common": "^11.2.11", - "@angular/compiler": "^11.2.11", - "@angular/core": "^11.2.11", - "@angular/forms": "^11.2.11", - "@angular/platform-browser": "^11.2.11", - "@angular/platform-browser-dynamic": "^11.2.11", - "@angular/router": "^11.2.11", - "@microsoft/signalr": "3.1.13", - "@microsoft/signalr-protocol-msgpack": "3.1.13", + "@bitwarden/jslib-angular": "file:jslib/angular", + "@bitwarden/jslib-common": "file:jslib/common", "angular2-toaster": "11.0.1", - "big-integer": "1.6.48", "bootstrap": "4.6.0", "braintree-web-drop-in": "1.28.0", "browser-hrtime": "^1.1.8", @@ -90,19 +76,11 @@ "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#5f9a1a8598d2cda494c4f5ee0e38b31474abfee9", "font-awesome": "4.7.0", "jquery": "3.6.0", - "lunr": "2.3.9", - "ngx-infinite-scroll": "10.0.1", - "node-forge": "0.10.0", - "papaparse": "5.3.0", "popper.js": "1.16.1", "qrious": "4.0.2", - "rxjs": "^6.6.7", "sweetalert2": "^10.16.6", - "tslib": "^2.2.0", "webcrypto-shim": "0.1.7", - "whatwg-fetch": "3.6.2", - "zone.js": "0.11.4", - "zxcvbn": "4.4.2" + "whatwg-fetch": "3.6.2" }, "engines": { "node": "~14", diff --git a/src/app/accounts/accept-emergency.component.ts b/src/app/accounts/accept-emergency.component.ts index 5f585079e8..d2d24e0985 100644 --- a/src/app/accounts/accept-emergency.component.ts +++ b/src/app/accounts/accept-emergency.component.ts @@ -12,11 +12,11 @@ import { ToasterService, } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { EmergencyAccessAcceptRequest } from 'jslib/models/request/emergencyAccessAcceptRequest'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { EmergencyAccessAcceptRequest } from 'jslib-common/models/request/emergencyAccessAcceptRequest'; @Component({ selector: 'app-accept-emergency', diff --git a/src/app/accounts/accept-organization.component.ts b/src/app/accounts/accept-organization.component.ts index f96cc63eb1..6bd386fe04 100644 --- a/src/app/accounts/accept-organization.component.ts +++ b/src/app/accounts/accept-organization.component.ts @@ -13,19 +13,18 @@ import { ToasterService, } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Utils } from 'jslib/misc/utils'; +import { OrganizationUserAcceptRequest } from 'jslib-common/models/request/organizationUserAcceptRequest'; +import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest'; -import { Policy } from 'jslib/models/domain/policy'; - -import { OrganizationUserAcceptRequest } from 'jslib/models/request/organizationUserAcceptRequest'; -import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib/models/request/organizationUserResetPasswordEnrollmentRequest'; +import { Utils } from 'jslib-common/misc/utils'; +import { Policy } from 'jslib-common/models/domain/policy'; @Component({ selector: 'app-accept-organization', diff --git a/src/app/accounts/hint.component.ts b/src/app/accounts/hint.component.ts index 507248fbaa..e65f9f5d73 100644 --- a/src/app/accounts/hint.component.ts +++ b/src/app/accounts/hint.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { HintComponent as BaseHintComponent } from 'jslib/angular/components/hint.component'; +import { HintComponent as BaseHintComponent } from 'jslib-angular/components/hint.component'; @Component({ selector: 'app-hint', diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts index ffafceb0fa..8145079c53 100644 --- a/src/app/accounts/lock.component.ts +++ b/src/app/accounts/lock.component.ts @@ -1,20 +1,20 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; import { RouterService } from '../services/router.service'; -import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component'; +import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component'; @Component({ selector: 'app-lock', diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts index 6d76fbf272..d705f097c7 100644 --- a/src/app/accounts/login.component.ts +++ b/src/app/accounts/login.component.ts @@ -4,20 +4,20 @@ import { Router, } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component'; +import { LoginComponent as BaseLoginComponent } from 'jslib-angular/components/login.component'; -import { Policy } from 'jslib/models/domain/policy'; +import { Policy } from 'jslib-common/models/domain/policy'; @Component({ selector: 'app-login', diff --git a/src/app/accounts/recover-delete.component.ts b/src/app/accounts/recover-delete.component.ts index a9835b09aa..1024e3fe17 100644 --- a/src/app/accounts/recover-delete.component.ts +++ b/src/app/accounts/recover-delete.component.ts @@ -3,10 +3,10 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { DeleteRecoverRequest } from 'jslib/models/request/deleteRecoverRequest'; +import { DeleteRecoverRequest } from 'jslib-common/models/request/deleteRecoverRequest'; @Component({ selector: 'app-recover-delete', diff --git a/src/app/accounts/recover-two-factor.component.ts b/src/app/accounts/recover-two-factor.component.ts index 400e3d1c73..21dc71252b 100644 --- a/src/app/accounts/recover-two-factor.component.ts +++ b/src/app/accounts/recover-two-factor.component.ts @@ -3,12 +3,12 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { TwoFactorRecoveryRequest } from 'jslib/models/request/twoFactorRecoveryRequest'; +import { TwoFactorRecoveryRequest } from 'jslib-common/models/request/twoFactorRecoveryRequest'; @Component({ selector: 'app-recover-two-factor', diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts index e1c0213dc5..499572fa84 100644 --- a/src/app/accounts/register.component.ts +++ b/src/app/accounts/register.component.ts @@ -4,22 +4,22 @@ import { Router, } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; -import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component'; +import { RegisterComponent as BaseRegisterComponent } from 'jslib-angular/components/register.component'; -import { MasterPasswordPolicyOptions } from 'jslib/models/domain/masterPasswordPolicyOptions'; -import { Policy } from 'jslib/models/domain/policy'; +import { MasterPasswordPolicyOptions } from 'jslib-common/models/domain/masterPasswordPolicyOptions'; +import { Policy } from 'jslib-common/models/domain/policy'; -import { PolicyData } from 'jslib/models/data/policyData'; -import { ReferenceEventRequest } from 'jslib/models/request/referenceEventRequest'; +import { PolicyData } from 'jslib-common/models/data/policyData'; +import { ReferenceEventRequest } from 'jslib-common/models/request/referenceEventRequest'; @Component({ selector: 'app-register', diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts index e7f84cd444..395432136d 100644 --- a/src/app/accounts/set-password.component.ts +++ b/src/app/accounts/set-password.component.ts @@ -4,19 +4,19 @@ import { Router, } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { SetPasswordComponent as BaseSetPasswordComponent, -} from 'jslib/angular/components/set-password.component'; +} from 'jslib-angular/components/set-password.component'; @Component({ selector: 'app-set-password', diff --git a/src/app/accounts/sso.component.ts b/src/app/accounts/sso.component.ts index 220df6bf96..0e5df65be0 100644 --- a/src/app/accounts/sso.component.ts +++ b/src/app/accounts/sso.component.ts @@ -4,16 +4,16 @@ import { Router, } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { SsoComponent as BaseSsoComponent } from 'jslib/angular/components/sso.component'; +import { SsoComponent as BaseSsoComponent } from 'jslib-angular/components/sso.component'; const IdentifierStorageKey = 'ssoOrgIdentifier'; diff --git a/src/app/accounts/two-factor-options.component.ts b/src/app/accounts/two-factor-options.component.ts index 6db002adc2..125ea4d96b 100644 --- a/src/app/accounts/two-factor-options.component.ts +++ b/src/app/accounts/two-factor-options.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent, -} from 'jslib/angular/components/two-factor-options.component'; +} from 'jslib-angular/components/two-factor-options.component'; @Component({ selector: 'app-two-factor-options', diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts index 9c7ca46f57..270ad631cb 100644 --- a/src/app/accounts/two-factor.component.ts +++ b/src/app/accounts/two-factor.component.ts @@ -14,17 +14,17 @@ import { TwoFactorOptionsComponent } from './two-factor-options.component'; import { ModalComponent } from '../modal.component'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component'; +import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib-angular/components/two-factor.component'; @Component({ selector: 'app-two-factor', diff --git a/src/app/accounts/verify-email-token.component.ts b/src/app/accounts/verify-email-token.component.ts index 6b4e689fe3..051d3036da 100644 --- a/src/app/accounts/verify-email-token.component.ts +++ b/src/app/accounts/verify-email-token.component.ts @@ -9,11 +9,11 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { VerifyEmailRequest } from 'jslib/models/request/verifyEmailRequest'; +import { VerifyEmailRequest } from 'jslib-common/models/request/verifyEmailRequest'; @Component({ selector: 'app-verify-email-token', diff --git a/src/app/accounts/verify-recover-delete.component.ts b/src/app/accounts/verify-recover-delete.component.ts index 114701c1d4..7a30516bac 100644 --- a/src/app/accounts/verify-recover-delete.component.ts +++ b/src/app/accounts/verify-recover-delete.component.ts @@ -9,10 +9,10 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { VerifyDeleteRecoverRequest } from 'jslib/models/request/verifyDeleteRecoverRequest'; +import { VerifyDeleteRecoverRequest } from 'jslib-common/models/request/verifyDeleteRecoverRequest'; @Component({ selector: 'app-verify-recover-delete', diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a7f4f7390b..bee8416fc1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -88,11 +88,11 @@ import { VaultComponent } from './vault/vault.component'; import { OrganizationGuardService } from './services/organization-guard.service'; import { OrganizationTypeGuardService } from './services/organization-type-guard.service'; -import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; -import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; -import { UnauthGuardService } from 'jslib/angular/services/unauth-guard.service'; +import { AuthGuardService } from 'jslib-angular/services/auth-guard.service'; +import { LockGuardService } from 'jslib-angular/services/lock-guard.service'; +import { UnauthGuardService } from 'jslib-angular/services/unauth-guard.service'; -import { Permissions } from 'jslib/enums/permissions'; +import { Permissions } from 'jslib-common/enums/permissions'; import { EmergencyAccessViewComponent } from './settings/emergency-access-view.component'; import { EmergencyAccessComponent } from './settings/emergency-access.component'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3fb1700e63..2922cf0957 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,30 +21,30 @@ import { Router, } from '@angular/router'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { NotificationsService } from 'jslib/abstractions/notifications.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { SettingsService } from 'jslib/abstractions/settings.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { TokenService } from 'jslib/abstractions/token.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { NotificationsService } from 'jslib-common/abstractions/notifications.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { SettingsService } from 'jslib-common/abstractions/settings.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; import { RouterService } from './services/router.service'; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9d98af15e5..75dce49c52 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -169,25 +169,25 @@ import { SendInfoComponent } from './vault/send-info.component'; import { ShareComponent } from './vault/share.component'; import { VaultComponent } from './vault/vault.component'; -import { CalloutComponent } from 'jslib/angular/components/callout.component'; -import { IconComponent } from 'jslib/angular/components/icon.component'; +import { CalloutComponent } from 'jslib-angular/components/callout.component'; +import { IconComponent } from 'jslib-angular/components/icon.component'; -import { A11yTitleDirective } from 'jslib/angular/directives/a11y-title.directive'; -import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive'; -import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive'; -import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive'; -import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive'; -import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive'; -import { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.directive'; -import { SelectCopyDirective } from 'jslib/angular/directives/select-copy.directive'; -import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive'; -import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive'; -import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive'; +import { A11yTitleDirective } from 'jslib-angular/directives/a11y-title.directive'; +import { ApiActionDirective } from 'jslib-angular/directives/api-action.directive'; +import { AutofocusDirective } from 'jslib-angular/directives/autofocus.directive'; +import { BlurClickDirective } from 'jslib-angular/directives/blur-click.directive'; +import { BoxRowDirective } from 'jslib-angular/directives/box-row.directive'; +import { FallbackSrcDirective } from 'jslib-angular/directives/fallback-src.directive'; +import { InputVerbatimDirective } from 'jslib-angular/directives/input-verbatim.directive'; +import { SelectCopyDirective } from 'jslib-angular/directives/select-copy.directive'; +import { StopClickDirective } from 'jslib-angular/directives/stop-click.directive'; +import { StopPropDirective } from 'jslib-angular/directives/stop-prop.directive'; +import { TrueFalseValueDirective } from 'jslib-angular/directives/true-false-value.directive'; -import { ColorPasswordPipe } from 'jslib/angular/pipes/color-password.pipe'; -import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe'; -import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; -import { SearchPipe } from 'jslib/angular/pipes/search.pipe'; +import { ColorPasswordPipe } from 'jslib-angular/pipes/color-password.pipe'; +import { I18nPipe } from 'jslib-angular/pipes/i18n.pipe'; +import { SearchCiphersPipe } from 'jslib-angular/pipes/search-ciphers.pipe'; +import { SearchPipe } from 'jslib-angular/pipes/search.pipe'; import { DatePipe, diff --git a/src/app/components/avatar.component.ts b/src/app/components/avatar.component.ts index 1108247820..83e05ed8c6 100644 --- a/src/app/components/avatar.component.ts +++ b/src/app/components/avatar.component.ts @@ -6,10 +6,10 @@ import { } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { StateService } from 'jslib/abstractions/state.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'app-avatar', diff --git a/src/app/components/password-strength.component.ts b/src/app/components/password-strength.component.ts index fd3cefa6d4..9d2fa312a8 100644 --- a/src/app/components/password-strength.component.ts +++ b/src/app/components/password-strength.component.ts @@ -4,7 +4,7 @@ import { OnChanges, } from '@angular/core'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; @Component({ selector: 'app-password-strength', diff --git a/src/app/layouts/footer.component.ts b/src/app/layouts/footer.component.ts index d4346a8ba4..6fab02fe3f 100644 --- a/src/app/layouts/footer.component.ts +++ b/src/app/layouts/footer.component.ts @@ -3,7 +3,7 @@ import { OnInit, } from '@angular/core'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; @Component({ selector: 'app-footer', diff --git a/src/app/layouts/frontend-layout.component.ts b/src/app/layouts/frontend-layout.component.ts index 5d1688fb98..3430310c5d 100644 --- a/src/app/layouts/frontend-layout.component.ts +++ b/src/app/layouts/frontend-layout.component.ts @@ -4,7 +4,7 @@ import { OnInit, } from '@angular/core'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; @Component({ selector: 'app-frontend-layout', diff --git a/src/app/layouts/navbar.component.ts b/src/app/layouts/navbar.component.ts index bafb1e15e0..255f6397d7 100644 --- a/src/app/layouts/navbar.component.ts +++ b/src/app/layouts/navbar.component.ts @@ -3,9 +3,9 @@ import { OnInit, } from '@angular/core'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { TokenService } from 'jslib/abstractions/token.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; @Component({ selector: 'app-navbar', diff --git a/src/app/layouts/organization-layout.component.ts b/src/app/layouts/organization-layout.component.ts index 15ac1b5bcf..0a1f688f53 100644 --- a/src/app/layouts/organization-layout.component.ts +++ b/src/app/layouts/organization-layout.component.ts @@ -7,14 +7,14 @@ import { import { ActivatedRoute } from '@angular/router'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; const BroadcasterSubscriptionId = 'OrganizationLayoutComponent'; diff --git a/src/app/modal.component.ts b/src/app/modal.component.ts index 5f1b7ca2e9..6fa184c08e 100644 --- a/src/app/modal.component.ts +++ b/src/app/modal.component.ts @@ -7,10 +7,10 @@ import { ViewContainerRef, } from '@angular/core'; -import { ModalComponent as BaseModalComponent } from 'jslib/angular/components/modal.component'; -import { Utils } from 'jslib/misc/utils'; +import { ModalComponent as BaseModalComponent } from 'jslib-angular/components/modal.component'; +import { Utils } from 'jslib-common/misc/utils'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; @Component({ selector: 'app-modal', diff --git a/src/app/organizations/manage/bulk-status.component.ts b/src/app/organizations/manage/bulk-status.component.ts index 4002237b4c..f9a17b61dd 100644 --- a/src/app/organizations/manage/bulk-status.component.ts +++ b/src/app/organizations/manage/bulk-status.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { OrganizationUserUserDetailsResponse } from 'jslib/models/response/organizationUserResponse'; +import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; type BulkStatusEntry = { user: OrganizationUserUserDetailsResponse, diff --git a/src/app/organizations/manage/collection-add-edit.component.ts b/src/app/organizations/manage/collection-add-edit.component.ts index cb6fc3767e..a9b030d459 100644 --- a/src/app/organizations/manage/collection-add-edit.component.ts +++ b/src/app/organizations/manage/collection-add-edit.component.ts @@ -8,19 +8,19 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { EncString } from 'jslib/models/domain/encString'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; -import { CollectionRequest } from 'jslib/models/request/collectionRequest'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; -import { GroupResponse } from 'jslib/models/response/groupResponse'; +import { EncString } from 'jslib-common/models/domain/encString'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; +import { CollectionRequest } from 'jslib-common/models/request/collectionRequest'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; +import { GroupResponse } from 'jslib-common/models/response/groupResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'app-collection-add-edit', diff --git a/src/app/organizations/manage/collections.component.ts b/src/app/organizations/manage/collections.component.ts index 83a1a955c5..4b9fbdad90 100644 --- a/src/app/organizations/manage/collections.component.ts +++ b/src/app/organizations/manage/collections.component.ts @@ -9,21 +9,21 @@ import { ActivatedRoute } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CollectionData } from 'jslib/models/data/collectionData'; -import { Collection } from 'jslib/models/domain/collection'; +import { CollectionData } from 'jslib-common/models/data/collectionData'; +import { Collection } from 'jslib-common/models/domain/collection'; import { CollectionDetailsResponse, CollectionResponse, -} from 'jslib/models/response/collectionResponse'; -import { ListResponse } from 'jslib/models/response/listResponse'; -import { CollectionView } from 'jslib/models/view/collectionView'; +} from 'jslib-common/models/response/collectionResponse'; +import { ListResponse } from 'jslib-common/models/response/listResponse'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; import { ModalComponent } from '../../modal.component'; import { CollectionAddEditComponent } from './collection-add-edit.component'; diff --git a/src/app/organizations/manage/entity-events.component.ts b/src/app/organizations/manage/entity-events.component.ts index d69bddc623..c07237bf03 100644 --- a/src/app/organizations/manage/entity-events.component.ts +++ b/src/app/organizations/manage/entity-events.component.ts @@ -6,13 +6,13 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { EventService } from '../../services/event.service'; -import { EventResponse } from 'jslib/models/response/eventResponse'; -import { ListResponse } from 'jslib/models/response/listResponse'; +import { EventResponse } from 'jslib-common/models/response/eventResponse'; +import { ListResponse } from 'jslib-common/models/response/listResponse'; @Component({ selector: 'app-entity-events', diff --git a/src/app/organizations/manage/entity-users.component.ts b/src/app/organizations/manage/entity-users.component.ts index f208d34e6c..3b42c97a59 100644 --- a/src/app/organizations/manage/entity-users.component.ts +++ b/src/app/organizations/manage/entity-users.component.ts @@ -8,15 +8,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; -import { OrganizationUserUserDetailsResponse } from 'jslib/models/response/organizationUserResponse'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; +import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'app-entity-users', diff --git a/src/app/organizations/manage/events.component.ts b/src/app/organizations/manage/events.component.ts index e42349af03..bfa7eb0f40 100644 --- a/src/app/organizations/manage/events.component.ts +++ b/src/app/organizations/manage/events.component.ts @@ -6,18 +6,18 @@ import { ActivatedRoute, Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { ExportService } from 'jslib/abstractions/export.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { ExportService } from 'jslib-common/abstractions/export.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +import { EventResponse } from 'jslib-common/models/response/eventResponse'; +import { ListResponse } from 'jslib-common/models/response/listResponse'; +import { EventView } from 'jslib-common/models/view/eventView'; import { EventService } from '../../services/event.service'; -import { EventResponse } from 'jslib/models/response/eventResponse'; -import { ListResponse } from 'jslib/models/response/listResponse'; -import { EventView } from 'jslib/models/view/eventView'; - @Component({ selector: 'app-org-events', templateUrl: 'events.component.html', diff --git a/src/app/organizations/manage/group-add-edit.component.ts b/src/app/organizations/manage/group-add-edit.component.ts index 3850a27ba4..2f1474b1c0 100644 --- a/src/app/organizations/manage/group-add-edit.component.ts +++ b/src/app/organizations/manage/group-add-edit.component.ts @@ -8,17 +8,17 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { CollectionData } from 'jslib/models/data/collectionData'; -import { Collection } from 'jslib/models/domain/collection'; -import { GroupRequest } from 'jslib/models/request/groupRequest'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; -import { CollectionDetailsResponse } from 'jslib/models/response/collectionResponse'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionData } from 'jslib-common/models/data/collectionData'; +import { Collection } from 'jslib-common/models/domain/collection'; +import { GroupRequest } from 'jslib-common/models/request/groupRequest'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; +import { CollectionDetailsResponse } from 'jslib-common/models/response/collectionResponse'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; @Component({ selector: 'app-group-add-edit', diff --git a/src/app/organizations/manage/groups.component.ts b/src/app/organizations/manage/groups.component.ts index e2f13ba8f5..bcd311c4a3 100644 --- a/src/app/organizations/manage/groups.component.ts +++ b/src/app/organizations/manage/groups.component.ts @@ -12,15 +12,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { GroupResponse } from 'jslib/models/response/groupResponse'; +import { GroupResponse } from 'jslib-common/models/response/groupResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; import { ModalComponent } from '../../modal.component'; import { EntityUsersComponent } from './entity-users.component'; diff --git a/src/app/organizations/manage/manage.component.ts b/src/app/organizations/manage/manage.component.ts index 4ed6df56ae..3011201026 100644 --- a/src/app/organizations/manage/manage.component.ts +++ b/src/app/organizations/manage/manage.component.ts @@ -4,9 +4,9 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { UserService } from 'jslib/abstractions/user.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; @Component({ selector: 'app-org-manage', diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts index 6e66a6982e..6edf91348e 100644 --- a/src/app/organizations/manage/people.component.ts +++ b/src/app/organizations/manage/people.component.ts @@ -13,34 +13,32 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ValidationService } from 'jslib/angular/services/validation.service'; +import { ValidationService } from 'jslib-angular/services/validation.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { OrganizationKeysRequest } from 'jslib-common/models/request/organizationKeysRequest'; +import { OrganizationUserBulkConfirmRequest } from 'jslib-common/models/request/organizationUserBulkConfirmRequest'; +import { OrganizationUserBulkRequest } from 'jslib-common/models/request/organizationUserBulkRequest'; +import { OrganizationUserConfirmRequest } from 'jslib-common/models/request/organizationUserConfirmRequest'; -import { OrganizationKeysRequest } from 'jslib/models/request/organizationKeysRequest'; -import { OrganizationUserBulkConfirmRequest } from 'jslib/models/request/organizationUserBulkConfirmRequest'; -import { OrganizationUserBulkRequest } from 'jslib/models/request/organizationUserBulkRequest'; -import { OrganizationUserConfirmRequest } from 'jslib/models/request/organizationUserConfirmRequest'; +import { ListResponse } from 'jslib-common/models/response/listResponse'; +import { OrganizationUserBulkResponse } from 'jslib-common/models/response/organizationUserBulkResponse'; +import { OrganizationUserUserDetailsResponse } from 'jslib-common/models/response/organizationUserResponse'; -import { OrganizationUserUserDetailsResponse } from 'jslib/models/response/organizationUserResponse'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { PolicyType } from 'jslib-common/enums/policyType'; -import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; -import { PolicyType } from 'jslib/enums/policyType'; - -import { Utils } from 'jslib/misc/utils'; - -import { ListResponse } from 'jslib/models/response'; -import { OrganizationUserBulkResponse } from 'jslib/models/response/organizationUserBulkResponse'; +import { Utils } from 'jslib-common/misc/utils'; import { ModalComponent } from '../../modal.component'; import { BulkStatusComponent } from './bulk-status.component'; diff --git a/src/app/organizations/manage/policies.component.ts b/src/app/organizations/manage/policies.component.ts index 139e245db6..0b31a01aa9 100644 --- a/src/app/organizations/manage/policies.component.ts +++ b/src/app/organizations/manage/policies.component.ts @@ -10,15 +10,15 @@ import { Router, } from '@angular/router'; -import { PolicyType } from 'jslib/enums/policyType'; +import { PolicyType } from 'jslib-common/enums/policyType'; -import { EnvironmentService } from 'jslib/abstractions'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { EnvironmentService } from 'jslib-common/abstractions'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { PolicyResponse } from 'jslib/models/response/policyResponse'; +import { PolicyResponse } from 'jslib-common/models/response/policyResponse'; import { ModalComponent } from '../../modal.component'; diff --git a/src/app/organizations/manage/policy-edit.component.ts b/src/app/organizations/manage/policy-edit.component.ts index ab06564bfe..0b764c3ea7 100644 --- a/src/app/organizations/manage/policy-edit.component.ts +++ b/src/app/organizations/manage/policy-edit.component.ts @@ -8,14 +8,14 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PolicyType } from 'jslib/enums/policyType'; +import { PolicyType } from 'jslib-common/enums/policyType'; -import { PolicyRequest } from 'jslib/models/request/policyRequest'; +import { PolicyRequest } from 'jslib-common/models/request/policyRequest'; -import { PolicyResponse } from 'jslib/models/response/policyResponse'; +import { PolicyResponse } from 'jslib-common/models/response/policyResponse'; @Component({ selector: 'app-policy-edit', diff --git a/src/app/organizations/manage/reset-password.component.ts b/src/app/organizations/manage/reset-password.component.ts index 7d26d9d761..673fe30ff4 100644 --- a/src/app/organizations/manage/reset-password.component.ts +++ b/src/app/organizations/manage/reset-password.component.ts @@ -7,17 +7,17 @@ import { Output, } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; -import { EncString } from 'jslib/models/domain/encString'; -import { MasterPasswordPolicyOptions } from 'jslib/models/domain/masterPasswordPolicyOptions'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; -import { OrganizationUserResetPasswordRequest } from 'jslib/models/request/organizationUserResetPasswordRequest'; +import { EncString } from 'jslib-common/models/domain/encString'; +import { MasterPasswordPolicyOptions } from 'jslib-common/models/domain/masterPasswordPolicyOptions'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; +import { OrganizationUserResetPasswordRequest } from 'jslib-common/models/request/organizationUserResetPasswordRequest'; @Component({ selector: 'app-reset-password', diff --git a/src/app/organizations/manage/user-add-edit.component.ts b/src/app/organizations/manage/user-add-edit.component.ts index 15980677cd..4bda21421a 100644 --- a/src/app/organizations/manage/user-add-edit.component.ts +++ b/src/app/organizations/manage/user-add-edit.component.ts @@ -8,21 +8,21 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { CollectionData } from 'jslib/models/data/collectionData'; -import { Collection } from 'jslib/models/domain/collection'; -import { OrganizationUserInviteRequest } from 'jslib/models/request/organizationUserInviteRequest'; -import { OrganizationUserUpdateRequest } from 'jslib/models/request/organizationUserUpdateRequest'; -import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; -import { CollectionDetailsResponse } from 'jslib/models/response/collectionResponse'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionData } from 'jslib-common/models/data/collectionData'; +import { Collection } from 'jslib-common/models/domain/collection'; +import { OrganizationUserInviteRequest } from 'jslib-common/models/request/organizationUserInviteRequest'; +import { OrganizationUserUpdateRequest } from 'jslib-common/models/request/organizationUserUpdateRequest'; +import { SelectionReadOnlyRequest } from 'jslib-common/models/request/selectionReadOnlyRequest'; +import { CollectionDetailsResponse } from 'jslib-common/models/response/collectionResponse'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; -import { PermissionsApi } from 'jslib/models/api/permissionsApi'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { PermissionsApi } from 'jslib-common/models/api/permissionsApi'; @Component({ selector: 'app-user-add-edit', diff --git a/src/app/organizations/manage/user-confirm.component.ts b/src/app/organizations/manage/user-confirm.component.ts index ddbad57e35..ae0ada435f 100644 --- a/src/app/organizations/manage/user-confirm.component.ts +++ b/src/app/organizations/manage/user-confirm.component.ts @@ -6,10 +6,11 @@ import { Output, } from '@angular/core'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; + +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; @Component({ selector: 'app-user-confirm', diff --git a/src/app/organizations/manage/user-groups.component.ts b/src/app/organizations/manage/user-groups.component.ts index bcb48dd33b..aaf22071e2 100644 --- a/src/app/organizations/manage/user-groups.component.ts +++ b/src/app/organizations/manage/user-groups.component.ts @@ -8,13 +8,13 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { OrganizationUserUpdateGroupsRequest } from 'jslib/models/request/organizationUserUpdateGroupsRequest'; -import { GroupResponse } from 'jslib/models/response/groupResponse'; +import { OrganizationUserUpdateGroupsRequest } from 'jslib-common/models/request/organizationUserUpdateGroupsRequest'; +import { GroupResponse } from 'jslib-common/models/response/groupResponse'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'app-user-groups', diff --git a/src/app/organizations/settings/account.component.ts b/src/app/organizations/settings/account.component.ts index 5e262f58ce..e3a57b3919 100644 --- a/src/app/organizations/settings/account.component.ts +++ b/src/app/organizations/settings/account.component.ts @@ -9,16 +9,16 @@ import { ActivatedRoute } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; -import { OrganizationKeysRequest } from 'jslib/models/request/organizationKeysRequest'; -import { OrganizationUpdateRequest } from 'jslib/models/request/organizationUpdateRequest'; +import { OrganizationKeysRequest } from 'jslib-common/models/request/organizationKeysRequest'; +import { OrganizationUpdateRequest } from 'jslib-common/models/request/organizationUpdateRequest'; -import { OrganizationResponse } from 'jslib/models/response/organizationResponse'; +import { OrganizationResponse } from 'jslib-common/models/response/organizationResponse'; import { ModalComponent } from '../../modal.component'; diff --git a/src/app/organizations/settings/adjust-seats.component.ts b/src/app/organizations/settings/adjust-seats.component.ts index 1d2b3a9fdb..33689dcaf5 100644 --- a/src/app/organizations/settings/adjust-seats.component.ts +++ b/src/app/organizations/settings/adjust-seats.component.ts @@ -13,10 +13,10 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { SeatRequest } from 'jslib/models/request/seatRequest'; +import { SeatRequest } from 'jslib-common/models/request/seatRequest'; import { PaymentComponent } from '../../settings/payment.component'; diff --git a/src/app/organizations/settings/change-plan.component.ts b/src/app/organizations/settings/change-plan.component.ts index 9063aff7d8..200c2e47c3 100644 --- a/src/app/organizations/settings/change-plan.component.ts +++ b/src/app/organizations/settings/change-plan.component.ts @@ -5,11 +5,11 @@ import { Output, } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { PlanType } from 'jslib/enums/planType'; -import { ProductType } from 'jslib/enums/productType'; +import { PlanType } from 'jslib-common/enums/planType'; +import { ProductType } from 'jslib-common/enums/productType'; @Component({ selector: 'app-change-plan', diff --git a/src/app/organizations/settings/delete-organization.component.ts b/src/app/organizations/settings/delete-organization.component.ts index ef49309557..d1da28b7cc 100644 --- a/src/app/organizations/settings/delete-organization.component.ts +++ b/src/app/organizations/settings/delete-organization.component.ts @@ -3,11 +3,11 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; @Component({ selector: 'app-delete-organization', diff --git a/src/app/organizations/settings/download-license.component.ts b/src/app/organizations/settings/download-license.component.ts index 3710b55bec..52eccdcebf 100644 --- a/src/app/organizations/settings/download-license.component.ts +++ b/src/app/organizations/settings/download-license.component.ts @@ -5,8 +5,8 @@ import { Output, } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; @Component({ selector: 'app-download-license', diff --git a/src/app/organizations/settings/organization-billing.component.ts b/src/app/organizations/settings/organization-billing.component.ts index c0cd87f1d4..18d058c300 100644 --- a/src/app/organizations/settings/organization-billing.component.ts +++ b/src/app/organizations/settings/organization-billing.component.ts @@ -6,9 +6,9 @@ import { ActivatedRoute } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { UserBillingComponent } from '../../settings/user-billing.component'; diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts index d8c2e6cfc3..5ac864b32a 100644 --- a/src/app/organizations/settings/organization-subscription.component.ts +++ b/src/app/organizations/settings/organization-subscription.component.ts @@ -6,14 +6,14 @@ import { ActivatedRoute } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { OrganizationSubscriptionResponse } from 'jslib/models/response/organizationSubscriptionResponse'; +import { OrganizationSubscriptionResponse } from 'jslib-common/models/response/organizationSubscriptionResponse'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { PlanType } from 'jslib/enums/planType'; +import { PlanType } from 'jslib-common/enums/planType'; @Component({ selector: 'app-org-subscription', diff --git a/src/app/organizations/settings/settings.component.ts b/src/app/organizations/settings/settings.component.ts index 9b339032a8..5caafd11cf 100644 --- a/src/app/organizations/settings/settings.component.ts +++ b/src/app/organizations/settings/settings.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Component({ selector: 'app-org-settings', diff --git a/src/app/organizations/settings/two-factor-setup.component.ts b/src/app/organizations/settings/two-factor-setup.component.ts index 2681d62e86..5fa77957bc 100644 --- a/src/app/organizations/settings/two-factor-setup.component.ts +++ b/src/app/organizations/settings/two-factor-setup.component.ts @@ -4,12 +4,12 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; import { TwoFactorDuoComponent } from '../../settings/two-factor-duo.component'; import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from '../../settings/two-factor-setup.component'; diff --git a/src/app/organizations/tools/export.component.ts b/src/app/organizations/tools/export.component.ts index 01e84a6c63..4fd0e7351c 100644 --- a/src/app/organizations/tools/export.component.ts +++ b/src/app/organizations/tools/export.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { ExportService } from 'jslib/abstractions/export.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { ExportService } from 'jslib-common/abstractions/export.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { ExportComponent as BaseExportComponent } from '../../tools/export.component'; -import { EventType } from 'jslib/enums/eventType'; +import { EventType } from 'jslib-common/enums/eventType'; @Component({ selector: 'app-org-export', diff --git a/src/app/organizations/tools/exposed-passwords-report.component.ts b/src/app/organizations/tools/exposed-passwords-report.component.ts index f2d860c7cb..5e29868499 100644 --- a/src/app/organizations/tools/exposed-passwords-report.component.ts +++ b/src/app/organizations/tools/exposed-passwords-report.component.ts @@ -4,17 +4,17 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent, } from '../../tools/exposed-passwords-report.component'; -import { Cipher } from 'jslib/models/domain/cipher'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { Cipher } from 'jslib-common/models/domain/cipher'; +import { CipherView } from 'jslib-common/models/view/cipherView'; @Component({ selector: 'app-exposed-passwords-report', diff --git a/src/app/organizations/tools/import.component.ts b/src/app/organizations/tools/import.component.ts index 1b698f83a1..e0f0f4d4e0 100644 --- a/src/app/organizations/tools/import.component.ts +++ b/src/app/organizations/tools/import.component.ts @@ -6,10 +6,10 @@ import { import { ToasterService } from 'angular2-toaster'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { ImportService } from 'jslib/abstractions/import.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { ImportService } from 'jslib-common/abstractions/import.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { ImportComponent as BaseImportComponent } from '../../tools/import.component'; diff --git a/src/app/organizations/tools/inactive-two-factor-report.component.ts b/src/app/organizations/tools/inactive-two-factor-report.component.ts index a9a81cc7ee..e20721cdc4 100644 --- a/src/app/organizations/tools/inactive-two-factor-report.component.ts +++ b/src/app/organizations/tools/inactive-two-factor-report.component.ts @@ -4,15 +4,15 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent, } from '../../tools/inactive-two-factor-report.component'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; @Component({ selector: 'app-inactive-two-factor-report', diff --git a/src/app/organizations/tools/reused-passwords-report.component.ts b/src/app/organizations/tools/reused-passwords-report.component.ts index 036916ba01..f116c5388c 100644 --- a/src/app/organizations/tools/reused-passwords-report.component.ts +++ b/src/app/organizations/tools/reused-passwords-report.component.ts @@ -4,13 +4,13 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Cipher } from 'jslib/models/domain/cipher'; +import { Cipher } from 'jslib-common/models/domain/cipher'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent, diff --git a/src/app/organizations/tools/tools.component.ts b/src/app/organizations/tools/tools.component.ts index 4ee581b5e8..91f67eb0e0 100644 --- a/src/app/organizations/tools/tools.component.ts +++ b/src/app/organizations/tools/tools.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Component({ selector: 'app-org-tools', diff --git a/src/app/organizations/tools/unsecured-websites-report.component.ts b/src/app/organizations/tools/unsecured-websites-report.component.ts index 1c84c623c1..5c439a54b3 100644 --- a/src/app/organizations/tools/unsecured-websites-report.component.ts +++ b/src/app/organizations/tools/unsecured-websites-report.component.ts @@ -4,15 +4,15 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent, } from '../../tools/unsecured-websites-report.component'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; @Component({ selector: 'app-unsecured-websites-report', diff --git a/src/app/organizations/tools/weak-passwords-report.component.ts b/src/app/organizations/tools/weak-passwords-report.component.ts index ea8b508ad0..08c43dad78 100644 --- a/src/app/organizations/tools/weak-passwords-report.component.ts +++ b/src/app/organizations/tools/weak-passwords-report.component.ts @@ -4,14 +4,14 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Cipher } from 'jslib/models/domain/cipher'; +import { Cipher } from 'jslib-common/models/domain/cipher'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent, diff --git a/src/app/organizations/vault/add-edit.component.ts b/src/app/organizations/vault/add-edit.component.ts index 0463396e70..4dce9e2b05 100644 --- a/src/app/organizations/vault/add-edit.component.ts +++ b/src/app/organizations/vault/add-edit.component.ts @@ -1,25 +1,25 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherData } from 'jslib/models/data/cipherData'; -import { Cipher } from 'jslib/models/domain/cipher'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherCreateRequest } from 'jslib/models/request/cipherCreateRequest'; -import { CipherRequest } from 'jslib/models/request/cipherRequest'; +import { CipherData } from 'jslib-common/models/data/cipherData'; +import { Cipher } from 'jslib-common/models/domain/cipher'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CipherCreateRequest } from 'jslib-common/models/request/cipherCreateRequest'; +import { CipherRequest } from 'jslib-common/models/request/cipherRequest'; import { AddEditComponent as BaseAddEditComponent } from '../../vault/add-edit.component'; diff --git a/src/app/organizations/vault/attachments.component.ts b/src/app/organizations/vault/attachments.component.ts index 4c8b8a403e..9c11b24767 100644 --- a/src/app/organizations/vault/attachments.component.ts +++ b/src/app/organizations/vault/attachments.component.ts @@ -1,17 +1,17 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherData } from 'jslib/models/data/cipherData'; -import { Cipher } from 'jslib/models/domain/cipher'; -import { Organization } from 'jslib/models/domain/organization'; +import { CipherData } from 'jslib-common/models/data/cipherData'; +import { Cipher } from 'jslib-common/models/domain/cipher'; +import { Organization } from 'jslib-common/models/domain/organization'; -import { AttachmentView } from 'jslib/models/view/attachmentView'; +import { AttachmentView } from 'jslib-common/models/view/attachmentView'; import { AttachmentsComponent as BaseAttachmentsComponent } from '../../vault/attachments.component'; diff --git a/src/app/organizations/vault/ciphers.component.ts b/src/app/organizations/vault/ciphers.component.ts index 0092676408..e83e6ba135 100644 --- a/src/app/organizations/vault/ciphers.component.ts +++ b/src/app/organizations/vault/ciphers.component.ts @@ -6,18 +6,18 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { CiphersComponent as BaseCiphersComponent } from '../../vault/ciphers.component'; diff --git a/src/app/organizations/vault/collections.component.ts b/src/app/organizations/vault/collections.component.ts index b87296eee0..5bdcedc905 100644 --- a/src/app/organizations/vault/collections.component.ts +++ b/src/app/organizations/vault/collections.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { CipherData } from 'jslib/models/data/cipherData'; -import { Cipher } from 'jslib/models/domain/cipher'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherCollectionsRequest } from 'jslib/models/request/cipherCollectionsRequest'; +import { CipherData } from 'jslib-common/models/data/cipherData'; +import { Cipher } from 'jslib-common/models/domain/cipher'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CipherCollectionsRequest } from 'jslib-common/models/request/cipherCollectionsRequest'; import { CollectionsComponent as BaseCollectionsComponent } from '../../vault/collections.component'; diff --git a/src/app/organizations/vault/groupings.component.ts b/src/app/organizations/vault/groupings.component.ts index f854a54d36..34a0543791 100644 --- a/src/app/organizations/vault/groupings.component.ts +++ b/src/app/organizations/vault/groupings.component.ts @@ -1,17 +1,17 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CollectionData } from 'jslib/models/data/collectionData'; -import { Collection } from 'jslib/models/domain/collection'; -import { Organization } from 'jslib/models/domain/organization'; -import { CollectionDetailsResponse } from 'jslib/models/response/collectionResponse'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionData } from 'jslib-common/models/data/collectionData'; +import { Collection } from 'jslib-common/models/domain/collection'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CollectionDetailsResponse } from 'jslib-common/models/response/collectionResponse'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; import { GroupingsComponent as BaseGroupingsComponent } from '../../vault/groupings.component'; diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts index 2aa1291b07..53078f4f7b 100644 --- a/src/app/organizations/vault/vault.component.ts +++ b/src/app/organizations/vault/vault.component.ts @@ -13,18 +13,18 @@ import { Router, } from '@angular/router'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; import { ModalComponent } from '../../modal.component'; diff --git a/src/app/send/access.component.ts b/src/app/send/access.component.ts index d48c27e588..c06c57bc87 100644 --- a/src/app/send/access.component.ts +++ b/src/app/send/access.component.ts @@ -5,24 +5,24 @@ import { import { ActivatedRoute } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; -import { SendAccess } from 'jslib/models/domain/sendAccess'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; +import { SendAccess } from 'jslib-common/models/domain/sendAccess'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; -import { SendAccessView } from 'jslib/models/view/sendAccessView'; +import { SendAccessView } from 'jslib-common/models/view/sendAccessView'; -import { SendType } from 'jslib/enums/sendType'; -import { SendAccessRequest } from 'jslib/models/request/sendAccessRequest'; -import { ErrorResponse } from 'jslib/models/response/errorResponse'; +import { SendType } from 'jslib-common/enums/sendType'; +import { SendAccessRequest } from 'jslib-common/models/request/sendAccessRequest'; +import { ErrorResponse } from 'jslib-common/models/response/errorResponse'; -import { SendAccessResponse } from 'jslib/models/response/sendAccessResponse'; +import { SendAccessResponse } from 'jslib-common/models/response/sendAccessResponse'; @Component({ selector: 'app-send-access', diff --git a/src/app/send/add-edit.component.ts b/src/app/send/add-edit.component.ts index 0d577dcec3..819695dbee 100644 --- a/src/app/send/add-edit.component.ts +++ b/src/app/send/add-edit.component.ts @@ -2,15 +2,15 @@ import { DatePipe } from '@angular/common'; import { Component } from '@angular/core'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SendService } from 'jslib/abstractions/send.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/send/add-edit.component'; +import { AddEditComponent as BaseAddEditComponent } from 'jslib-angular/components/send/add-edit.component'; @Component({ selector: 'app-send-add-edit', diff --git a/src/app/send/send.component.ts b/src/app/send/send.component.ts index ff4feb2f75..951d92a8c3 100644 --- a/src/app/send/send.component.ts +++ b/src/app/send/send.component.ts @@ -6,23 +6,23 @@ import { ViewContainerRef, } from '@angular/core'; -import { SendView } from 'jslib/models/view/sendView'; +import { SendView } from 'jslib-common/models/view/sendView'; -import { SendComponent as BaseSendComponent } from 'jslib/angular/components/send/send.component'; +import { SendComponent as BaseSendComponent } from 'jslib-angular/components/send/send.component'; import { AddEditComponent } from './add-edit.component'; import { ModalComponent } from '../modal.component'; -import { EnvironmentService } from 'jslib/abstractions/environment.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { SendService } from 'jslib/abstractions/send.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { SendService } from 'jslib-common/abstractions/send.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; const BroadcasterSubscriptionId = 'SendComponent'; diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts index b0aa4ca9ae..991ec9c8e7 100644 --- a/src/app/services/event.service.ts +++ b/src/app/services/event.service.ts @@ -1,13 +1,14 @@ import { Injectable } from '@angular/core'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; -import { DeviceType } from 'jslib/enums/deviceType'; -import { EventType } from 'jslib/enums/eventType'; -import { PolicyType } from 'jslib/enums/policyType'; +import { DeviceType } from 'jslib-common/enums/deviceType'; +import { EventType } from 'jslib-common/enums/eventType'; +import { PolicyType } from 'jslib-common/enums/policyType'; + +import { EventResponse } from 'jslib-common/models/response/eventResponse'; -import { EventResponse } from 'jslib/models/response/eventResponse'; @Injectable() export class EventService { diff --git a/src/app/services/organization-guard.service.ts b/src/app/services/organization-guard.service.ts index 89b9d2a53a..c9ed989d52 100644 --- a/src/app/services/organization-guard.service.ts +++ b/src/app/services/organization-guard.service.ts @@ -7,8 +7,8 @@ import { import { ToasterService } from 'angular2-toaster'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Injectable() export class OrganizationGuardService implements CanActivate { diff --git a/src/app/services/organization-type-guard.service.ts b/src/app/services/organization-type-guard.service.ts index 28b77e4d31..8a2ffbeff8 100644 --- a/src/app/services/organization-type-guard.service.ts +++ b/src/app/services/organization-type-guard.service.ts @@ -5,9 +5,9 @@ import { Router, } from '@angular/router'; -import { UserService } from 'jslib/abstractions/user.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Permissions } from 'jslib/enums/permissions'; +import { Permissions } from 'jslib-common/enums/permissions'; @Injectable() export class OrganizationTypeGuardService implements CanActivate { diff --git a/src/app/services/router.service.ts b/src/app/services/router.service.ts index 0bf22be45c..12e54a303a 100644 --- a/src/app/services/router.service.ts +++ b/src/app/services/router.service.ts @@ -6,7 +6,7 @@ import { Router, } from '@angular/router'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; @Injectable() export class RouterService { diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index eb11b91d14..231edc5154 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -17,75 +17,75 @@ import { OrganizationGuardService } from './organization-guard.service'; import { OrganizationTypeGuardService } from './organization-type-guard.service'; import { RouterService } from './router.service'; -import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; -import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; -import { UnauthGuardService } from 'jslib/angular/services/unauth-guard.service'; -import { ValidationService } from 'jslib/angular/services/validation.service'; +import { AuthGuardService } from 'jslib-angular/services/auth-guard.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; +import { LockGuardService } from 'jslib-angular/services/lock-guard.service'; +import { UnauthGuardService } from 'jslib-angular/services/unauth-guard.service'; +import { ValidationService } from 'jslib-angular/services/validation.service'; -import { ApiService } from 'jslib/services/api.service'; -import { AppIdService } from 'jslib/services/appId.service'; -import { AuditService } from 'jslib/services/audit.service'; -import { AuthService } from 'jslib/services/auth.service'; -import { CipherService } from 'jslib/services/cipher.service'; -import { CollectionService } from 'jslib/services/collection.service'; -import { ConsoleLogService } from 'jslib/services/consoleLog.service'; -import { ConstantsService } from 'jslib/services/constants.service'; -import { ContainerService } from 'jslib/services/container.service'; -import { CryptoService } from 'jslib/services/crypto.service'; -import { EnvironmentService } from 'jslib/services/environment.service'; -import { EventService as EventLoggingService } from 'jslib/services/event.service'; -import { ExportService } from 'jslib/services/export.service'; -import { FileUploadService } from 'jslib/services/fileUpload.service'; -import { FolderService } from 'jslib/services/folder.service'; -import { ImportService } from 'jslib/services/import.service'; -import { NotificationsService } from 'jslib/services/notifications.service'; -import { PasswordGenerationService } from 'jslib/services/passwordGeneration.service'; -import { PolicyService } from 'jslib/services/policy.service'; -import { SearchService } from 'jslib/services/search.service'; -import { SendService } from 'jslib/services/send.service'; -import { SettingsService } from 'jslib/services/settings.service'; -import { StateService } from 'jslib/services/state.service'; -import { SyncService } from 'jslib/services/sync.service'; -import { TokenService } from 'jslib/services/token.service'; -import { TotpService } from 'jslib/services/totp.service'; -import { UserService } from 'jslib/services/user.service'; -import { VaultTimeoutService } from 'jslib/services/vaultTimeout.service'; -import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.service'; +import { ApiService } from 'jslib-common/services/api.service'; +import { AppIdService } from 'jslib-common/services/appId.service'; +import { AuditService } from 'jslib-common/services/audit.service'; +import { AuthService } from 'jslib-common/services/auth.service'; +import { CipherService } from 'jslib-common/services/cipher.service'; +import { CollectionService } from 'jslib-common/services/collection.service'; +import { ConsoleLogService } from 'jslib-common/services/consoleLog.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; +import { ContainerService } from 'jslib-common/services/container.service'; +import { CryptoService } from 'jslib-common/services/crypto.service'; +import { EnvironmentService } from 'jslib-common/services/environment.service'; +import { EventService as EventLoggingService } from 'jslib-common/services/event.service'; +import { ExportService } from 'jslib-common/services/export.service'; +import { FileUploadService } from 'jslib-common/services/fileUpload.service'; +import { FolderService } from 'jslib-common/services/folder.service'; +import { ImportService } from 'jslib-common/services/import.service'; +import { NotificationsService } from 'jslib-common/services/notifications.service'; +import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service'; +import { PasswordRepromptService } from 'jslib-common/services/passwordReprompt.service'; +import { PolicyService } from 'jslib-common/services/policy.service'; +import { SearchService } from 'jslib-common/services/search.service'; +import { SendService } from 'jslib-common/services/send.service'; +import { SettingsService } from 'jslib-common/services/settings.service'; +import { StateService } from 'jslib-common/services/state.service'; +import { SyncService } from 'jslib-common/services/sync.service'; +import { TokenService } from 'jslib-common/services/token.service'; +import { TotpService } from 'jslib-common/services/totp.service'; +import { UserService } from 'jslib-common/services/user.service'; +import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service'; +import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service'; -import { ApiService as ApiServiceAbstraction } from 'jslib/abstractions/api.service'; -import { AuditService as AuditServiceAbstraction } from 'jslib/abstractions/audit.service'; -import { AuthService as AuthServiceAbstraction } from 'jslib/abstractions/auth.service'; -import { CipherService as CipherServiceAbstraction } from 'jslib/abstractions/cipher.service'; -import { CollectionService as CollectionServiceAbstraction } from 'jslib/abstractions/collection.service'; -import { CryptoService as CryptoServiceAbstraction } from 'jslib/abstractions/crypto.service'; -import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib/abstractions/cryptoFunction.service'; -import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib/abstractions/environment.service'; -import { EventService as EventLoggingServiceAbstraction } from 'jslib/abstractions/event.service'; -import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service'; -import { FileUploadService as FileUploadServiceAbstraction } from 'jslib/abstractions/fileUpload.service'; -import { FolderService as FolderServiceAbstraction } from 'jslib/abstractions/folder.service'; -import { I18nService as I18nServiceAbstraction } from 'jslib/abstractions/i18n.service'; -import { ImportService as ImportServiceAbstraction } from 'jslib/abstractions/import.service'; -import { MessagingService as MessagingServiceAbstraction } from 'jslib/abstractions/messaging.service'; -import { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service'; +import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service'; +import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service'; +import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service'; +import { CipherService as CipherServiceAbstraction } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService as CollectionServiceAbstraction } from 'jslib-common/abstractions/collection.service'; +import { CryptoService as CryptoServiceAbstraction } from 'jslib-common/abstractions/crypto.service'; +import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib-common/abstractions/cryptoFunction.service'; +import { EnvironmentService as EnvironmentServiceAbstraction } from 'jslib-common/abstractions/environment.service'; +import { EventService as EventLoggingServiceAbstraction } from 'jslib-common/abstractions/event.service'; +import { ExportService as ExportServiceAbstraction } from 'jslib-common/abstractions/export.service'; +import { FileUploadService as FileUploadServiceAbstraction } from 'jslib-common/abstractions/fileUpload.service'; +import { FolderService as FolderServiceAbstraction } from 'jslib-common/abstractions/folder.service'; +import { I18nService as I18nServiceAbstraction } from 'jslib-common/abstractions/i18n.service'; +import { ImportService as ImportServiceAbstraction } from 'jslib-common/abstractions/import.service'; +import { MessagingService as MessagingServiceAbstraction } from 'jslib-common/abstractions/messaging.service'; +import { NotificationsService as NotificationsServiceAbstraction } from 'jslib-common/abstractions/notifications.service'; import { PasswordGenerationService as PasswordGenerationServiceAbstraction, -} from 'jslib/abstractions/passwordGeneration.service'; -import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib/abstractions/passwordReprompt.service'; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; -import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; -import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service'; -import { SettingsService as SettingsServiceAbstraction } from 'jslib/abstractions/settings.service'; -import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; -import { StorageService as StorageServiceAbstraction } from 'jslib/abstractions/storage.service'; -import { SyncService as SyncServiceAbstraction } from 'jslib/abstractions/sync.service'; -import { TokenService as TokenServiceAbstraction } from 'jslib/abstractions/token.service'; -import { TotpService as TotpServiceAbstraction } from 'jslib/abstractions/totp.service'; -import { UserService as UserServiceAbstraction } from 'jslib/abstractions/user.service'; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib/abstractions/vaultTimeout.service'; -import { PasswordRepromptService } from 'jslib/services/passwordReprompt.service'; +} from 'jslib-common/abstractions/passwordGeneration.service'; +import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib-common/abstractions/passwordReprompt.service'; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService as PolicyServiceAbstraction } from 'jslib-common/abstractions/policy.service'; +import { SearchService as SearchServiceAbstraction } from 'jslib-common/abstractions/search.service'; +import { SendService as SendServiceAbstraction } from 'jslib-common/abstractions/send.service'; +import { SettingsService as SettingsServiceAbstraction } from 'jslib-common/abstractions/settings.service'; +import { StateService as StateServiceAbstraction } from 'jslib-common/abstractions/state.service'; +import { StorageService as StorageServiceAbstraction } from 'jslib-common/abstractions/storage.service'; +import { SyncService as SyncServiceAbstraction } from 'jslib-common/abstractions/sync.service'; +import { TokenService as TokenServiceAbstraction } from 'jslib-common/abstractions/token.service'; +import { TotpService as TotpServiceAbstraction } from 'jslib-common/abstractions/totp.service'; +import { UserService as UserServiceAbstraction } from 'jslib-common/abstractions/user.service'; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib-common/abstractions/vaultTimeout.service'; const i18nService = new I18nService(window.navigator.language, 'locales'); const stateService = new StateService(); diff --git a/src/app/settings/account.component.ts b/src/app/settings/account.component.ts index b38d3d0198..9e19251496 100644 --- a/src/app/settings/account.component.ts +++ b/src/app/settings/account.component.ts @@ -11,8 +11,8 @@ import { DeauthorizeSessionsComponent } from './deauthorize-sessions.component'; import { DeleteAccountComponent } from './delete-account.component'; import { PurgeVaultComponent } from './purge-vault.component'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Component({ selector: 'app-account', diff --git a/src/app/settings/add-credit.component.ts b/src/app/settings/add-credit.component.ts index da28c95eec..1317ea0241 100644 --- a/src/app/settings/add-credit.component.ts +++ b/src/app/settings/add-credit.component.ts @@ -8,13 +8,13 @@ import { ViewChild, } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; -import { BitPayInvoiceRequest } from 'jslib/models/request/bitPayInvoiceRequest'; +import { BitPayInvoiceRequest } from 'jslib-common/models/request/bitPayInvoiceRequest'; import { WebConstants } from '../../services/webConstants'; diff --git a/src/app/settings/adjust-payment.component.ts b/src/app/settings/adjust-payment.component.ts index c867dd173b..0863ea5843 100644 --- a/src/app/settings/adjust-payment.component.ts +++ b/src/app/settings/adjust-payment.component.ts @@ -8,12 +8,12 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PaymentRequest } from 'jslib/models/request/paymentRequest'; +import { PaymentRequest } from 'jslib-common/models/request/paymentRequest'; -import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; import { PaymentComponent } from './payment.component'; import { TaxInfoComponent } from './tax-info.component'; diff --git a/src/app/settings/adjust-storage.component.ts b/src/app/settings/adjust-storage.component.ts index 1b9daca7b0..830b1985ec 100644 --- a/src/app/settings/adjust-storage.component.ts +++ b/src/app/settings/adjust-storage.component.ts @@ -13,12 +13,12 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { StorageRequest } from 'jslib/models/request/storageRequest'; +import { StorageRequest } from 'jslib-common/models/request/storageRequest'; -import { PaymentResponse } from 'jslib/models/response/paymentResponse'; +import { PaymentResponse } from 'jslib-common/models/response/paymentResponse'; import { PaymentComponent } from './payment.component'; diff --git a/src/app/settings/api-key.component.ts b/src/app/settings/api-key.component.ts index d5f168b168..bf057bf738 100644 --- a/src/app/settings/api-key.component.ts +++ b/src/app/settings/api-key.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; -import { ApiKeyResponse } from 'jslib/models/response/apiKeyResponse'; +import { ApiKeyResponse } from 'jslib-common/models/response/apiKeyResponse'; @Component({ selector: 'app-api-key', diff --git a/src/app/settings/change-email.component.ts b/src/app/settings/change-email.component.ts index b9c3a323e6..5553d71737 100644 --- a/src/app/settings/change-email.component.ts +++ b/src/app/settings/change-email.component.ts @@ -4,14 +4,14 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { EmailRequest } from 'jslib/models/request/emailRequest'; -import { EmailTokenRequest } from 'jslib/models/request/emailTokenRequest'; +import { EmailRequest } from 'jslib-common/models/request/emailRequest'; +import { EmailTokenRequest } from 'jslib-common/models/request/emailTokenRequest'; @Component({ selector: 'app-change-email', diff --git a/src/app/settings/change-kdf.component.ts b/src/app/settings/change-kdf.component.ts index e6f416fd43..5d1ba2bd75 100644 --- a/src/app/settings/change-kdf.component.ts +++ b/src/app/settings/change-kdf.component.ts @@ -5,15 +5,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { KdfRequest } from 'jslib/models/request/kdfRequest'; +import { KdfRequest } from 'jslib-common/models/request/kdfRequest'; -import { KdfType } from 'jslib/enums/kdfType'; +import { KdfType } from 'jslib-common/enums/kdfType'; @Component({ selector: 'app-change-kdf', diff --git a/src/app/settings/change-password.component.ts b/src/app/settings/change-password.component.ts index f527d58a90..3c2a092f22 100644 --- a/src/app/settings/change-password.component.ts +++ b/src/app/settings/change-password.component.ts @@ -1,33 +1,33 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { ChangePasswordComponent as BaseChangePasswordComponent, -} from 'jslib/angular/components/change-password.component'; +} from 'jslib-angular/components/change-password.component'; -import { EmergencyAccessStatusType } from 'jslib/enums/emergencyAccessStatusType'; -import { Utils } from 'jslib/misc/utils'; +import { EmergencyAccessStatusType } from 'jslib-common/enums/emergencyAccessStatusType'; +import { Utils } from 'jslib-common/misc/utils'; -import { EncString } from 'jslib/models/domain/encString'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; +import { EncString } from 'jslib-common/models/domain/encString'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; -import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest'; -import { EmergencyAccessUpdateRequest } from 'jslib/models/request/emergencyAccessUpdateRequest'; -import { FolderWithIdRequest } from 'jslib/models/request/folderWithIdRequest'; -import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib/models/request/organizationUserResetPasswordEnrollmentRequest'; -import { PasswordRequest } from 'jslib/models/request/passwordRequest'; -import { UpdateKeyRequest } from 'jslib/models/request/updateKeyRequest'; +import { CipherWithIdRequest } from 'jslib-common/models/request/cipherWithIdRequest'; +import { EmergencyAccessUpdateRequest } from 'jslib-common/models/request/emergencyAccessUpdateRequest'; +import { FolderWithIdRequest } from 'jslib-common/models/request/folderWithIdRequest'; +import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest'; +import { PasswordRequest } from 'jslib-common/models/request/passwordRequest'; +import { UpdateKeyRequest } from 'jslib-common/models/request/updateKeyRequest'; @Component({ selector: 'app-change-password', diff --git a/src/app/settings/create-organization.component.ts b/src/app/settings/create-organization.component.ts index e4c5ae019f..ca90465088 100644 --- a/src/app/settings/create-organization.component.ts +++ b/src/app/settings/create-organization.component.ts @@ -5,8 +5,8 @@ import { } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { PlanType } from 'jslib/enums/planType'; -import { ProductType } from 'jslib/enums/productType'; +import { PlanType } from 'jslib-common/enums/planType'; +import { ProductType } from 'jslib-common/enums/productType'; import { OrganizationPlansComponent } from './organization-plans.component'; diff --git a/src/app/settings/deauthorize-sessions.component.ts b/src/app/settings/deauthorize-sessions.component.ts index e994c7b8c6..ec605a451c 100644 --- a/src/app/settings/deauthorize-sessions.component.ts +++ b/src/app/settings/deauthorize-sessions.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; @Component({ selector: 'app-deauthorize-sessions', diff --git a/src/app/settings/delete-account.component.ts b/src/app/settings/delete-account.component.ts index 4c90785931..948ca2708d 100644 --- a/src/app/settings/delete-account.component.ts +++ b/src/app/settings/delete-account.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; @Component({ selector: 'app-delete-account', diff --git a/src/app/settings/domain-rules.component.ts b/src/app/settings/domain-rules.component.ts index 352352499f..be87f68358 100644 --- a/src/app/settings/domain-rules.component.ts +++ b/src/app/settings/domain-rules.component.ts @@ -5,10 +5,10 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { UpdateDomainsRequest } from 'jslib/models/request/updateDomainsRequest'; +import { UpdateDomainsRequest } from 'jslib-common/models/request/updateDomainsRequest'; @Component({ selector: 'app-domain-rules', diff --git a/src/app/settings/emergency-access-add-edit.component.ts b/src/app/settings/emergency-access-add-edit.component.ts index 14210d7969..999045d6b3 100644 --- a/src/app/settings/emergency-access-add-edit.component.ts +++ b/src/app/settings/emergency-access-add-edit.component.ts @@ -8,12 +8,12 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { EmergencyAccessType } from 'jslib/enums/emergencyAccessType'; -import { EmergencyAccessInviteRequest } from 'jslib/models/request/emergencyAccessInviteRequest'; -import { EmergencyAccessUpdateRequest } from 'jslib/models/request/emergencyAccessUpdateRequest'; +import { EmergencyAccessType } from 'jslib-common/enums/emergencyAccessType'; +import { EmergencyAccessInviteRequest } from 'jslib-common/models/request/emergencyAccessInviteRequest'; +import { EmergencyAccessUpdateRequest } from 'jslib-common/models/request/emergencyAccessUpdateRequest'; @Component({ selector: 'emergency-access-add-edit', diff --git a/src/app/settings/emergency-access-attachments.component.ts b/src/app/settings/emergency-access-attachments.component.ts index ca93301204..4d87263095 100644 --- a/src/app/settings/emergency-access-attachments.component.ts +++ b/src/app/settings/emergency-access-attachments.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { AttachmentView } from 'jslib/models/view/attachmentView'; +import { AttachmentView } from 'jslib-common/models/view/attachmentView'; -import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib/angular/components/attachments.component'; +import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib-angular/components/attachments.component'; @Component({ selector: 'emergency-access-attachments', diff --git a/src/app/settings/emergency-access-confirm.component.ts b/src/app/settings/emergency-access-confirm.component.ts index ecf045a8be..224924fdd6 100644 --- a/src/app/settings/emergency-access-confirm.component.ts +++ b/src/app/settings/emergency-access-confirm.component.ts @@ -6,13 +6,13 @@ import { Output, } from '@angular/core'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'emergency-access-confirm', diff --git a/src/app/settings/emergency-access-takeover.component.ts b/src/app/settings/emergency-access-takeover.component.ts index 0ecbe2871a..6d5673d508 100644 --- a/src/app/settings/emergency-access-takeover.component.ts +++ b/src/app/settings/emergency-access-takeover.component.ts @@ -8,24 +8,23 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { ChangePasswordComponent } from 'jslib/angular/components/change-password.component'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { KdfType } from 'jslib/enums/kdfType'; -import { PolicyData } from 'jslib/models/data/policyData'; -import { Policy } from 'jslib/models/domain/policy'; -import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; -import { EmergencyAccessPasswordRequest } from 'jslib/models/request/emergencyAccessPasswordRequest'; -import { ListResponse } from 'jslib/models/response'; -import { EmergencyAccessTakeoverResponse } from 'jslib/models/response/emergencyAccessResponse'; -import { PolicyResponse } from 'jslib/models/response/policyResponse'; +import { KdfType } from 'jslib-common/enums/kdfType'; +import { PolicyData } from 'jslib-common/models/data/policyData'; +import { Policy } from 'jslib-common/models/domain/policy'; +import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; +import { EmergencyAccessPasswordRequest } from 'jslib-common/models/request/emergencyAccessPasswordRequest'; +import { PolicyResponse } from 'jslib-common/models/response/policyResponse'; + +import { ChangePasswordComponent } from 'jslib-angular/components/change-password.component'; @Component({ selector: 'emergency-access-takeover', diff --git a/src/app/settings/emergency-access-view.component.ts b/src/app/settings/emergency-access-view.component.ts index e84bdb3a34..a545d014cc 100644 --- a/src/app/settings/emergency-access-view.component.ts +++ b/src/app/settings/emergency-access-view.component.ts @@ -7,14 +7,14 @@ import { } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; -import { CipherData } from 'jslib/models/data'; -import { Cipher, SymmetricCryptoKey } from 'jslib/models/domain'; -import { EmergencyAccessViewResponse } from 'jslib/models/response/emergencyAccessResponse'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherData } from 'jslib-common/models/data'; +import { Cipher, SymmetricCryptoKey } from 'jslib-common/models/domain'; +import { EmergencyAccessViewResponse } from 'jslib-common/models/response/emergencyAccessResponse'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { ModalComponent } from '../modal.component'; diff --git a/src/app/settings/emergency-access.component.ts b/src/app/settings/emergency-access.component.ts index 07d15c8a7c..9383c2f885 100644 --- a/src/app/settings/emergency-access.component.ts +++ b/src/app/settings/emergency-access.component.ts @@ -1,20 +1,20 @@ import { Component, ComponentFactoryResolver, OnInit, ViewChild, ViewContainerRef } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { EmergencyAccessStatusType } from 'jslib/enums/emergencyAccessStatusType'; -import { EmergencyAccessType } from 'jslib/enums/emergencyAccessType'; -import { Utils } from 'jslib/misc/utils'; -import { EmergencyAccessConfirmRequest } from 'jslib/models/request/emergencyAccessConfirmRequest'; -import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse } from 'jslib/models/response/emergencyAccessResponse'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { EmergencyAccessStatusType } from 'jslib-common/enums/emergencyAccessStatusType'; +import { EmergencyAccessType } from 'jslib-common/enums/emergencyAccessType'; +import { Utils } from 'jslib-common/misc/utils'; +import { EmergencyAccessConfirmRequest } from 'jslib-common/models/request/emergencyAccessConfirmRequest'; +import { EmergencyAccessGranteeDetailsResponse, EmergencyAccessGrantorDetailsResponse } from 'jslib-common/models/response/emergencyAccessResponse'; +import { ConstantsService } from 'jslib-common/services/constants.service'; import { ModalComponent } from '../modal.component'; import { EmergencyAccessAddEditComponent } from './emergency-access-add-edit.component'; diff --git a/src/app/settings/emergency-add-edit.component.ts b/src/app/settings/emergency-add-edit.component.ts index 63098bc4e4..6ac66abf8b 100644 --- a/src/app/settings/emergency-add-edit.component.ts +++ b/src/app/settings/emergency-add-edit.component.ts @@ -1,20 +1,20 @@ import { Component } from '@angular/core'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Cipher } from 'jslib/models/domain/cipher'; +import { Cipher } from 'jslib-common/models/domain/cipher'; import { AddEditComponent as BaseAddEditComponent } from '../vault/add-edit.component'; diff --git a/src/app/settings/link-sso.component.ts b/src/app/settings/link-sso.component.ts index a66319db0c..4367b67fe8 100644 --- a/src/app/settings/link-sso.component.ts +++ b/src/app/settings/link-sso.component.ts @@ -5,18 +5,18 @@ import { } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { AuthService } from 'jslib/abstractions/auth.service'; -import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { AuthService } from 'jslib-common/abstractions/auth.service'; +import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; -import { SsoComponent } from 'jslib/angular/components/sso.component'; +import { SsoComponent } from 'jslib-angular/components/sso.component'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; @Component({ selector: 'app-link-sso', diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts index 3ad8be69a7..755d31a792 100644 --- a/src/app/settings/options.component.ts +++ b/src/app/settings/options.component.ts @@ -5,16 +5,16 @@ import { import { ToasterService } from 'angular2-toaster'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; -import { ConstantsService } from 'jslib/services/constants.service'; +import { ConstantsService } from 'jslib-common/services/constants.service'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; @Component({ selector: 'app-options', diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts index 19d022eee3..58d01ef041 100644 --- a/src/app/settings/organization-plans.component.ts +++ b/src/app/settings/organization-plans.component.ts @@ -10,30 +10,30 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { PaymentComponent } from './payment.component'; import { TaxInfoComponent } from './tax-info.component'; -import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; -import { OrganizationUserType } from 'jslib/enums/organizationUserType'; -import { PlanType } from 'jslib/enums/planType'; -import { PolicyType } from 'jslib/enums/policyType'; -import { ProductType } from 'jslib/enums/productType'; +import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType'; +import { OrganizationUserType } from 'jslib-common/enums/organizationUserType'; +import { PlanType } from 'jslib-common/enums/planType'; +import { PolicyType } from 'jslib-common/enums/policyType'; +import { ProductType } from 'jslib-common/enums/productType'; -import { OrganizationCreateRequest } from 'jslib/models/request/organizationCreateRequest'; -import { OrganizationKeysRequest } from 'jslib/models/request/organizationKeysRequest'; -import { OrganizationUpgradeRequest } from 'jslib/models/request/organizationUpgradeRequest'; +import { OrganizationCreateRequest } from 'jslib-common/models/request/organizationCreateRequest'; +import { OrganizationKeysRequest } from 'jslib-common/models/request/organizationKeysRequest'; +import { OrganizationUpgradeRequest } from 'jslib-common/models/request/organizationUpgradeRequest'; -import { PlanResponse } from 'jslib/models/response/planResponse'; +import { PlanResponse } from 'jslib-common/models/response/planResponse'; @Component({ selector: 'app-organization-plans', diff --git a/src/app/settings/organizations.component.ts b/src/app/settings/organizations.component.ts index f1a304f6ab..62e4d7e411 100644 --- a/src/app/settings/organizations.component.ts +++ b/src/app/settings/organizations.component.ts @@ -6,22 +6,22 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; -import { Policy } from 'jslib/models/domain/policy'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { Policy } from 'jslib-common/models/domain/policy'; -import { Utils } from 'jslib/misc/utils'; +import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib-common/models/request/organizationUserResetPasswordEnrollmentRequest'; -import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib/models/request/organizationUserResetPasswordEnrollmentRequest'; +import { Utils } from 'jslib-common/misc/utils'; -import { PolicyType } from 'jslib/enums/policyType'; +import { PolicyType } from 'jslib-common/enums/policyType'; @Component({ selector: 'app-organizations', diff --git a/src/app/settings/payment.component.ts b/src/app/settings/payment.component.ts index c06ba2caa4..9353ba24f0 100644 --- a/src/app/settings/payment.component.ts +++ b/src/app/settings/payment.component.ts @@ -4,10 +4,10 @@ import { OnInit, } from '@angular/core'; -import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { WebConstants } from '../../services/webConstants'; diff --git a/src/app/settings/premium.component.ts b/src/app/settings/premium.component.ts index 4d1c88c6dc..f0ca574fa0 100644 --- a/src/app/settings/premium.component.ts +++ b/src/app/settings/premium.component.ts @@ -7,13 +7,13 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { TokenService } from 'jslib/abstractions/token.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; import { PaymentComponent } from './payment.component'; import { TaxInfoComponent } from './tax-info.component'; diff --git a/src/app/settings/profile.component.ts b/src/app/settings/profile.component.ts index 2befd5f51d..0ec736a952 100644 --- a/src/app/settings/profile.component.ts +++ b/src/app/settings/profile.component.ts @@ -5,14 +5,14 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { UpdateProfileRequest } from 'jslib/models/request/updateProfileRequest'; +import { UpdateProfileRequest } from 'jslib-common/models/request/updateProfileRequest'; -import { ProfileResponse } from 'jslib/models/response/profileResponse'; +import { ProfileResponse } from 'jslib-common/models/response/profileResponse'; @Component({ selector: 'app-profile', diff --git a/src/app/settings/purge-vault.component.ts b/src/app/settings/purge-vault.component.ts index f5fa2defb7..3d77acfb9d 100644 --- a/src/app/settings/purge-vault.component.ts +++ b/src/app/settings/purge-vault.component.ts @@ -6,11 +6,11 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; @Component({ selector: 'app-purge-vault', diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 083c538bc7..9c934dfdab 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -5,10 +5,10 @@ import { OnInit, } from '@angular/core'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { TokenService } from 'jslib/abstractions/token.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; const BroadcasterSubscriptionId = 'SettingsComponent'; diff --git a/src/app/settings/tax-info.component.ts b/src/app/settings/tax-info.component.ts index a264caef1e..cc349cfe10 100644 --- a/src/app/settings/tax-info.component.ts +++ b/src/app/settings/tax-info.component.ts @@ -4,10 +4,10 @@ import { Output, } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { OrganizationTaxInfoUpdateRequest } from 'jslib/models/request/organizationTaxInfoUpdateRequest'; -import { TaxInfoUpdateRequest } from 'jslib/models/request/taxInfoUpdateRequest'; -import { TaxRateResponse } from 'jslib/models/response/taxRateResponse'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { OrganizationTaxInfoUpdateRequest } from 'jslib-common/models/request/organizationTaxInfoUpdateRequest'; +import { TaxInfoUpdateRequest } from 'jslib-common/models/request/taxInfoUpdateRequest'; +import { TaxRateResponse } from 'jslib-common/models/response/taxRateResponse'; @Component({ selector: 'app-tax-info', diff --git a/src/app/settings/two-factor-authenticator.component.ts b/src/app/settings/two-factor-authenticator.component.ts index 4da9a7cbb8..7e4e205167 100644 --- a/src/app/settings/two-factor-authenticator.component.ts +++ b/src/app/settings/two-factor-authenticator.component.ts @@ -6,15 +6,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { UpdateTwoFactorAuthenticatorRequest } from 'jslib/models/request/updateTwoFactorAuthenticatorRequest'; -import { TwoFactorAuthenticatorResponse } from 'jslib/models/response/twoFactorAuthenticatorResponse'; +import { UpdateTwoFactorAuthenticatorRequest } from 'jslib-common/models/request/updateTwoFactorAuthenticatorRequest'; +import { TwoFactorAuthenticatorResponse } from 'jslib-common/models/response/twoFactorAuthenticatorResponse'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; import { TwoFactorBaseComponent } from './two-factor-base.component'; diff --git a/src/app/settings/two-factor-base.component.ts b/src/app/settings/two-factor-base.component.ts index 6b31816153..a9fccd5781 100644 --- a/src/app/settings/two-factor-base.component.ts +++ b/src/app/settings/two-factor-base.component.ts @@ -6,12 +6,12 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; -import { TwoFactorProviderRequest } from 'jslib/models/request/twoFactorProviderRequest'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; +import { TwoFactorProviderRequest } from 'jslib-common/models/request/twoFactorProviderRequest'; @Directive() export abstract class TwoFactorBaseComponent { diff --git a/src/app/settings/two-factor-duo.component.ts b/src/app/settings/two-factor-duo.component.ts index 04319e4c3d..97d201175b 100644 --- a/src/app/settings/two-factor-duo.component.ts +++ b/src/app/settings/two-factor-duo.component.ts @@ -2,13 +2,13 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; -import { UpdateTwoFactorDuoRequest } from 'jslib/models/request/updateTwoFactorDuoRequest'; -import { TwoFactorDuoResponse } from 'jslib/models/response/twoFactorDuoResponse'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; +import { UpdateTwoFactorDuoRequest } from 'jslib-common/models/request/updateTwoFactorDuoRequest'; +import { TwoFactorDuoResponse } from 'jslib-common/models/response/twoFactorDuoResponse'; import { TwoFactorBaseComponent } from './two-factor-base.component'; diff --git a/src/app/settings/two-factor-email.component.ts b/src/app/settings/two-factor-email.component.ts index aaa12e8bbe..bac4e87167 100644 --- a/src/app/settings/two-factor-email.component.ts +++ b/src/app/settings/two-factor-email.component.ts @@ -2,16 +2,16 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { TwoFactorEmailRequest } from 'jslib/models/request/twoFactorEmailRequest'; +import { TwoFactorEmailRequest } from 'jslib-common/models/request/twoFactorEmailRequest'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; -import { UpdateTwoFactorEmailRequest } from 'jslib/models/request/updateTwoFactorEmailRequest'; -import { TwoFactorEmailResponse } from 'jslib/models/response/twoFactorEmailResponse'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; +import { UpdateTwoFactorEmailRequest } from 'jslib-common/models/request/updateTwoFactorEmailRequest'; +import { TwoFactorEmailResponse } from 'jslib-common/models/response/twoFactorEmailResponse'; import { TwoFactorBaseComponent } from './two-factor-base.component'; diff --git a/src/app/settings/two-factor-recovery.component.ts b/src/app/settings/two-factor-recovery.component.ts index de18a68709..bf28157b2a 100644 --- a/src/app/settings/two-factor-recovery.component.ts +++ b/src/app/settings/two-factor-recovery.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { TwoFactorRecoverResponse } from 'jslib/models/response/twoFactorRescoverResponse'; +import { TwoFactorRecoverResponse } from 'jslib-common/models/response/twoFactorRescoverResponse'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; @Component({ selector: 'app-two-factor-recovery', diff --git a/src/app/settings/two-factor-setup.component.ts b/src/app/settings/two-factor-setup.component.ts index 58aeac7858..a0d32f2a20 100644 --- a/src/app/settings/two-factor-setup.component.ts +++ b/src/app/settings/two-factor-setup.component.ts @@ -7,15 +7,15 @@ import { ViewContainerRef, } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { TwoFactorProviders } from 'jslib/services/auth.service'; +import { TwoFactorProviders } from 'jslib-common/services/auth.service'; -import { PolicyType } from 'jslib/enums/policyType'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { PolicyType } from 'jslib-common/enums/policyType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; import { ModalComponent } from '../modal.component'; diff --git a/src/app/settings/two-factor-verify.component.ts b/src/app/settings/two-factor-verify.component.ts index 6c55a95fd3..611c782f14 100644 --- a/src/app/settings/two-factor-verify.component.ts +++ b/src/app/settings/two-factor-verify.component.ts @@ -7,13 +7,13 @@ import { import { ToasterService } from 'angular2-toaster'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; @Component({ selector: 'app-two-factor-verify', diff --git a/src/app/settings/two-factor-webauthn.component.ts b/src/app/settings/two-factor-webauthn.component.ts index f0e78ed889..95257f0cba 100644 --- a/src/app/settings/two-factor-webauthn.component.ts +++ b/src/app/settings/two-factor-webauthn.component.ts @@ -5,19 +5,19 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; -import { PasswordVerificationRequest } from 'jslib/models/request/passwordVerificationRequest'; -import { UpdateTwoFactorWebAuthnDeleteRequest } from 'jslib/models/request/updateTwoFactorWebAuthnDeleteRequest'; -import { UpdateTwoFactorWebAuthnRequest } from 'jslib/models/request/updateTwoFactorWebAuthnRequest'; +import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest'; +import { UpdateTwoFactorWebAuthnDeleteRequest } from 'jslib-common/models/request/updateTwoFactorWebAuthnDeleteRequest'; +import { UpdateTwoFactorWebAuthnRequest } from 'jslib-common/models/request/updateTwoFactorWebAuthnRequest'; import { ChallengeResponse, TwoFactorWebAuthnResponse, -} from 'jslib/models/response/twoFactorWebAuthnResponse'; +} from 'jslib-common/models/response/twoFactorWebAuthnResponse'; import { TwoFactorBaseComponent } from './two-factor-base.component'; diff --git a/src/app/settings/two-factor-yubikey.component.ts b/src/app/settings/two-factor-yubikey.component.ts index 2eed914f8d..f0055eca7f 100644 --- a/src/app/settings/two-factor-yubikey.component.ts +++ b/src/app/settings/two-factor-yubikey.component.ts @@ -2,14 +2,14 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { UpdateTwoFactorYubioOtpRequest } from 'jslib/models/request/updateTwoFactorYubioOtpRequest'; -import { TwoFactorYubiKeyResponse } from 'jslib/models/response/twoFactorYubiKeyResponse'; +import { UpdateTwoFactorYubioOtpRequest } from 'jslib-common/models/request/updateTwoFactorYubioOtpRequest'; +import { TwoFactorYubiKeyResponse } from 'jslib-common/models/response/twoFactorYubiKeyResponse'; -import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; +import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; import { TwoFactorBaseComponent } from './two-factor-base.component'; diff --git a/src/app/settings/update-key.component.ts b/src/app/settings/update-key.component.ts index 9eee05df8d..4bb83610cb 100644 --- a/src/app/settings/update-key.component.ts +++ b/src/app/settings/update-key.component.ts @@ -5,19 +5,19 @@ import { ToasterService, } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; -import { EncString } from 'jslib/models/domain/encString'; +import { EncString } from 'jslib-common/models/domain/encString'; -import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest'; -import { FolderWithIdRequest } from 'jslib/models/request/folderWithIdRequest'; -import { UpdateKeyRequest } from 'jslib/models/request/updateKeyRequest'; +import { CipherWithIdRequest } from 'jslib-common/models/request/cipherWithIdRequest'; +import { FolderWithIdRequest } from 'jslib-common/models/request/folderWithIdRequest'; +import { UpdateKeyRequest } from 'jslib-common/models/request/updateKeyRequest'; @Component({ selector: 'app-update-key', diff --git a/src/app/settings/update-license.component.ts b/src/app/settings/update-license.component.ts index 5db31e5938..be4700494c 100644 --- a/src/app/settings/update-license.component.ts +++ b/src/app/settings/update-license.component.ts @@ -7,8 +7,8 @@ import { import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; @Component({ selector: 'app-update-license', diff --git a/src/app/settings/user-billing.component.ts b/src/app/settings/user-billing.component.ts index 1cc5685372..4415193068 100644 --- a/src/app/settings/user-billing.component.ts +++ b/src/app/settings/user-billing.component.ts @@ -5,15 +5,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { BillingResponse } from 'jslib/models/response/billingResponse'; +import { BillingResponse } from 'jslib-common/models/response/billingResponse'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { PaymentMethodType } from 'jslib/enums/paymentMethodType'; -import { TransactionType } from 'jslib/enums/transactionType'; -import { VerifyBankRequest } from 'jslib/models/request/verifyBankRequest'; +import { PaymentMethodType } from 'jslib-common/enums/paymentMethodType'; +import { TransactionType } from 'jslib-common/enums/transactionType'; +import { VerifyBankRequest } from 'jslib-common/models/request/verifyBankRequest'; @Component({ selector: 'app-user-billing', diff --git a/src/app/settings/user-subscription.component.ts b/src/app/settings/user-subscription.component.ts index 2864305657..a2fecbd2df 100644 --- a/src/app/settings/user-subscription.component.ts +++ b/src/app/settings/user-subscription.component.ts @@ -6,12 +6,12 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { SubscriptionResponse } from 'jslib/models/response/subscriptionResponse'; +import { SubscriptionResponse } from 'jslib-common/models/response/subscriptionResponse'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { TokenService } from 'jslib/abstractions/token.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; @Component({ selector: 'app-user-subscription', diff --git a/src/app/settings/verify-email.component.ts b/src/app/settings/verify-email.component.ts index a92d5841c9..798a1cfff5 100644 --- a/src/app/settings/verify-email.component.ts +++ b/src/app/settings/verify-email.component.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; @Component({ selector: 'app-verify-email', diff --git a/src/app/tools/breach-report.component.ts b/src/app/tools/breach-report.component.ts index 8efddd950a..a7a0bee3a6 100644 --- a/src/app/tools/breach-report.component.ts +++ b/src/app/tools/breach-report.component.ts @@ -3,9 +3,9 @@ import { OnInit, } from '@angular/core'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { UserService } from 'jslib/abstractions/user.service'; -import { BreachAccountResponse } from 'jslib/models/response/breachAccountResponse'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; +import { BreachAccountResponse } from 'jslib-common/models/response/breachAccountResponse'; @Component({ selector: 'app-breach-report', diff --git a/src/app/tools/cipher-report.component.ts b/src/app/tools/cipher-report.component.ts index 75cbab4de1..d92d625938 100644 --- a/src/app/tools/cipher-report.component.ts +++ b/src/app/tools/cipher-report.component.ts @@ -5,16 +5,16 @@ import { ViewContainerRef, } from '@angular/core'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; import { ModalComponent } from '../modal.component'; import { AddEditComponent as OrgAddEditComponent } from '../organizations/vault/add-edit.component'; import { AddEditComponent } from '../vault/add-edit.component'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Directive() export class CipherReportComponent { diff --git a/src/app/tools/export.component.ts b/src/app/tools/export.component.ts index 9d43a7674b..6c35bff841 100644 --- a/src/app/tools/export.component.ts +++ b/src/app/tools/export.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { ExportService } from 'jslib/abstractions/export.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { ExportService } from 'jslib-common/abstractions/export.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { ExportComponent as BaseExportComponent } from 'jslib/angular/components/export.component'; +import { ExportComponent as BaseExportComponent } from 'jslib-angular/components/export.component'; @Component({ selector: 'app-export', diff --git a/src/app/tools/exposed-passwords-report.component.ts b/src/app/tools/exposed-passwords-report.component.ts index 9e805d6adc..bd9dad0aa7 100644 --- a/src/app/tools/exposed-passwords-report.component.ts +++ b/src/app/tools/exposed-passwords-report.component.ts @@ -4,14 +4,14 @@ import { OnInit, } from '@angular/core'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; import { CipherReportComponent } from './cipher-report.component'; diff --git a/src/app/tools/import.component.ts b/src/app/tools/import.component.ts index bac771d023..d6e6bc442b 100644 --- a/src/app/tools/import.component.ts +++ b/src/app/tools/import.component.ts @@ -6,9 +6,9 @@ import { Router } from '@angular/router'; import { ToasterService } from 'angular2-toaster'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { ImportOption, ImportService } from 'jslib/abstractions/import.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { ImportOption, ImportService } from 'jslib-common/abstractions/import.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import Swal, { SweetAlertIcon } from 'sweetalert2'; diff --git a/src/app/tools/inactive-two-factor-report.component.ts b/src/app/tools/inactive-two-factor-report.component.ts index ca794ce9ab..4c25eb9a2b 100644 --- a/src/app/tools/inactive-two-factor-report.component.ts +++ b/src/app/tools/inactive-two-factor-report.component.ts @@ -4,15 +4,15 @@ import { OnInit, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; -import { Utils } from 'jslib/misc/utils'; +import { Utils } from 'jslib-common/misc/utils'; import { CipherReportComponent } from './cipher-report.component'; diff --git a/src/app/tools/password-generator-history.component.ts b/src/app/tools/password-generator-history.component.ts index 85732f2ba0..537c39175e 100644 --- a/src/app/tools/password-generator-history.component.ts +++ b/src/app/tools/password-generator-history.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent, -} from 'jslib/angular/components/password-generator-history.component'; +} from 'jslib-angular/components/password-generator-history.component'; @Component({ selector: 'app-password-generator-history', diff --git a/src/app/tools/password-generator.component.ts b/src/app/tools/password-generator.component.ts index ab9732f31c..11fb431867 100644 --- a/src/app/tools/password-generator.component.ts +++ b/src/app/tools/password-generator.component.ts @@ -5,13 +5,13 @@ import { ViewContainerRef, } from '@angular/core'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PasswordGeneratorComponent as BasePasswordGeneratorComponent, -} from 'jslib/angular/components/password-generator.component'; +} from 'jslib-angular/components/password-generator.component'; import { ModalComponent } from '../modal.component'; import { PasswordGeneratorHistoryComponent } from './password-generator-history.component'; diff --git a/src/app/tools/reused-passwords-report.component.ts b/src/app/tools/reused-passwords-report.component.ts index fd5c6fe3cb..d96c15e524 100644 --- a/src/app/tools/reused-passwords-report.component.ts +++ b/src/app/tools/reused-passwords-report.component.ts @@ -4,13 +4,13 @@ import { OnInit, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; import { CipherReportComponent } from './cipher-report.component'; diff --git a/src/app/tools/tools.component.ts b/src/app/tools/tools.component.ts index f9ecdbe7a1..f4b5edf0e6 100644 --- a/src/app/tools/tools.component.ts +++ b/src/app/tools/tools.component.ts @@ -3,8 +3,8 @@ import { OnInit, } from '@angular/core'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; @Component({ selector: 'app-tools', diff --git a/src/app/tools/unsecured-websites-report.component.ts b/src/app/tools/unsecured-websites-report.component.ts index 95e385b1f1..c745f07fdb 100644 --- a/src/app/tools/unsecured-websites-report.component.ts +++ b/src/app/tools/unsecured-websites-report.component.ts @@ -4,13 +4,13 @@ import { OnInit, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherReportComponent } from './cipher-report.component'; diff --git a/src/app/tools/weak-passwords-report.component.ts b/src/app/tools/weak-passwords-report.component.ts index 6e61ffe865..792f0f6bab 100644 --- a/src/app/tools/weak-passwords-report.component.ts +++ b/src/app/tools/weak-passwords-report.component.ts @@ -4,14 +4,14 @@ import { OnInit, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; import { CipherReportComponent } from './cipher-report.component'; diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts index 851a78d2e2..5ae74338c9 100644 --- a/src/app/vault/add-edit.component.ts +++ b/src/app/vault/add-edit.component.ts @@ -1,24 +1,24 @@ import { Component } from '@angular/core'; -import { CipherType } from 'jslib/enums/cipherType'; -import { EventType } from 'jslib/enums/eventType'; +import { CipherType } from 'jslib-common/enums/cipherType'; +import { EventType } from 'jslib-common/enums/eventType'; -import { AuditService } from 'jslib/abstractions/audit.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { PolicyService } from 'jslib/abstractions/policy.service'; -import { StateService } from 'jslib/abstractions/state.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { AuditService } from 'jslib-common/abstractions/audit.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib-common/abstractions/policy.service'; +import { StateService } from 'jslib-common/abstractions/state.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component'; -import { LoginUriView } from 'jslib/models/view/loginUriView'; +import { AddEditComponent as BaseAddEditComponent } from 'jslib-angular/components/add-edit.component'; +import { LoginUriView } from 'jslib-common/models/view/loginUriView'; @Component({ selector: 'app-vault-add-edit', diff --git a/src/app/vault/attachments.component.ts b/src/app/vault/attachments.component.ts index 714f28cd10..a846f42ba4 100644 --- a/src/app/vault/attachments.component.ts +++ b/src/app/vault/attachments.component.ts @@ -1,15 +1,15 @@ import { Component } from '@angular/core'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { AttachmentView } from 'jslib/models/view/attachmentView'; +import { AttachmentView } from 'jslib-common/models/view/attachmentView'; -import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib/angular/components/attachments.component'; +import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib-angular/components/attachments.component'; @Component({ selector: 'app-vault-attachments', diff --git a/src/app/vault/bulk-actions.component.ts b/src/app/vault/bulk-actions.component.ts index ce07a7dac1..5b2dfd5da5 100644 --- a/src/app/vault/bulk-actions.component.ts +++ b/src/app/vault/bulk-actions.component.ts @@ -7,11 +7,11 @@ import { } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; -import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service'; +import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; import { ModalComponent } from '../modal.component'; diff --git a/src/app/vault/bulk-delete.component.ts b/src/app/vault/bulk-delete.component.ts index 5b8fd183e0..1e11f58e28 100644 --- a/src/app/vault/bulk-delete.component.ts +++ b/src/app/vault/bulk-delete.component.ts @@ -6,12 +6,12 @@ import { } from '@angular/core'; import { ToasterService } from 'angular2-toaster'; -import { ApiService } from 'jslib/abstractions/api.service'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { ApiService } from 'jslib-common/abstractions/api.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherBulkDeleteRequest } from 'jslib/models/request/cipherBulkDeleteRequest'; +import { Organization } from 'jslib-common/models/domain/organization'; +import { CipherBulkDeleteRequest } from 'jslib-common/models/request/cipherBulkDeleteRequest'; @Component({ selector: 'app-vault-bulk-delete', diff --git a/src/app/vault/bulk-move.component.ts b/src/app/vault/bulk-move.component.ts index ad90644a1e..bee6528e4e 100644 --- a/src/app/vault/bulk-move.component.ts +++ b/src/app/vault/bulk-move.component.ts @@ -8,11 +8,11 @@ import { import { ToasterService } from 'angular2-toaster'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; -import { FolderView } from 'jslib/models/view/folderView'; +import { FolderView } from 'jslib-common/models/view/folderView'; @Component({ selector: 'app-vault-bulk-move', diff --git a/src/app/vault/bulk-restore.component.ts b/src/app/vault/bulk-restore.component.ts index f593ea772f..e18fdb7e37 100644 --- a/src/app/vault/bulk-restore.component.ts +++ b/src/app/vault/bulk-restore.component.ts @@ -7,8 +7,8 @@ import { import { ToasterService } from 'angular2-toaster'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; @Component({ selector: 'app-vault-bulk-restore', diff --git a/src/app/vault/bulk-share.component.ts b/src/app/vault/bulk-share.component.ts index d6335bcc1f..4697b64901 100644 --- a/src/app/vault/bulk-share.component.ts +++ b/src/app/vault/bulk-share.component.ts @@ -8,15 +8,15 @@ import { import { ToasterService } from 'angular2-toaster'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CipherView } from 'jslib/models/view'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CipherView } from 'jslib-common/models/view'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; -import { Organization } from 'jslib/models/domain/organization'; +import { Organization } from 'jslib-common/models/domain/organization'; @Component({ selector: 'app-vault-bulk-share', diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts index 505f9121e8..c1d5f1831b 100644 --- a/src/app/vault/ciphers.component.ts +++ b/src/app/vault/ciphers.component.ts @@ -8,22 +8,22 @@ import { import { ToasterService } from 'angular2-toaster'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { EventService } from 'jslib/abstractions/event.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SearchService } from 'jslib/abstractions/search.service'; -import { TotpService } from 'jslib/abstractions/totp.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { EventService } from 'jslib-common/abstractions/event.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SearchService } from 'jslib-common/abstractions/search.service'; +import { TotpService } from 'jslib-common/abstractions/totp.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CiphersComponent as BaseCiphersComponent } from 'jslib/angular/components/ciphers.component'; +import { CiphersComponent as BaseCiphersComponent } from 'jslib-angular/components/ciphers.component'; -import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; -import { CipherType } from 'jslib/enums/cipherType'; -import { EventType } from 'jslib/enums/eventType'; +import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType'; +import { CipherType } from 'jslib-common/enums/cipherType'; +import { EventType } from 'jslib-common/enums/eventType'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; const MaxCheckedCount = 500; diff --git a/src/app/vault/collections.component.ts b/src/app/vault/collections.component.ts index ad79a10528..14cca43fcc 100644 --- a/src/app/vault/collections.component.ts +++ b/src/app/vault/collections.component.ts @@ -3,14 +3,14 @@ import { OnDestroy, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; -import { CollectionsComponent as BaseCollectionsComponent } from 'jslib/angular/components/collections.component'; +import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/components/collections.component'; @Component({ selector: 'app-vault-collections', diff --git a/src/app/vault/folder-add-edit.component.ts b/src/app/vault/folder-add-edit.component.ts index e811b58b08..b1880c33c5 100644 --- a/src/app/vault/folder-add-edit.component.ts +++ b/src/app/vault/folder-add-edit.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { FolderAddEditComponent as BaseFolderAddEditComponent, -} from 'jslib/angular/components/folder-add-edit.component'; +} from 'jslib-angular/components/folder-add-edit.component'; @Component({ selector: 'app-folder-add-edit', diff --git a/src/app/vault/groupings.component.ts b/src/app/vault/groupings.component.ts index b335606b38..b9bd8ee8f8 100644 --- a/src/app/vault/groupings.component.ts +++ b/src/app/vault/groupings.component.ts @@ -4,12 +4,12 @@ import { Output, } from '@angular/core'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { FolderService } from 'jslib/abstractions/folder.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { FolderService } from 'jslib-common/abstractions/folder.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { GroupingsComponent as BaseGroupingsComponent } from 'jslib/angular/components/groupings.component'; +import { GroupingsComponent as BaseGroupingsComponent } from 'jslib-angular/components/groupings.component'; @Component({ selector: 'app-vault-groupings', diff --git a/src/app/vault/share.component.ts b/src/app/vault/share.component.ts index b3f6d92db4..f67e25b5d8 100644 --- a/src/app/vault/share.component.ts +++ b/src/app/vault/share.component.ts @@ -3,15 +3,15 @@ import { OnDestroy, } from '@angular/core'; -import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CollectionService } from 'jslib/abstractions/collection.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CipherService } from 'jslib-common/abstractions/cipher.service'; +import { CollectionService } from 'jslib-common/abstractions/collection.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { CollectionView } from 'jslib/models/view/collectionView'; +import { CollectionView } from 'jslib-common/models/view/collectionView'; -import { ShareComponent as BaseShareComponent } from 'jslib/angular/components/share.component'; +import { ShareComponent as BaseShareComponent } from 'jslib-angular/components/share.component'; @Component({ selector: 'app-vault-share', diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index 56f99588a3..41216eadff 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -13,9 +13,9 @@ import { Router, } from '@angular/router'; -import { CipherType } from 'jslib/enums/cipherType'; +import { CipherType } from 'jslib-common/enums/cipherType'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CipherView } from 'jslib-common/models/view/cipherView'; import { ModalComponent } from '../modal.component'; @@ -29,15 +29,15 @@ import { FolderAddEditComponent } from './folder-add-edit.component'; import { GroupingsComponent } from './groupings.component'; import { ShareComponent } from './share.component'; -import { CryptoService } from 'jslib/abstractions/crypto.service'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { SyncService } from 'jslib/abstractions/sync.service'; -import { TokenService } from 'jslib/abstractions/token.service'; -import { UserService } from 'jslib/abstractions/user.service'; +import { CryptoService } from 'jslib-common/abstractions/crypto.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { SyncService } from 'jslib-common/abstractions/sync.service'; +import { TokenService } from 'jslib-common/abstractions/token.service'; +import { UserService } from 'jslib-common/abstractions/user.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; const BroadcasterSubscriptionId = 'VaultComponent'; diff --git a/src/services/broadcasterMessaging.service.ts b/src/services/broadcasterMessaging.service.ts index ffb501c194..6cb2236297 100644 --- a/src/services/broadcasterMessaging.service.ts +++ b/src/services/broadcasterMessaging.service.ts @@ -1,6 +1,6 @@ -import { MessagingService } from 'jslib/abstractions/messaging.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; -import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { BroadcasterService } from 'jslib-angular/services/broadcaster.service'; export class BroadcasterMessagingService implements MessagingService { constructor(private broadcasterService: BroadcasterService) { } diff --git a/src/services/htmlStorage.service.ts b/src/services/htmlStorage.service.ts index fa065e96c2..53f9fa50f3 100644 --- a/src/services/htmlStorage.service.ts +++ b/src/services/htmlStorage.service.ts @@ -1,6 +1,6 @@ -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; -import { StorageService } from 'jslib/abstractions/storage.service'; -import { ConstantsService } from 'jslib/services'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; +import { ConstantsService } from 'jslib-common/services'; export class HtmlStorageService implements StorageService { private localStorageKeys = new Set(['appId', 'anonymousAppId', 'rememberedEmail', 'passwordGenerationOptions', diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index b3a787f89e..29765f446d 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -1,4 +1,4 @@ -import { I18nService as BaseI18nService } from 'jslib/services/i18n.service'; +import { I18nService as BaseI18nService } from 'jslib-common/services/i18n.service'; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/src/services/memoryStorage.service.ts b/src/services/memoryStorage.service.ts index 30b33c1160..6b4b546674 100644 --- a/src/services/memoryStorage.service.ts +++ b/src/services/memoryStorage.service.ts @@ -1,4 +1,4 @@ -import { StorageService } from 'jslib/abstractions/storage.service'; +import { StorageService } from 'jslib-common/abstractions/storage.service'; export class MemoryStorageService implements StorageService { private store = new Map(); diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts index 3f17b9874a..e3aeea39f5 100644 --- a/src/services/webPlatformUtils.service.ts +++ b/src/services/webPlatformUtils.service.ts @@ -1,11 +1,11 @@ import Swal, { SweetAlertIcon } from 'sweetalert2'; -import { DeviceType } from 'jslib/enums/deviceType'; +import { DeviceType } from 'jslib-common/enums/deviceType'; -import { I18nService } from 'jslib/abstractions/i18n.service'; -import { LogService } from 'jslib/abstractions/log.service'; -import { MessagingService } from 'jslib/abstractions/messaging.service'; -import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { LogService } from 'jslib-common/abstractions/log.service'; +import { MessagingService } from 'jslib-common/abstractions/messaging.service'; +import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; export class WebPlatformUtilsService implements PlatformUtilsService { identityClientId: string = 'web'; diff --git a/tsconfig.json b/tsconfig.json index 751b50f104..e16b590410 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,17 +15,24 @@ "baseUrl": ".", "paths": { "tldjs": [ - "jslib/src/misc/tldjs.noop" + "jslib/common/src/misc/tldjs.noop" ], - "jslib/*": [ - "jslib/src/*" + "jslib-common/*": [ + "jslib/common/src/*" + ], + "jslib-angular/*": [ + "jslib/angular/src/*" ] } }, "angularCompilerOptions": { "preserveWhitespaces": true }, + "files": [ + "src/app/polyfills.ts", + "src/app/main.ts" + ], "include": [ - "src" + "src/connectors/*.ts", ] } diff --git a/webpack.config.js b/webpack.config.js index 9aad213860..37a84a624f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -225,10 +225,6 @@ const webpackConfig = { }, resolve: { extensions: ['.ts', '.js'], - alias: { - jslib: path.join(__dirname, 'jslib/src'), - tldjs: path.join(__dirname, 'jslib/src/misc/tldjs.noop'), - }, symlinks: false, modules: [path.resolve('node_modules')], },