devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Add jslib as a "real" dependency (#1876) 

* Support split jslib

* Fix tests

* Bump jslib
This commit is contained in:
Oscar Hinton 2021-06-07 19:25:37 +02:00 committed by GitHub
parent c0f7251d77
commit 4e1958f417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 1076 additions and 1271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit ca61e13b57e32f1b4526c415573a03444247123a Subproject commit 1016bbfb9eb28c220de8d2ab86d1f2757328f254

3
karma.conf.js
View File

@ -55,7 +55,8 @@ module.exports = function(config) {
resolve: { resolve: {
extensions: ['.js', '.ts', '.tsx'], extensions: ['.js', '.ts', '.tsx'],
alias: { alias: {
jslib: path.join(__dirname, 'jslib/src'), "jslib-common": path.join(__dirname, 'jslib/common/src'),
"jslib-angular": path.join(__dirname, 'jslib/angular/src'),
}, },
}, },
module: { module: {

1368
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

45
package.json
View File

@ -5,7 +5,7 @@
"sub:init": "git submodule update --init --recursive", "sub:init": "git submodule update --init --recursive",
"sub:update": "git submodule update --remote", "sub:update": "git submodule update --remote",
"sub:pull": "git submodule foreach git pull origin master", "sub:pull": "git submodule foreach git pull origin master",
"postinstall": "npm run sub:init", "preinstall": "npm run sub:init",
"symlink:win": "rmdir /S /Q .\\jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:win": "rmdir /S /Q .\\jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:mac": "npm run symlink:lin", "symlink:mac": "npm run symlink:lin",
"symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
@ -30,16 +30,11 @@
"@angular/compiler-cli": "^11.2.11", "@angular/compiler-cli": "^11.2.11",
"@ngtools/webpack": "^11.2.10", "@ngtools/webpack": "^11.2.10",
"@types/chrome": "^0.0.139", "@types/chrome": "^0.0.139",
"@types/duo_web_sdk": "^2.7.0",
"@types/firefox-webext-browser": "^82.0.0", "@types/firefox-webext-browser": "^82.0.0",
"@types/jasmine": "^3.6.0", "@types/jasmine": "^3.7.6",
"@types/lunr": "^2.3.3", "@types/mousetrap": "^1.6.8",
"@types/mousetrap": "^1.6.7", "@types/node": "^14.17.2",
"@types/node": "^14.14.43",
"@types/node-forge": "^0.9.7",
"@types/tldjs": "^2.3.0",
"@types/webcrypto": "^0.0.28",
"@types/webpack": "^4.41.27",
"@types/zxcvbn": "^4.4.1",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.4.0", "copy-webpack-plugin": "^6.4.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
@ -64,6 +59,7 @@
"karma-jasmine-html-reporter": "^1.5.0", "karma-jasmine-html-reporter": "^1.5.0",
"karma-webpack": "^4.0.2", "karma-webpack": "^4.0.2",
"mini-css-extract-plugin": "^1.5.0", "mini-css-extract-plugin": "^1.5.0",
"sass": "^1.34.1",
"sass-loader": "^10.1.1", "sass-loader": "^10.1.1",
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"tapable": "^1.1.3", "tapable": "^1.1.3",
@ -75,40 +71,17 @@
"webpack-cli": "^4.6.0" "webpack-cli": "^4.6.0"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^11.2.11", "@bitwarden/jslib-angular": "file:jslib/angular",
"@angular/cdk": "^11.2.10", "@bitwarden/jslib-common": "file:jslib/common",
"@angular/common": "^11.2.11",
"@angular/compiler": "^11.2.11",
"@angular/core": "^11.2.11",
"@angular/forms": "^11.2.11",
"@angular/localize": "^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",
"@types/papaparse": "^5.2.5",
"angular2-toaster": "^11.0.1", "angular2-toaster": "^11.0.1",
"big-integer": "1.6.48",
"browser-hrtime": "^1.1.8",
"core-js": "^3.11.0", "core-js": "^3.11.0",
"date-input-polyfill": "^2.14.0", "date-input-polyfill": "^2.14.0",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"lunr": "^2.3.9",
"mousetrap": "^1.6.5", "mousetrap": "^1.6.5",
"ngx-infinite-scroll": "^10.0.1",
"node-forge": "0.10.0",
"nord": "^0.2.1", "nord": "^0.2.1",
"papaparse": "^5.3.0",
"rxjs": "^6.6.7",
"sass": "^1.32.11",
"sweetalert2": "^10.16.6", "sweetalert2": "^10.16.6",
"tldjs": "2.3.1", "web-animations-js": "^2.3.2"
"tslib": "^2.0.0",
"web-animations-js": "^2.3.2",
"zone.js": "^0.11.4",
"zxcvbn": "4.4.2"
}, },
"engines": { "engines": {
"node": "~14", "node": "~14",

6
src/background/commands.background.ts
View File

@ -2,9 +2,9 @@ import { BrowserApi } from '../browser/browserApi';
import MainBackground from './main.background'; import MainBackground from './main.background';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
export default class CommandsBackground { export default class CommandsBackground {
private isSafari: boolean; private isSafari: boolean;

14
src/background/contextMenus.background.ts
View File

@ -2,14 +2,14 @@ import { BrowserApi } from '../browser/browserApi';
import MainBackground from './main.background'; import MainBackground from './main.background';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { EventType } from 'jslib/enums/eventType'; import { EventType } from 'jslib-common/enums/eventType';
export default class ContextMenusBackground { export default class ContextMenusBackground {
private contextMenus: any; private contextMenus: any;

6
src/background/idle.background.ts
View File

@ -1,10 +1,10 @@
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { import {
StorageService, StorageService,
VaultTimeoutService, VaultTimeoutService,
} from 'jslib/abstractions'; } from 'jslib-common/abstractions';
import { NotificationsService } from 'jslib/abstractions/notifications.service'; import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
const IdleInterval = 60 * 5; // 5 minutes const IdleInterval = 60 * 5; // 5 minutes

48
src/background/main.background.ts
View File

@ -1,5 +1,5 @@
import { CipherType } from 'jslib/enums'; import { CipherType } from 'jslib-common/enums';
import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
import { import {
ApiService, ApiService,
@ -20,17 +20,17 @@ import {
TokenService, TokenService,
TotpService, TotpService,
UserService, UserService,
} from 'jslib/services'; } from 'jslib-common/services';
import { ConsoleLogService } from 'jslib/services/consoleLog.service'; import { ConsoleLogService } from 'jslib-common/services/consoleLog.service';
import { EventService } from 'jslib/services/event.service'; import { EventService } from 'jslib-common/services/event.service';
import { ExportService } from 'jslib/services/export.service'; import { ExportService } from 'jslib-common/services/export.service';
import { FileUploadService } from 'jslib/services/fileUpload.service'; import { FileUploadService } from 'jslib-common/services/fileUpload.service';
import { NotificationsService } from 'jslib/services/notifications.service'; import { NotificationsService } from 'jslib-common/services/notifications.service';
import { PolicyService } from 'jslib/services/policy.service'; import { PolicyService } from 'jslib-common/services/policy.service';
import { SearchService } from 'jslib/services/search.service'; import { SearchService } from 'jslib-common/services/search.service';
import { SendService } from 'jslib/services/send.service'; import { SendService } from 'jslib-common/services/send.service';
import { SystemService } from 'jslib/services/system.service'; import { SystemService } from 'jslib-common/services/system.service';
import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.service'; import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service';
import { import {
ApiService as ApiServiceAbstraction, ApiService as ApiServiceAbstraction,
@ -54,19 +54,19 @@ import {
TotpService as TotpServiceAbstraction, TotpService as TotpServiceAbstraction,
UserService as UserServiceAbstraction, UserService as UserServiceAbstraction,
VaultTimeoutService as VaultTimeoutServiceAbstraction, VaultTimeoutService as VaultTimeoutServiceAbstraction,
} from 'jslib/abstractions'; } from 'jslib-common/abstractions';
import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib-common/abstractions/cryptoFunction.service';
import { EventService as EventServiceAbstraction } from 'jslib/abstractions/event.service'; import { EventService as EventServiceAbstraction } from 'jslib-common/abstractions/event.service';
import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/export.service'; import { ExportService as ExportServiceAbstraction } from 'jslib-common/abstractions/export.service';
import { FileUploadService as FileUploadServiceAbstraction } from 'jslib/abstractions/fileUpload.service'; import { FileUploadService as FileUploadServiceAbstraction } from 'jslib-common/abstractions/fileUpload.service';
import { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service'; import { NotificationsService as NotificationsServiceAbstraction } from 'jslib-common/abstractions/notifications.service';
import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; import { PolicyService as PolicyServiceAbstraction } from 'jslib-common/abstractions/policy.service';
import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; import { SearchService as SearchServiceAbstraction } from 'jslib-common/abstractions/search.service';
import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service'; import { SendService as SendServiceAbstraction } from 'jslib-common/abstractions/send.service';
import { SystemService as SystemServiceAbstraction } from 'jslib/abstractions/system.service'; import { SystemService as SystemServiceAbstraction } from 'jslib-common/abstractions/system.service';
import { AutofillService as AutofillServiceAbstraction } from '../services/abstractions/autofill.service'; import { AutofillService as AutofillServiceAbstraction } from '../services/abstractions/autofill.service';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { BrowserApi } from '../browser/browserApi'; import { BrowserApi } from '../browser/browserApi';
import { SafariApp } from '../browser/safariApp'; import { SafariApp } from '../browser/safariApp';

24
src/background/nativeMessaging.background.ts
View File

@ -1,16 +1,16 @@
import { AppIdService } from 'jslib/abstractions/appId.service'; import { AppIdService } from 'jslib-common/abstractions/appId.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.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';
import { SymmetricCryptoKey } from 'jslib/models/domain'; import { SymmetricCryptoKey } from 'jslib-common/models/domain';
import { BrowserApi } from '../browser/browserApi'; import { BrowserApi } from '../browser/browserApi';
import RuntimeBackground from './runtime.background'; import RuntimeBackground from './runtime.background';

36
src/background/runtime.background.ts
View File

@ -1,20 +1,20 @@
import { CipherType } from 'jslib/enums'; import { CipherType } from 'jslib-common/enums';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { LoginUriView } from 'jslib/models/view/loginUriView'; import { LoginUriView } from 'jslib-common/models/view/loginUriView';
import { LoginView } from 'jslib/models/view/loginView'; import { LoginView } from 'jslib-common/models/view/loginView';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { NotificationsService } from 'jslib/abstractions/notifications.service'; import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SystemService } from 'jslib/abstractions/system.service'; import { SystemService } from 'jslib-common/abstractions/system.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.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 { AutofillService } from '../services/abstractions/autofill.service'; import { AutofillService } from '../services/abstractions/autofill.service';
import BrowserPlatformUtilsService from '../services/browserPlatformUtils.service'; import BrowserPlatformUtilsService from '../services/browserPlatformUtils.service';
@ -22,10 +22,10 @@ import { BrowserApi } from '../browser/browserApi';
import MainBackground from './main.background'; import MainBackground from './main.background';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType'; import { OrganizationUserStatusType } from 'jslib-common/enums/organizationUserStatusType';
import { PolicyType } from 'jslib/enums/policyType'; import { PolicyType } from 'jslib-common/enums/policyType';
export default class RuntimeBackground { export default class RuntimeBackground {
private runtime: any; private runtime: any;

8
src/background/webRequest.background.ts
View File

@ -1,8 +1,8 @@
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { UriMatchType } from 'jslib/enums'; import { UriMatchType } from 'jslib-common/enums';
export default class WebRequestBackground { export default class WebRequestBackground {
private pendingAuthRequests: any[] = []; private pendingAuthRequests: any[] = [];

2
src/browser/browserApi.ts
View File

@ -1,6 +1,6 @@
import { SafariApp } from './safariApp'; import { SafariApp } from './safariApp';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
export class BrowserApi { export class BrowserApi {
static isWebExtensionsApi: boolean = (typeof browser !== 'undefined'); static isWebExtensionsApi: boolean = (typeof browser !== 'undefined');

8
src/popup/accounts/environment.component.ts
View File

@ -1,11 +1,11 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { EnvironmentComponent as BaseEnvironmentComponent } from 'jslib/angular/components/environment.component'; import { EnvironmentComponent as BaseEnvironmentComponent } from 'jslib-angular/components/environment.component';
@Component({ @Component({
selector: 'app-environment', selector: 'app-environment',

8
src/popup/accounts/hint.component.ts
View File

@ -1,11 +1,11 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.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({ @Component({
selector: 'app-hint', selector: 'app-hint',

14
src/popup/accounts/home.component.ts
View File

@ -1,14 +1,14 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
@Component({ @Component({
selector: 'app-home', selector: 'app-home',

22
src/popup/accounts/lock.component.ts
View File

@ -1,18 +1,18 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component'; import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component';
import Swal from 'sweetalert2'; import Swal from 'sweetalert2';
@Component({ @Component({

20
src/popup/accounts/login.component.ts
View File

@ -1,17 +1,17 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component'; import { LoginComponent as BaseLoginComponent } from 'jslib-angular/components/login.component';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',

16
src/popup/accounts/register.component.ts
View File

@ -1,15 +1,15 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.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';
@Component({ @Component({
selector: 'app-register', selector: 'app-register',

20
src/popup/accounts/set-password.component.ts
View File

@ -5,19 +5,19 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { import {
SetPasswordComponent as BaseSetPasswordComponent, SetPasswordComponent as BaseSetPasswordComponent,
} from 'jslib/angular/components/set-password.component'; } from 'jslib-angular/components/set-password.component';
@Component({ @Component({
selector: 'app-set-password', selector: 'app-set-password',

22
src/popup/accounts/sso.component.ts
View File

@ -5,18 +5,18 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { SsoComponent as BaseSsoComponent } from 'jslib/angular/components/sso.component'; import { SsoComponent as BaseSsoComponent } from 'jslib-angular/components/sso.component';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
@Component({ @Component({

8
src/popup/accounts/two-factor-options.component.ts
View File

@ -1,13 +1,13 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent, TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent,
} from 'jslib/angular/components/two-factor-options.component'; } from 'jslib-angular/components/two-factor-options.component';
@Component({ @Component({
selector: 'app-two-factor-options', selector: 'app-two-factor-options',

24
src/popup/accounts/two-factor.component.ts
View File

@ -9,21 +9,21 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType'; import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component'; import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib-angular/components/two-factor.component';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';

2
src/popup/app-routing.module.ts
View File

@ -6,7 +6,7 @@ import {
Routes, Routes,
} from '@angular/router'; } from '@angular/router';
import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
import { LaunchGuardService } from './services/launch-guard.service'; import { LaunchGuardService } from './services/launch-guard.service';

16
src/popup/app.component.ts
View File

@ -22,16 +22,16 @@ import {
RouterOutlet, RouterOutlet,
} from '@angular/router'; } from '@angular/router';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { AuthService } from 'jslib/abstractions/auth.service'; import { AuthService } from 'jslib-common/abstractions/auth.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import BrowserPlatformUtilsService from 'src/services/browserPlatformUtils.service'; import BrowserPlatformUtilsService from 'src/services/browserPlatformUtils.service';
import { routerTransition } from './app-routing.animations'; import { routerTransition } from './app-routing.animations';

32
src/popup/app.module.ts
View File

@ -51,29 +51,29 @@ import { SendAddEditComponent } from './send/send-add-edit.component';
import { SendGroupingsComponent } from './send/send-groupings.component'; import { SendGroupingsComponent } from './send/send-groupings.component';
import { SendTypeComponent } from './send/send-type.component'; import { SendTypeComponent } from './send/send-type.component';
import { A11yTitleDirective } from 'jslib/angular/directives/a11y-title.directive'; import { A11yTitleDirective } from 'jslib-angular/directives/a11y-title.directive';
import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive'; import { ApiActionDirective } from 'jslib-angular/directives/api-action.directive';
import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive'; import { AutofocusDirective } from 'jslib-angular/directives/autofocus.directive';
import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive'; import { BlurClickDirective } from 'jslib-angular/directives/blur-click.directive';
import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive'; import { BoxRowDirective } from 'jslib-angular/directives/box-row.directive';
import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive'; import { FallbackSrcDirective } from 'jslib-angular/directives/fallback-src.directive';
import { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.directive'; import { InputVerbatimDirective } from 'jslib-angular/directives/input-verbatim.directive';
import { SelectCopyDirective } from 'jslib/angular/directives/select-copy.directive'; import { SelectCopyDirective } from 'jslib-angular/directives/select-copy.directive';
import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive'; import { StopClickDirective } from 'jslib-angular/directives/stop-click.directive';
import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive'; import { StopPropDirective } from 'jslib-angular/directives/stop-prop.directive';
import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive'; import { TrueFalseValueDirective } from 'jslib-angular/directives/true-false-value.directive';
import { ColorPasswordPipe } from 'jslib/angular/pipes/color-password.pipe'; import { ColorPasswordPipe } from 'jslib-angular/pipes/color-password.pipe';
import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe'; import { I18nPipe } from 'jslib-angular/pipes/i18n.pipe';
import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; import { SearchCiphersPipe } from 'jslib-angular/pipes/search-ciphers.pipe';
import { ActionButtonsComponent } from './components/action-buttons.component'; import { ActionButtonsComponent } from './components/action-buttons.component';
import { CiphersListComponent } from './components/ciphers-list.component'; import { CiphersListComponent } from './components/ciphers-list.component';
import { PopOutComponent } from './components/pop-out.component'; import { PopOutComponent } from './components/pop-out.component';
import { SendListComponent } from './components/send-list.component'; import { SendListComponent } from './components/send-list.component';
import { CalloutComponent } from 'jslib/angular/components/callout.component'; import { CalloutComponent } from 'jslib-angular/components/callout.component';
import { IconComponent } from 'jslib/angular/components/icon.component'; import { IconComponent } from 'jslib-angular/components/icon.component';
import { import {
CurrencyPipe, CurrencyPipe,

20
src/popup/components/action-buttons.component.ts
View File

@ -7,18 +7,18 @@ import {
import { ToasterService } from 'angular2-toaster'; import { ToasterService } from 'angular2-toaster';
import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
import { CipherType } from 'jslib/enums/cipherType'; import { CipherType } from 'jslib-common/enums/cipherType';
import { EventType } from 'jslib/enums/eventType'; import { EventType } from 'jslib-common/enums/eventType';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
@Component({ @Component({
selector: 'app-action-buttons', selector: 'app-action-buttons',

4
src/popup/components/ciphers-list.component.ts
View File

@ -5,9 +5,9 @@ import {
Output, Output,
} from '@angular/core'; } from '@angular/core';
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';
@Component({ @Component({
selector: 'app-ciphers-list', selector: 'app-ciphers-list',

2
src/popup/components/pop-out.component.ts
View File

@ -4,7 +4,7 @@ import {
OnInit, OnInit,
} from '@angular/core'; } from '@angular/core';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';

4
src/popup/components/send-list.component.ts
View File

@ -5,9 +5,9 @@ import {
Output, Output,
} from '@angular/core'; } from '@angular/core';
import { SendView } from 'jslib/models/view/sendView'; import { SendView } from 'jslib-common/models/view/sendView';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
@Component({ @Component({
selector: 'app-send-list', selector: 'app-send-list',

12
src/popup/dummy.module.ts
View File

@ -1,12 +0,0 @@
import { NgModule } from '@angular/core';
import { SearchPipe } from 'jslib/angular/pipes/search.pipe';
@NgModule({
imports: [],
declarations: [
SearchPipe,
],
})
export class DummyModule {
}

8
src/popup/generator/password-generator-history.component.ts
View File

@ -1,13 +1,13 @@
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent, PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent,
} from 'jslib/angular/components/password-generator-history.component'; } from 'jslib-angular/components/password-generator-history.component';
@Component({ @Component({
selector: 'app-password-generator-history', selector: 'app-password-generator-history',

12
src/popup/generator/password-generator.component.ts
View File

@ -1,16 +1,16 @@
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib-common/models/view/cipherView';
import { import {
PasswordGeneratorComponent as BasePasswordGeneratorComponent, PasswordGeneratorComponent as BasePasswordGeneratorComponent,
} from 'jslib/angular/components/password-generator.component'; } from 'jslib-angular/components/password-generator.component';
@Component({ @Component({
selector: 'app-password-generator', selector: 'app-password-generator',

18
src/popup/send/send-add-edit.component.ts
View File

@ -10,18 +10,18 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { TokenService } from 'jslib/abstractions/token.service'; import { TokenService } from 'jslib-common/abstractions/token.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.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({ @Component({
selector: 'app-send-add-edit', selector: 'app-send-add-edit',

26
src/popup/send/send-groupings.component.ts
View File

@ -8,25 +8,25 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
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 { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.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 { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
const ComponentId = 'SendComponent'; const ComponentId = 'SendComponent';
const ScopeStateId = ComponentId + 'Scope'; const ScopeStateId = ComponentId + 'Scope';

24
src/popup/send/send-type.component.ts
View File

@ -11,24 +11,24 @@ import {
import { Location } from '@angular/common'; import { Location } from '@angular/common';
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 { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { UserService } from 'jslib/abstractions/user.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 { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib-common/enums/sendType';
const ComponentId = 'SendTypeComponent'; const ComponentId = 'SendTypeComponent';

4
src/popup/services/launch-guard.service.ts
View File

@ -6,8 +6,8 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
@Injectable() @Injectable()
export class LaunchGuardService implements CanActivate { export class LaunchGuardService implements CanActivate {

8
src/popup/services/popup-search.service.ts
View File

@ -1,8 +1,8 @@
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { ConsoleLogService } from 'jslib/services/consoleLog.service'; import { ConsoleLogService } from 'jslib-common/services/consoleLog.service';
import { SearchService } from 'jslib/services/search.service'; import { SearchService } from 'jslib-common/services/search.service';
export class PopupSearchService extends SearchService { export class PopupSearchService extends SearchService {
constructor(private mainSearchService: SearchService, cipherService: CipherService, constructor(private mainSearchService: SearchService, cipherService: CipherService,

2
src/popup/services/popup-utils.service.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
@Injectable() @Injectable()
export class PopupUtilsService { export class PopupUtilsService {

78
src/popup/services/services.module.ts
View File

@ -8,52 +8,52 @@ import { ToasterModule } from 'angular2-toaster';
import { LaunchGuardService } from './launch-guard.service'; import { LaunchGuardService } from './launch-guard.service';
import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { ValidationService } from 'jslib/angular/services/validation.service'; import { ValidationService } from 'jslib-angular/services/validation.service';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AppIdService } from 'jslib/abstractions/appId.service'; import { AppIdService } from 'jslib-common/abstractions/appId.service';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { AuthService as AuthServiceAbstraction } from 'jslib/abstractions/auth.service'; import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoFunctionService } from 'jslib-common/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { ExportService } from 'jslib/abstractions/export.service'; import { ExportService } from 'jslib-common/abstractions/export.service';
import { FileUploadService } from 'jslib/abstractions/fileUpload.service'; import { FileUploadService } from 'jslib-common/abstractions/fileUpload.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { NotificationsService } from 'jslib/abstractions/notifications.service'; import { NotificationsService } from 'jslib-common/abstractions/notifications.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service';
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; import { SearchService as SearchServiceAbstraction } from 'jslib-common/abstractions/search.service';
import { SendService } from 'jslib/abstractions/send.service'; import { SendService } from 'jslib-common/abstractions/send.service';
import { SettingsService } from 'jslib/abstractions/settings.service'; import { SettingsService } from 'jslib-common/abstractions/settings.service';
import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; import { StateService as StateServiceAbstraction } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { TokenService } from 'jslib/abstractions/token.service'; import { TokenService } from 'jslib-common/abstractions/token.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { PasswordRepromptService } from 'jslib/services/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/services/passwordReprompt.service';
import { AutofillService } from '../../services/abstractions/autofill.service'; import { AutofillService } from '../../services/abstractions/autofill.service';
import BrowserMessagingService from '../../services/browserMessaging.service'; import BrowserMessagingService from '../../services/browserMessaging.service';
import { AuthService } from 'jslib/services/auth.service'; import { AuthService } from 'jslib-common/services/auth.service';
import { ConsoleLogService } from 'jslib/services/consoleLog.service'; import { ConsoleLogService } from 'jslib-common/services/consoleLog.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { SearchService } from 'jslib/services/search.service'; import { SearchService } from 'jslib-common/services/search.service';
import { StateService } from 'jslib/services/state.service'; import { StateService } from 'jslib-common/services/state.service';
import { PopupSearchService } from './popup-search.service'; import { PopupSearchService } from './popup-search.service';
import { PopupUtilsService } from './popup-utils.service'; import { PopupUtilsService } from './popup-utils.service';

12
src/popup/settings/excluded-domains.component.ts
View File

@ -7,17 +7,17 @@ import {
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
interface ExcludedDomain { interface ExcludedDomain {
uri: string; uri: string;

12
src/popup/settings/export.component.ts
View File

@ -1,13 +1,13 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { ExportService } from 'jslib/abstractions/export.service'; import { ExportService } from 'jslib-common/abstractions/export.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.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({ @Component({
selector: 'app-export', selector: 'app-export',

8
src/popup/settings/folder-add-edit.component.ts
View File

@ -4,13 +4,13 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
FolderAddEditComponent as BaseFolderAddEditComponent, FolderAddEditComponent as BaseFolderAddEditComponent,
} from 'jslib/angular/components/folder-add-edit.component'; } from 'jslib-angular/components/folder-add-edit.component';
@Component({ @Component({
selector: 'app-folder-add-edit', selector: 'app-folder-add-edit',

4
src/popup/settings/folders.component.ts
View File

@ -4,9 +4,9 @@ import {
} from '@angular/core'; } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
@Component({ @Component({
selector: 'app-folders', selector: 'app-folders',

18
src/popup/settings/options.component.ts
View File

@ -3,15 +3,15 @@ import {
OnInit, OnInit,
} from '@angular/core'; } from '@angular/core';
import { UriMatchType } from 'jslib/enums/uriMatchType'; import { UriMatchType } from 'jslib-common/enums/uriMatchType';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
@Component({ @Component({
selector: 'app-options', selector: 'app-options',
@ -69,13 +69,13 @@ export class OptionsComponent implements OnInit {
this.autoFillOnPageLoadOptions = [ this.autoFillOnPageLoadOptions = [
{ name: i18nService.t('autoFillOnPageLoadYes'), value: true }, { name: i18nService.t('autoFillOnPageLoadYes'), value: true },
{ name: i18nService.t('autoFillOnPageLoadNo'), value: false }, { name: i18nService.t('autoFillOnPageLoadNo'), value: false },
] ];
} }
async ngOnInit() { async ngOnInit() {
this.enableAutoFillOnPageLoad = await this.storageService.get<boolean>( this.enableAutoFillOnPageLoad = await this.storageService.get<boolean>(
ConstantsService.enableAutoFillOnPageLoadKey); ConstantsService.enableAutoFillOnPageLoadKey);
this.autoFillOnPageLoadDefault = await this.storageService.get<boolean>( this.autoFillOnPageLoadDefault = await this.storageService.get<boolean>(
ConstantsService.autoFillOnPageLoadDefaultKey) ?? true; ConstantsService.autoFillOnPageLoadDefaultKey) ?? true;

10
src/popup/settings/premium.component.ts
View File

@ -1,12 +1,12 @@
import { CurrencyPipe } from '@angular/common'; import { CurrencyPipe } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { PremiumComponent as BasePremiumComponent } from 'jslib/angular/components/premium.component'; import { PremiumComponent as BasePremiumComponent } from 'jslib-angular/components/premium.component';
@Component({ @Component({
selector: 'app-premium', selector: 'app-premium',

20
src/popup/settings/settings.component.ts
View File

@ -10,18 +10,18 @@ import { Router } from '@angular/router';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { DeviceType } from 'jslib/enums/deviceType'; import { DeviceType } from 'jslib-common/enums/deviceType';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
const RateUrls = { const RateUrls = {

4
src/popup/settings/sync.component.ts
View File

@ -5,8 +5,8 @@ import {
OnInit, OnInit,
} from '@angular/core'; } from '@angular/core';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
@Component({ @Component({
selector: 'app-sync', selector: 'app-sync',

32
src/popup/vault/add-edit.component.ts
View File

@ -7,27 +7,27 @@ import {
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib-common/abstractions/policy.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { UserService } from 'jslib/abstractions/user.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { ConstantsService } from 'jslib-common/services/constants.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
import { ConstantsService } from 'jslib/services/constants.service';
import { LoginUriView } from 'jslib/models/view/loginUriView'; import { LoginUriView } from 'jslib-common/models/view/loginUriView';
import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/add-edit.component'; import { AddEditComponent as BaseAddEditComponent } from 'jslib-angular/components/add-edit.component';
import { CipherType } from 'jslib/enums/cipherType'; import { CipherType } from 'jslib-common/enums/cipherType';
@Component({ @Component({
selector: 'app-vault-add-edit', selector: 'app-vault-add-edit',

14
src/popup/vault/attachments.component.ts
View File

@ -2,14 +2,14 @@ import { Location } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib/angular/components/attachments.component'; import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib-angular/components/attachments.component';
@Component({ @Component({
selector: 'app-vault-attachments', selector: 'app-vault-attachments',

28
src/popup/vault/ciphers.component.ts
View File

@ -13,25 +13,25 @@ import {
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.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 { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { TreeNode } from 'jslib/models/domain/treeNode'; import { TreeNode } from 'jslib-common/models/domain/treeNode';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { CiphersComponent as BaseCiphersComponent } from 'jslib/angular/components/ciphers.component'; import { CiphersComponent as BaseCiphersComponent } from 'jslib-angular/components/ciphers.component';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';

10
src/popup/vault/collections.component.ts
View File

@ -2,12 +2,12 @@ import { Location } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { CollectionsComponent as BaseCollectionsComponent } from 'jslib/angular/components/collections.component'; import { CollectionsComponent as BaseCollectionsComponent } from 'jslib-angular/components/collections.component';
@Component({ @Component({
selector: 'app-vault-collections', selector: 'app-vault-collections',

26
src/popup/vault/current-tab.component.ts
View File

@ -12,28 +12,28 @@ import { ToasterService } from 'angular2-toaster';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
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 { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { AutofillService } from '../../services/abstractions/autofill.service'; import { AutofillService } from '../../services/abstractions/autofill.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
const BroadcasterSubscriptionId = 'CurrentTabComponent'; const BroadcasterSubscriptionId = 'CurrentTabComponent';

30
src/popup/vault/groupings.component.ts
View File

@ -13,25 +13,25 @@ import {
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
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 { CollectionView } from 'jslib/models/view/collectionView'; import { CollectionView } from 'jslib-common/models/view/collectionView';
import { FolderView } from 'jslib/models/view/folderView'; import { FolderView } from 'jslib-common/models/view/folderView';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { FolderService } from 'jslib/abstractions/folder.service'; import { FolderService } from 'jslib-common/abstractions/folder.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { SearchService } from 'jslib/abstractions/search.service'; import { SearchService } from 'jslib-common/abstractions/search.service';
import { StateService } from 'jslib/abstractions/state.service'; import { StateService } from 'jslib-common/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib-common/abstractions/sync.service';
import { UserService } from 'jslib/abstractions/user.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 { GroupingsComponent as BaseGroupingsComponent } from 'jslib/angular/components/groupings.component'; import { GroupingsComponent as BaseGroupingsComponent } from 'jslib-angular/components/groupings.component';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';

8
src/popup/vault/password-history.component.ts
View File

@ -2,13 +2,13 @@ import { Location } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { import {
PasswordHistoryComponent as BasePasswordHistoryComponent, PasswordHistoryComponent as BasePasswordHistoryComponent,
} from 'jslib/angular/components/password-history.component'; } from 'jslib-angular/components/password-history.component';
@Component({ @Component({
selector: 'app-password-history', selector: 'app-password-history',

12
src/popup/vault/share.component.ts
View File

@ -5,13 +5,13 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CollectionService } from 'jslib/abstractions/collection.service'; import { CollectionService } from 'jslib-common/abstractions/collection.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { ShareComponent as BaseShareComponent } from 'jslib/angular/components/share.component'; import { ShareComponent as BaseShareComponent } from 'jslib-angular/components/share.component';
@Component({ @Component({
selector: 'app-vault-share', selector: 'app-vault-share',

34
src/popup/vault/view.component.ts
View File

@ -9,29 +9,29 @@ import {
Router, Router,
} from '@angular/router'; } from '@angular/router';
import { ApiService } from 'jslib/abstractions/api.service'; import { ApiService } from 'jslib-common/abstractions/api.service';
import { AuditService } from 'jslib/abstractions/audit.service'; import { AuditService } from 'jslib-common/abstractions/audit.service';
import { CipherService } from 'jslib/abstractions/cipher.service'; import { CipherService } from 'jslib-common/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service'; import { PasswordRepromptService } from 'jslib-common/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { TokenService } from 'jslib/abstractions/token.service'; import { TokenService } from 'jslib-common/abstractions/token.service';
import { TotpService } from 'jslib/abstractions/totp.service'; import { TotpService } from 'jslib-common/abstractions/totp.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { Cipher } from 'jslib/models/domain'; import { Cipher } from 'jslib-common/models/domain';
import { LoginUriView } from 'jslib/models/view'; import { LoginUriView } from 'jslib-common/models/view';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/view.component'; import { ViewComponent as BaseViewComponent } from 'jslib-angular/components/view.component';
import { BrowserApi } from '../../browser/browserApi'; import { BrowserApi } from '../../browser/browserApi';
import { AutofillService } from '../../services/abstractions/autofill.service'; import { AutofillService } from '../../services/abstractions/autofill.service';
import { PopupUtilsService } from '../services/popup-utils.service'; import { PopupUtilsService } from '../services/popup-utils.service';
import { CipherType } from 'jslib/enums'; import { CipherType } from 'jslib-common/enums';
const BroadcasterSubscriptionId = 'ChildViewComponent'; const BroadcasterSubscriptionId = 'ChildViewComponent';

12
src/services/autofill.service.ts
View File

@ -1,9 +1,9 @@
import { import {
CipherType, CipherType,
FieldType, FieldType,
} from 'jslib/enums'; } from 'jslib-common/enums';
import { CipherView } from 'jslib/models/view'; import { CipherView } from 'jslib-common/models/view';
import AutofillField from '../models/autofillField'; import AutofillField from '../models/autofillField';
import AutofillPageDetails from '../models/autofillPageDetails'; import AutofillPageDetails from '../models/autofillPageDetails';
@ -17,11 +17,11 @@ import {
CipherService, CipherService,
TotpService, TotpService,
UserService, UserService,
} from 'jslib/abstractions'; } from 'jslib-common/abstractions';
import { EventService } from 'jslib/abstractions/event.service'; import { EventService } from 'jslib-common/abstractions/event.service';
import { CipherRepromptType } from 'jslib/enums/cipherRepromptType'; import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
import { EventType } from 'jslib/enums/eventType'; import { EventType } from 'jslib-common/enums/eventType';
const CardAttributes: string[] = ['autoCompleteType', 'data-stripe', 'htmlName', 'htmlID', 'label-tag', const CardAttributes: string[] = ['autoCompleteType', 'data-stripe', 'htmlName', 'htmlID', 'label-tag',
'placeholder', 'label-left', 'label-top', 'data-recurly']; 'placeholder', 'label-left', 'label-top', 'data-recurly'];

2
src/services/browserMessaging.service.ts
View File

@ -1,4 +1,4 @@
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
export default class BrowserMessagingService implements MessagingService { export default class BrowserMessagingService implements MessagingService {
send(subscriber: string, arg: any = {}) { send(subscriber: string, arg: any = {}) {

2
src/services/browserPlatformUtils.service.spec.ts
View File

@ -1,6 +1,6 @@
import BrowserPlatformUtilsService from './browserPlatformUtils.service'; import BrowserPlatformUtilsService from './browserPlatformUtils.service';
import { DeviceType } from 'jslib/enums'; import { DeviceType } from 'jslib-common/enums/deviceType';
describe('Browser Utils Service', () => { describe('Browser Utils Service', () => {
describe('getBrowser', () => { describe('getBrowser', () => {

6
src/services/browserPlatformUtils.service.ts
View File

@ -1,10 +1,10 @@
import { BrowserApi } from '../browser/browserApi'; import { BrowserApi } from '../browser/browserApi';
import { SafariApp } from '../browser/safariApp'; import { SafariApp } from '../browser/safariApp';
import { DeviceType } from 'jslib/enums/deviceType'; import { DeviceType } from 'jslib-common/enums/deviceType';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
const DialogPromiseExpiration = 600000; // 10 minutes const DialogPromiseExpiration = 600000; // 10 minutes

2
src/services/browserStorage.service.ts
View File

@ -1,4 +1,4 @@
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib-common/abstractions/storage.service';
export default class BrowserStorageService implements StorageService { export default class BrowserStorageService implements StorageService {
private chromeStorageApi: any; private chromeStorageApi: any;

2
src/services/i18n.service.ts
View File

@ -1,4 +1,4 @@
import { I18nService as BaseI18nService } from 'jslib/services/i18n.service'; import { I18nService as BaseI18nService } from 'jslib-common/services/i18n.service';
export default class I18nService extends BaseI18nService { export default class I18nService extends BaseI18nService {
constructor(systemLanguage: string) { constructor(systemLanguage: string) {

2
src/services/vaultTimeout.service.ts
View File

@ -1,4 +1,4 @@
import { VaultTimeoutService as BaseVaultTimeoutService } from 'jslib/services/vaultTimeout.service'; import { VaultTimeoutService as BaseVaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
import { SafariApp } from '../browser/safariApp'; import { SafariApp } from '../browser/safariApp';
export default class VaultTimeoutService extends BaseVaultTimeoutService { export default class VaultTimeoutService extends BaseVaultTimeoutService {

38
tsconfig.json
View File

@ -8,25 +8,13 @@
"target": "ES2016", "target": "ES2016",
"allowJs": true, "allowJs": true,
"sourceMap": true, "sourceMap": true,
"types": [
"jasmine",
"sweetalert2",
"@types/chrome",
"@types/firefox-webext-browser"
],
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"jslib/*": [ "jslib-common/*": [
"jslib/src/*" "jslib/common/src/*"
], ],
"@angular/*": [ "jslib-angular/*": [
"node_modules/@angular/*" "jslib/angular/src/*"
],
"node": [
"node_modules/@types/node"
],
"duo_web_sdk": [
"node_modules/duo_web_sdk"
] ]
} }
}, },
@ -34,21 +22,7 @@
"preserveWhitespaces": true, "preserveWhitespaces": true,
"enableIvy": false "enableIvy": false
}, },
"exclude": [ "include": [
"node_modules", "src"
"jslib/node_modules",
"dist",
"jslib/dist",
"jslib/spec",
"jslib/src/cli",
"jslib/src/electron",
"jslib/src/angular/components/modal.component.ts",
"jslib/src/angular/dummy.module.ts",
"build",
"build.safariextension",
"coverage",
"store",
"jslib/src/services/nodeApi.service.ts",
"jslib/src/services/lowdbStorage.service.ts"
] ]
} }

3
webpack.config.js
View File

@ -171,9 +171,6 @@ const config = {
}, },
resolve: { resolve: {
extensions: ['.ts', '.js'], extensions: ['.ts', '.js'],
alias: {
jslib: path.join(__dirname, 'jslib/src'),
},
symlinks: false, symlinks: false,
modules: [path.resolve('node_modules')], modules: [path.resolve('node_modules')],
}, },