implement accounts components from jslib

jslib

@@ -1 +1 @@
-Subproject commit 7b4d0a71de640ce14c3c446bfd2e8ce36635db3f
+Subproject commit f855a8272c7dc3c3099643cf34e49d3089e6575e

src/popup2/accounts/environment.component.html

@@ -0,0 +1,59 @@
+<div class="modal fade">
+    <div class="modal-dialog">
+        <form class="modal-content" (ngSubmit)="submit()">
+            <div class="modal-body">
+                <div class="box">
+                    <div class="box-header">
+                        {{'selfHostedEnvironment' | i18n}}
+                    </div>
+                    <div class="box-content">
+                        <div class="box-content-row" appBoxRow>
+                            <label for="baseUrl">{{'baseUrl' | i18n}}</label>
+                            <input id="baseUrl" type="text" name="BaseUrl" [(ngModel)]="baseUrl"
+                                   placeholder="ex. https://bitwarden.company.com">
+                        </div>
+                    </div>
+                    <div class="box-footer">
+                        {{'selfHostedEnvironmentFooter' | i18n}}
+                    </div>
+                </div>
+                <div class="box">
+                    <div class="box-header">
+                        <button type="button" (click)="toggleCustom()">
+                            <i class="fa fa-plus-square-o" [hidden]="showCustom"></i>
+                            <i class="fa fa-minus-square-o" [hidden]="!showCustom"></i>
+                            {{'customEnvironment' | i18n}}
+                        </button>
+                    </div>
+                    <div class="box-content" [hidden]="!showCustom">
+                        <div class="box-content-row" appBoxRow>
+                            <label for="webVaultUrl">{{'webVaultUrl' | i18n}}</label>
+                            <input id="webVaultUrl" type="text" name="WebVaultUrl" [(ngModel)]="webVaultUrl">
+                        </div>
+                        <div class="box-content-row" appBoxRow>
+                            <label for="apiUrl">{{'apiUrl' | i18n}}</label>
+                            <input id="apiUrl" type="text" name="ApiUrl" [(ngModel)]="apiUrl">
+                        </div>
+                        <div class="box-content-row" appBoxRow>
+                            <label for="identityUrl">{{'identityUrl' | i18n}}</label>
+                            <input id="identityUrl" type="text" name="IdentityUrl" [(ngModel)]="identityUrl">
+                        </div>
+                        <div class="box-content-row" appBoxRow>
+                            <label for="iconsUrl">{{'iconsUrl' | i18n}}</label>
+                            <input id="iconsUrl" type="text" name="IconsUrl" [(ngModel)]="iconsUrl">
+                        </div>
+                    </div>
+                    <div class="box-footer" [hidden]="!showCustom">
+                        {{'customEnvironmentFooter' | i18n}}
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button appBlurClick type="submit" class="primary" title="{{'save' | i18n}}">
+                    <i class="fa fa-save fa-lg fa-fw"></i>
+                </button>
+                <button type="button" data-dismiss="modal">{{'close' | i18n}}</button>
+            </div>
+        </form>
+    </div>
+</div>

src/popup2/accounts/environment.component.ts

@@ -0,0 +1,29 @@
+import * as template from './environment.component.html';
+
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { EnvironmentService } from 'jslib/abstractions/environment.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { EnvironmentComponent as BaseEnvironmentComponent } from 'jslib/angular/components/environment.component';
+
+@Component({
+    selector: 'app-environment',
+    template: template,
+})
+export class EnvironmentComponent extends BaseEnvironmentComponent {
+    constructor(analytics: Angulartics2, toasterService: ToasterService,
+        environmentService: EnvironmentService, i18nService: I18nService,
+        private router: Router) {
+        super(analytics, toasterService, environmentService, i18nService);
+    }
+
+    saved() {
+        super.saved();
+        this.router.navigate(['login']);
+    }
+}

src/popup2/accounts/hint.component.html

