Update jslib (#2511)
* Update jslib * Update name of UserVerificationComponent * Update service deps
This commit is contained in:
parent
a07c6869c2
commit
a02e966da4
2
jslib
2
jslib
|
@ -1 +1 @@
|
||||||
Subproject commit 4d58200ee90fb4fafa5d4f9f4c957654d4da306d
|
Subproject commit 6bcadc4f408db2c150753f53a07d6f8888b6e9ff
|
|
@ -215,6 +215,7 @@ export default class MainBackground {
|
||||||
this.tokenService,
|
this.tokenService,
|
||||||
this.platformUtilsService,
|
this.platformUtilsService,
|
||||||
this.environmentService,
|
this.environmentService,
|
||||||
|
this.appIdService,
|
||||||
(expired: boolean) => this.logout(expired)
|
(expired: boolean) => this.logout(expired)
|
||||||
);
|
);
|
||||||
this.settingsService = new SettingsService(this.stateService);
|
this.settingsService = new SettingsService(this.stateService);
|
||||||
|
|
|
@ -82,7 +82,7 @@ import { PopOutComponent } from "./components/pop-out.component";
|
||||||
import { PrivateModeWarningComponent } from "./components/private-mode-warning.component";
|
import { PrivateModeWarningComponent } from "./components/private-mode-warning.component";
|
||||||
import { SendListComponent } from "./components/send-list.component";
|
import { SendListComponent } from "./components/send-list.component";
|
||||||
import { SetPinComponent } from "./components/set-pin.component";
|
import { SetPinComponent } from "./components/set-pin.component";
|
||||||
import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component";
|
import { UserVerificationComponent } from "./components/user-verification.component";
|
||||||
import { GeneratorComponent } from "./generator/generator.component";
|
import { GeneratorComponent } from "./generator/generator.component";
|
||||||
import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
|
import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
|
||||||
import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
|
import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
|
||||||
|
@ -227,8 +227,8 @@ registerLocaleData(localeZhTw, "zh-TW");
|
||||||
TwoFactorComponent,
|
TwoFactorComponent,
|
||||||
TwoFactorOptionsComponent,
|
TwoFactorOptionsComponent,
|
||||||
UpdateTempPasswordComponent,
|
UpdateTempPasswordComponent,
|
||||||
|
UserVerificationComponent,
|
||||||
VaultTimeoutInputComponent,
|
VaultTimeoutInputComponent,
|
||||||
VerifyMasterPasswordComponent,
|
|
||||||
ViewComponent,
|
ViewComponent,
|
||||||
ViewCustomFieldsComponent,
|
ViewCustomFieldsComponent,
|
||||||
RemovePasswordComponent,
|
RemovePasswordComponent,
|
||||||
|
|
|
@ -2,16 +2,16 @@ import { animate, style, transition, trigger } from "@angular/animations";
|
||||||
import { Component } from "@angular/core";
|
import { Component } from "@angular/core";
|
||||||
import { NG_VALUE_ACCESSOR } from "@angular/forms";
|
import { NG_VALUE_ACCESSOR } from "@angular/forms";
|
||||||
|
|
||||||
import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/components/verify-master-password.component";
|
import { UserVerificationComponent as BaseComponent } from "jslib-angular/components/user-verification.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-verify-master-password",
|
selector: "app-user-verification",
|
||||||
templateUrl: "verify-master-password.component.html",
|
templateUrl: "user-verification.component.html",
|
||||||
providers: [
|
providers: [
|
||||||
{
|
{
|
||||||
provide: NG_VALUE_ACCESSOR,
|
provide: NG_VALUE_ACCESSOR,
|
||||||
multi: true,
|
multi: true,
|
||||||
useExisting: VerifyMasterPasswordComponent,
|
useExisting: UserVerificationComponent,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
animations: [
|
animations: [
|
||||||
|
@ -20,4 +20,4 @@ import { VerifyMasterPasswordComponent as BaseComponent } from "jslib-angular/co
|
||||||
]),
|
]),
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class VerifyMasterPasswordComponent extends BaseComponent {}
|
export class UserVerificationComponent extends BaseComponent {}
|
|
@ -29,8 +29,8 @@
|
||||||
<option *ngFor="let f of formatOptions" [value]="f.value">{{ f.name }}</option>
|
<option *ngFor="let f of formatOptions" [value]="f.value">{{ f.name }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<app-verify-master-password ngDefaultControl formControlName="secret" name="Secret">
|
<app-user-verification ngDefaultControl formControlName="secret" name="Secret">
|
||||||
</app-verify-master-password>
|
</app-user-verification>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-footer">
|
<div class="box-footer">
|
||||||
<p>{{ "confirmIdentity" | i18n }}</p>
|
<p>{{ "confirmIdentity" | i18n }}</p>
|
||||||
|
|
Loading…
Reference in New Issue