Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Angular (#520)

This commit is contained in:
Oscar Hinton 2020-08-18 22:13:15 +02:00 committed by GitHub
parent 540df4270c
commit 7499d7de25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 463 additions and 1828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 7d49902eea45275d50c949beec32b3ab5b7db725 Subproject commit 9957125d3a9d416d7a60b9904f0b7882f3fb58d0

2209
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

36
package.json
View File

@ -222,9 +222,10 @@
} }
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "^7.2.11", "@angular/compiler-cli": "^9.1.12",
"@ngtools/webpack": "^7.2.2", "@ngtools/webpack": "^9.1.12",
"@types/lunr": "^2.3.3", "@types/lunr": "^2.3.3",
"@types/node": "^10.17.28",
"@types/node-forge": "^0.7.5", "@types/node-forge": "^0.7.5",
"@types/papaparse": "^4.5.3", "@types/papaparse": "^4.5.3",
"@types/semver": "^5.5.0", "@types/semver": "^5.5.0",
@ -258,28 +259,28 @@
"ts-loader": "^8.0.2", "ts-loader": "^8.0.2",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "3.6.5", "typescript": "3.8.3",
"webpack": "^4.29.0", "webpack": "^4.29.0",
"webpack-cli": "^3.2.1", "webpack-cli": "^3.2.1",
"webpack-merge": "^4.2.1", "webpack-merge": "^4.2.1",
"webpack-node-externals": "^1.7.2" "webpack-node-externals": "^1.7.2"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "7.2.1", "@angular/animations": "9.1.12",
"@angular/cdk": "7.2.1", "@angular/cdk": "9.2.4",
"@angular/common": "7.2.1", "@angular/common": "9.1.12",
"@angular/compiler": "7.2.1", "@angular/compiler": "9.1.12",
"@angular/core": "7.2.1", "@angular/core": "9.1.12",
"@angular/forms": "7.2.1", "@angular/forms": "9.1.12",
"@angular/platform-browser": "7.2.1", "@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "7.2.1", "@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "7.2.1", "@angular/router": "9.1.12",
"@angular/upgrade": "7.2.1", "@angular/upgrade": "9.1.12",
"@microsoft/signalr": "3.1.0", "@microsoft/signalr": "3.1.0",
"@microsoft/signalr-protocol-msgpack": "3.1.0", "@microsoft/signalr-protocol-msgpack": "3.1.0",
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4", "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"angular2-toaster": "6.1.0", "angular2-toaster": "8.0.0",
"angulartics2": "6.3.0", "angulartics2": "9.1.0",
"big-integer": "1.6.36", "big-integer": "1.6.36",
"core-js": "2.6.2", "core-js": "2.6.2",
"desktop-idle": "1.1.2", "desktop-idle": "1.1.2",
@ -292,9 +293,10 @@
"node-forge": "0.7.6", "node-forge": "0.7.6",
"nord": "0.2.1", "nord": "0.2.1",
"papaparse": "4.6.0", "papaparse": "4.6.0",
"rxjs": "6.3.3", "rxjs": "6.6.2",
"sweetalert2": "9.8.1", "sweetalert2": "9.8.1",
"zone.js": "0.8.28", "tslib": "^2.0.1",
"zone.js": "0.10.3",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
} }
} }

16
src/app/accounts/login.component.ts
View File