@@ -0,0 +1,23 @@
+<form id="hint-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
+    <div class="content">
+        <h1>{{'passwordHint' | i18n}}</h1>
+        <div class="box last">
+            <div class="box-content">
+                <div class="box-content-row" appBoxRow>
+                    <label for="email">{{'emailAddress' | i18n}}</label>
+                    <input id="email" type="text" name="Email" [(ngModel)]="email" required appAutofocus>
+                </div>
+            </div>
+            <div class="box-footer">
+                {{'enterEmailToGetHint' | i18n}}
+            </div>
+        </div>
+        <div class="buttons">
+            <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
+                <b [hidden]="form.loading">{{'submit' | i18n}}</b>
+                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+            </button>
+            <a routerLink="/login" class="btn block">{{'cancel' | i18n}}</a>
+        </div>
+    </div>
+</form>

src/popup2/accounts/hint.component.ts

@@ -0,0 +1,24 @@
+import * as template from './hint.component.html';
+
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { HintComponent as BaseHintComponent } from 'jslib/angular/components/hint.component';
+
+@Component({
+    selector: 'app-hint',
+    template: template,
+})
+export class HintComponent extends BaseHintComponent {
+    constructor(router: Router, analytics: Angulartics2,
+        toasterService: ToasterService, i18nService: I18nService,
+        apiService: ApiService) {
+        super(router, analytics, toasterService, i18nService, apiService);
+    }
+}

src/popup2/accounts/login.component.ts

@@ -24,6 +24,6 @@ export class LoginComponent extends BaseLoginComponent {
     }
 
     settings() {
-        // TODO: navigate to settings
+        this.router.navigate(['environment']);
     }
 }

src/popup2/accounts/register.component.html

@@ -0,0 +1,64 @@
+<form id="register-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
+    <div class="content">
+        <h1>{{'createAccount' | i18n}}</h1>
+        <div class="box">
+            <div class="box-content">
+                <div class="box-content-row" appBoxRow>
+                    <label for="email">{{'emailAddress' | i18n}}</label>
+                    <input id="email" type="text" name="Email" [(ngModel)]="email" required
+                           [appAutofocus]="email === ''">
+                </div>
+                <div class="box-content-row box-content-row-flex" appBoxRow>
+                    <div class="row-main">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword"
+                               class="monospaced" [(ngModel)]="masterPassword" required [appAutofocus]="email !== ''">
+                    </div>
+                    <div class="action-buttons">
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                           title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                            <i class="fa fa-lg"
+                               [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer">
+                {{'masterPassDesc' | i18n}}
+            </div>
+        </div>
+        <div class="box last">
+            <div class="box-content">
+                <div class="box-content-row box-content-row-flex" appBoxRow>
+                    <div class="row-main">
+                        <label for="masterPasswordRetype">{{'reTypeMasterPass' | i18n}}</label>
+                        <input id="masterPasswordRetype" type="{{showPassword ? 'text' : 'password'}}"
+                               name="MasterPasswordRetype" class="monospaced" [(ngModel)]="confirmMasterPassword"
+                               required>
+                    </div>
+                    <div class="action-buttons">
+                        <a class="row-btn" href="#" appStopClick appBlurClick
+                           title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                            <i class="fa fa-lg"
+                               [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="box-content-row" appBoxRow>
+                    <label for="hint">{{'masterPassHint' | i18n}}</label>
+                    <input id="hint" type="text" name="Hint" [(ngModel)]="hint">
+                </div>
+            </div>
+            <div class="box-footer">
+                {{'masterPassHintDesc' | i18n}}
+            </div>
+        </div>
+        <div class="buttons">
+            <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
+                <b [hidden]="form.loading">{{'submit' | i18n}}</b>
+                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+            </button>
+            <a routerLink="/login" class="btn block">{{'cancel' | i18n}}</a>
+        </div>
+    </div>
+</form>

src/popup2/accounts/register.component.ts

@@ -0,0 +1,27 @@
+import * as template from './register.component.html';
+
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
+
+@Component({
+    selector: 'app-register',
+    template: template,
+})
+export class RegisterComponent extends BaseRegisterComponent {
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, cryptoService: CryptoService,
+        apiService: ApiService) {
+        super(authService, router, analytics, toasterService, i18nService, cryptoService, apiService);
+    }
+}

src/popup2/accounts/two-factor-options.component.html

@@ -0,0 +1,28 @@
+<div class="modal fade">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <div class="box">
+                    <div class="box-header">
+                        {{'twoStepOptions' | i18n}}
+                    </div>
+                    <div class="box-content">
+                        <a href="#" appStopClick *ngFor="let p of providers" class="box-content-row"
+                           (click)="choose(p)">
+                            <img [src]="'images/two-factor/' + p.type + '.png'" alt="" class="img-right">
+                            <span class="text">{{p.name}}</span>
+                            <span class="detail">{{p.description}}</span>
+                        </a>
+                        <a href="#" appStopClick class="box-content-row" (click)="recover()">
+                            <span class="text">{{'recoveryCodeTitle' | i18n}}</span>
+                            <span class="detail">{{'recoveryCodeDesc' | i18n}}</span>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" data-dismiss="modal">{{'close' | i18n}}</button>
+            </div>
+        </div>
+    </div>
+</div>

src/popup2/accounts/two-factor-options.component.ts

@@ -0,0 +1,27 @@
+import * as template from './two-factor-options.component.html';
+
+import { Component, } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+import {
+    TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent
+} from 'jslib/angular/components/two-factor-options.component';
+
+@Component({
+    selector: 'app-two-factor-options',
+    template: template,
+})
+export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, platformUtilsService: PlatformUtilsService) {
+        super(authService, router, analytics, toasterService, i18nService, platformUtilsService);
+    }
+}

