Merge branch 'master' of https://github.com/bitwarden/jslib into improve-hostname-and-domain-retrieval

angular/src/components/register.component.ts

@@ -10,7 +10,7 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
-import { KdfType } from "jslib-common/enums/kdfType";
+import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "jslib-common/enums/kdfType";
 import { KeysRequest } from "jslib-common/models/request/keysRequest";
 import { ReferenceEventRequest } from "jslib-common/models/request/referenceEventRequest";
 import { RegisterRequest } from "jslib-common/models/request/registerRequest";
@@ -163,9 +163,8 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
 
     this.name = this.name === "" ? null : this.name;
     this.email = this.email.trim().toLowerCase();
-    const kdf = KdfType.PBKDF2_SHA256;
-    const useLowerKdf = this.platformUtilsService.isIE();
-    const kdfIterations = useLowerKdf ? 10000 : 100000;
+    const kdf = DEFAULT_KDF_TYPE;
+    const kdfIterations = DEFAULT_KDF_ITERATIONS;
     const key = await this.cryptoService.makeKey(
       this.masterPassword,
       this.email,

angular/src/components/set-password.component.ts

@@ -12,7 +12,7 @@ import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { HashPurpose } from "jslib-common/enums/hashPurpose";
-import { KdfType } from "jslib-common/enums/kdfType";
+import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "jslib-common/enums/kdfType";
 import { Utils } from "jslib-common/misc/utils";
 import { EncString } from "jslib-common/models/domain/encString";
 import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
@@ -85,9 +85,8 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
   }
 
   async setupSubmitActions() {
-    this.kdf = KdfType.PBKDF2_SHA256;
-    const useLowerKdf = this.platformUtilsService.isIE();
-    this.kdfIterations = useLowerKdf ? 10000 : 100000;
+    this.kdf = DEFAULT_KDF_TYPE;
+    this.kdfIterations = DEFAULT_KDF_ITERATIONS;
     return true;
   }
 

angular/src/directives/api-action.directive.ts

@@ -31,10 +31,7 @@ export class ApiActionDirective implements OnChanges {
       (e: any) => {
         this.el.nativeElement.loading = false;
 
-        if (
-          (e instanceof ErrorResponse || e.constructor.name === "ErrorResponse") &&
-          (e as ErrorResponse).captchaRequired
-        ) {
+        if ((e as ErrorResponse).captchaRequired) {
           this.logService.error("Captcha required error response: " + e.getSingleMessage());
           return;
         }

angular/src/jslib.module.ts

@@ -0,0 +1,94 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+
+import { AvatarComponent } from "./components/avatar.component";
+import { CalloutComponent } from "./components/callout.component";
+import { ExportScopeCalloutComponent } from "./components/export-scope-callout.component";
+import { IconComponent } from "./components/icon.component";
+import { BitwardenToastModule } from "./components/toastr.component";
+import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component";
+import { A11yInvalidDirective } from "./directives/a11y-invalid.directive";
+import { A11yTitleDirective } from "./directives/a11y-title.directive";
+import { ApiActionDirective } from "./directives/api-action.directive";
+import { AutofocusDirective } from "./directives/autofocus.directive";
+import { BlurClickDirective } from "./directives/blur-click.directive";
+import { BoxRowDirective } from "./directives/box-row.directive";
+import { FallbackSrcDirective } from "./directives/fallback-src.directive";
+import { InputStripSpacesDirective } from "./directives/input-strip-spaces.directive";
+import { InputVerbatimDirective } from "./directives/input-verbatim.directive";
+import { NotPremiumDirective } from "./directives/not-premium.directive";
+import { SelectCopyDirective } from "./directives/select-copy.directive";
+import { StopClickDirective } from "./directives/stop-click.directive";
+import { StopPropDirective } from "./directives/stop-prop.directive";
+import { TrueFalseValueDirective } from "./directives/true-false-value.directive";
+import { ColorPasswordPipe } from "./pipes/color-password.pipe";
+import { I18nPipe } from "./pipes/i18n.pipe";
+import { SearchCiphersPipe } from "./pipes/search-ciphers.pipe";
+import { SearchPipe } from "./pipes/search.pipe";
+import { UserNamePipe } from "./pipes/user-name.pipe";
+
+@NgModule({
+  imports: [
+    BitwardenToastModule.forRoot({
+      maxOpened: 5,
+      autoDismiss: true,
+      closeButton: true,
+    }),
+    CommonModule,
+  ],
+  declarations: [
+    A11yInvalidDirective,
+    A11yTitleDirective,
+    ApiActionDirective,
+    AvatarComponent,
+    AutofocusDirective,
+    BlurClickDirective,
+    BoxRowDirective,
+    ColorPasswordPipe,
+    FallbackSrcDirective,
+    I18nPipe,
+    InputStripSpacesDirective,
+    InputVerbatimDirective,
+    NotPremiumDirective,
+    SearchCiphersPipe,
+    SearchPipe,
+    SelectCopyDirective,
+    StopClickDirective,
+    StopPropDirective,
+    TrueFalseValueDirective,
+    UserNamePipe,
+    CalloutComponent,
+    IconComponent,
+    VerifyMasterPasswordComponent,
+    ExportScopeCalloutComponent,
+  ],
+  exports: [
+    A11yInvalidDirective,
+    A11yTitleDirective,
+    ApiActionDirective,
+    AvatarComponent,
+    AutofocusDirective,
+    BitwardenToastModule,
+    BlurClickDirective,
+    BoxRowDirective,
+    ColorPasswordPipe,
+    FallbackSrcDirective,
+    I18nPipe,
+    InputStripSpacesDirective,
+    InputVerbatimDirective,
+    NotPremiumDirective,
+    SearchCiphersPipe,
+    SearchPipe,
+    SelectCopyDirective,
+    StopClickDirective,
+    StopPropDirective,
+    TrueFalseValueDirective,
+    UserNamePipe,
+    CalloutComponent,
+    IconComponent,
+    VerifyMasterPasswordComponent,
+    ExportScopeCalloutComponent,
+  ],
+  providers: [UserNamePipe, SearchPipe],
+})
+export class JslibModule {}

angular/src/pipes/ellipsis.pipe.ts

@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from "@angular/core";
+
+@Pipe({
+  name: "ellipsis",
+})
+export class EllipsisPipe implements PipeTransform {
+  transform(value: string, limit = 25, completeWords = false, ellipsis = "...") {
+    if (value.length <= limit) {
+      return value;
+    }
+    limit -= ellipsis.length;
+    if (completeWords && value.length > limit && value.indexOf(" ") > 0) {
+      limit = value.substring(0, limit).lastIndexOf(" ");
+    }
+    return value.substring(0, limit) + ellipsis;
+  }
+}

angular/src/services/jslib-services.module.ts

@@ -413,7 +413,7 @@ import { ValidationService } from "./validation.service";
     {
       provide: CryptoFunctionServiceAbstraction,
       useClass: WebCryptoFunctionService,
-      deps: ["WINDOW", PlatformUtilsServiceAbstraction],
+      deps: ["WINDOW"],
     },
     {
       provide: EventServiceAbstraction,