@ -17,21 +17,25 @@ import { SyncService } from 'jslib/abstractions/sync.service';
import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component'; import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
import { ModalComponent } from 'jslib/angular/components/modal.component'; import { ModalComponent } from 'jslib/angular/components/modal.component';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
templateUrl: 'login.component.html', templateUrl: 'login.component.html',
}) })
export class LoginComponent extends BaseLoginComponent { export class LoginComponent extends BaseLoginComponent {
@ViewChild('environment', { read: ViewContainerRef }) environmentModal: ViewContainerRef; @ViewChild('environment', { read: ViewContainerRef, static: true }) environmentModal: ViewContainerRef;
showingModal = false; showingModal = false;
constructor(authService: AuthService, router: Router, constructor(authService: AuthService, router: Router, i18nService: I18nService,
i18nService: I18nService, syncService: SyncService, syncService: SyncService, private componentFactoryResolver: ComponentFactoryResolver,
private componentFactoryResolver: ComponentFactoryResolver, storageService: StorageService, platformUtilsService: PlatformUtilsService, stateService: StateService,
platformUtilsService: PlatformUtilsService, stateService: StateService) { environmentService: EnvironmentService, passwordGenerationService: PasswordGenerationService,
super(authService, router, platformUtilsService, i18nService, storageService, stateService); cryptoFunctionService: CryptoFunctionService, storageService: StorageService) {
super(authService, router, platformUtilsService, i18nService, stateService, environmentService, passwordGenerationService, cryptoFunctionService, storageService);
super.onSuccessfulLogin = () => { super.onSuccessfulLogin = () => {
return syncService.fullSync(true); return syncService.fullSync(true);
}; };

2
src/app/accounts/two-factor.component.ts
View File

@ -28,7 +28,7 @@ import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/comp
templateUrl: 'two-factor.component.html', templateUrl: 'two-factor.component.html',
}) })
export class TwoFactorComponent extends BaseTwoFactorComponent { export class TwoFactorComponent extends BaseTwoFactorComponent {
@ViewChild('twoFactorOptions', { read: ViewContainerRef }) twoFactorOptionsModal: ViewContainerRef; @ViewChild('twoFactorOptions', { read: ViewContainerRef, static: true }) twoFactorOptionsModal: ViewContainerRef;
showingModal = false; showingModal = false;

6
src/app/app.component.ts
View File

@ -67,9 +67,9 @@ const IdleTimeout = 60000 * 10; // 10 minutes
<router-outlet></router-outlet>`, <router-outlet></router-outlet>`,
}) })
export class AppComponent implements OnInit { export class AppComponent implements OnInit {
@ViewChild('settings', { read: ViewContainerRef }) settingsRef: ViewContainerRef; @ViewChild('settings', { read: ViewContainerRef, static: true }) settingsRef: ViewContainerRef;
@ViewChild('premium', { read: ViewContainerRef }) premiumRef: ViewContainerRef; @ViewChild('premium', { read: ViewContainerRef, static: true }) premiumRef: ViewContainerRef;
@ViewChild('passwordHistory', { read: ViewContainerRef }) passwordHistoryRef: ViewContainerRef; @ViewChild('passwordHistory', { read: ViewContainerRef, static: true }) passwordHistoryRef: ViewContainerRef;
toasterConfig: ToasterConfig = new ToasterConfig({ toasterConfig: ToasterConfig = new ToasterConfig({
showCloseButton: true, showCloseButton: true,

2
src/app/app.module.ts
View File

@ -136,7 +136,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
FormsModule, FormsModule,
AppRoutingModule, AppRoutingModule,
ServicesModule, ServicesModule,
Angulartics2Module.forRoot([Angulartics2GoogleAnalytics], { Angulartics2Module.forRoot({
pageTracking: { pageTracking: {
clearQueryParams: true, clearQueryParams: true,
}, },

18
src/app/vault/vault.component.ts
View File

@ -56,15 +56,15 @@ const BroadcasterSubscriptionId = 'VaultComponent';
export class VaultComponent implements OnInit, OnDestroy { export class VaultComponent implements OnInit, OnDestroy {
@ViewChild(ViewComponent) viewComponent: ViewComponent; @ViewChild(ViewComponent) viewComponent: ViewComponent;
@ViewChild(AddEditComponent) addEditComponent: AddEditComponent; @ViewChild(AddEditComponent) addEditComponent: AddEditComponent;
@ViewChild(CiphersComponent) ciphersComponent: CiphersComponent; @ViewChild(CiphersComponent, { static: true }) ciphersComponent: CiphersComponent;
@ViewChild(GroupingsComponent) groupingsComponent: GroupingsComponent; @ViewChild(GroupingsComponent, { static: true }) groupingsComponent: GroupingsComponent;
@ViewChild('passwordGenerator', { read: ViewContainerRef }) passwordGeneratorModalRef: ViewContainerRef; @ViewChild('passwordGenerator', { read: ViewContainerRef, static: true }) passwordGeneratorModalRef: ViewContainerRef;
@ViewChild('attachments', { read: ViewContainerRef }) attachmentsModalRef: ViewContainerRef; @ViewChild('attachments', { read: ViewContainerRef, static: true }) attachmentsModalRef: ViewContainerRef;
@ViewChild('folderAddEdit', { read: ViewContainerRef }) folderAddEditModalRef: ViewContainerRef; @ViewChild('folderAddEdit', { read: ViewContainerRef, static: true }) folderAddEditModalRef: ViewContainerRef;
@ViewChild('passwordHistory', { read: ViewContainerRef }) passwordHistoryModalRef: ViewContainerRef; @ViewChild('passwordHistory', { read: ViewContainerRef, static: true }) passwordHistoryModalRef: ViewContainerRef;
@ViewChild('exportVault', { read: ViewContainerRef }) exportVaultModalRef: ViewContainerRef; @ViewChild('exportVault', { read: ViewContainerRef, static: true }) exportVaultModalRef: ViewContainerRef;
@ViewChild('share', { read: ViewContainerRef }) shareModalRef: ViewContainerRef; @ViewChild('share', { read: ViewContainerRef, static: true }) shareModalRef: ViewContainerRef;
@ViewChild('collections', { read: ViewContainerRef }) collectionsModalRef: ViewContainerRef; @ViewChild('collections', { read: ViewContainerRef, static: true }) collectionsModalRef: ViewContainerRef;
action: string; action: string;
cipherId: string = null; cipherId: string = null;