src/popup2/accounts/two-factor.component.html

@@ -0,0 +1,74 @@
+<form id="two-factor-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
+    <div class="content">
+        <h1>{{title}}</h1>
+        <p *ngIf="selectedProviderType === providerType.Authenticator">{{'enterVerificationCodeApp' | i18n}}</p>
+        <p *ngIf="selectedProviderType === providerType.Email">
+            {{'enterVerificationCodeEmail' | i18n : twoFactorEmail}}
+        </p>
+        <div class="box last"
+             *ngIf="selectedProviderType === providerType.Email || selectedProviderType === providerType.Authenticator">
+            <div class="box-content">
+                <div class="box-content-row" appBoxRow>
+                    <label for="code">{{'verificationCode' | i18n}}</label>
+                    <input id="code" type="text" name="Code" [(ngModel)]="token" required appAutofocus>
+                </div>
+                <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                    <label for="remember">{{'rememberMe' | i18n}}</label>
+                    <input id="remember" type="checkbox" name="Remember" [(ngModel)]="remember">
+                </div>
+            </div>
+        </div>
+        <ng-container *ngIf="selectedProviderType === providerType.Yubikey">
+            <p>{{'insertYubiKey' | i18n}}</p>
+            <div class="box last">
+                <div class="box-content">
+                    <div class="box-content-row" appBoxRow>
+                        <label for="code" class="sr-only">{{'verificationCode' | i18n}}</label>
+                        <input id="code" type="password" name="Code" [(ngModel)]="token" required appAutofocus>
+                    </div>
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                        <label for="remember">{{'rememberMe' | i18n}}</label>
+                        <input id="remember" type="checkbox" name="Remember" [(ngModel)]="remember">
+                    </div>
+                </div>
+            </div>
+        </ng-container>
+        <ng-container *ngIf="selectedProviderType === providerType.Duo ||
+                        selectedProviderType === providerType.OrganizationDuo">
+            <div id="duo-frame"><iframe id="duo_iframe"></iframe></div>
+            <div class="box last">
+                <div class="box-content">
+                    <div class="box-content-row box-content-row-checkbox" appBoxRow>
+                        <label for="remember">{{'rememberMe' | i18n}}</label>
+                        <input id="remember" type="checkbox" name="Remember" [(ngModel)]="remember">
+                    </div>
+                </div>
+            </div>
+        </ng-container>
+        <div class="box last" *ngIf="selectedProviderType == null">
+            <div class="box-content">
+                <div class="box-content-row">
+                    <p>{{'noTwoStepProviders' | i18n}}</p>
+                    <p>{{'noTwoStepProviders2' | i18n}}</p>
+                </div>
+            </div>
+        </div>
+        <div class="buttons">
+            <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick
+                    *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+                        selectedProviderType !== providerType.OrganizationDuo">
+                <span [hidden]="form.loading"><i class="fa fa-sign-in"></i> {{'continue' | i18n}}</span>
+                <i class="fa fa-spinner fa-spin" [hidden]="!form.loading"></i>
+            </button>
+            <a routerLink="/login" class="btn block">{{'cancel' | i18n}}</a>
+        </div>
+        <div class="sub-options">
+            <a href="#" appStopClick (click)="anotherMethod()">{{'useAnotherTwoStepMethod' | i18n}}</a>
+            <a href="#" appStopClick (click)="sendEmail(true)" [appApiAction]="emailPromise"
+               *ngIf="selectedProviderType === providerType.Email">
+                {{'sendVerificationCodeEmailAgain' | i18n}}
+            </a>
+        </div>
+    </div>
+</form>
+<ng-template #twoFactorOptions></ng-template>

src/popup2/accounts/two-factor.component.ts

@@ -0,0 +1,34 @@
+import * as template from './two-factor.component.html';
+
+import { Component } from '@angular/core';
+
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { SyncService } from 'jslib/abstractions/sync.service';
+
+import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component';
+
+@Component({
+    selector: 'app-two-factor',
+    template: template,
+})
+export class TwoFactorComponent extends BaseTwoFactorComponent {
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, apiService: ApiService,
+        platformUtilsService: PlatformUtilsService, syncService: SyncService) {
+        super(authService, router, analytics, toasterService, i18nService, apiService,
+            platformUtilsService, syncService);
+    }
+
+    anotherMethod() {
+        this.router.navigate(['2fa-options']);
+    }
+}

src/popup2/app-routing.module.ts

@@ -4,11 +4,21 @@ import {
     Routes,
 } from '@angular/router';
 
+import { EnvironmentComponent } from './accounts/environment.component';
+import { HintComponent } from './accounts/hint.component';
 import { LoginComponent } from './accounts/login.component';
+import { RegisterComponent } from './accounts/register.component';
+import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
+import { TwoFactorComponent } from './accounts/two-factor.component';
 
 const routes: Routes = [
     { path: '', redirectTo: '/login', pathMatch: 'full' },
     { path: 'login', component: LoginComponent },
+    { path: '2fa', component: TwoFactorComponent },
+    { path: '2fa-options', component: TwoFactorOptionsComponent },
+    { path: 'register', component: RegisterComponent },
+    { path: 'hint', component: HintComponent },
+    { path: 'environment', component: EnvironmentComponent },
 ];
 
 @NgModule({

src/popup2/app.module.ts

@@ -15,7 +15,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { AppComponent } from './app.component';
 
+import { EnvironmentComponent } from './accounts/environment.component';
+import { HintComponent } from './accounts/hint.component';
 import { LoginComponent } from './accounts/login.component';
+import { RegisterComponent } from './accounts/register.component';
+import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
+import { TwoFactorComponent } from './accounts/two-factor.component';
 
 import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive';
 import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive';
@@ -45,11 +50,16 @@ import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe';
         AppComponent,
         AutofocusDirective,
         BlurClickDirective,
+        EnvironmentComponent,
         FallbackSrcDirective,
+        HintComponent,
         I18nPipe,
         LoginComponent,
+        RegisterComponent,
         StopClickDirective,
-        StopPropDirective
+        StopPropDirective,
+        TwoFactorOptionsComponent,
+        TwoFactorComponent
     ],
     entryComponents: [