{{ c.email }}
{{ "invited" | i18n }}
-
{{
- "accepted" | i18n
- }}
{{ "accepted" | i18n }}
+
{{ "emergencyAccessRecoveryInitiated" | i18n }}
-
{{ "emergencyAccessRecoveryApproved" | i18n }}
-
-
{{
- "view" | i18n
+ {{
+ "emergencyAccessRecoveryApproved" | i18n
}}
- {{
+
+ {{ "view" | i18n }}
+ {{
"takeover" | i18n
}}
@@ -159,29 +160,30 @@
{{ c.email }}
- {{ "invited" | i18n }}
- {{
- "accepted" | i18n
+ {{
+ "invited" | i18n
}}
{{ "accepted" | i18n }}
+ {{ "emergencyAccessRecoveryInitiated" | i18n }}
{{ "emergencyAccessRecoveryApproved" | i18n }}
- {{
- "view" | i18n
- }}
- {{
+ {{ "view" | i18n }}
+ {{
"takeover" | i18n
}}
diff --git a/apps/web/src/app/settings/emergency-add-edit.component.ts b/apps/web/src/app/settings/emergency-add-edit.component.ts
index c0aabd8da36..28b69693431 100644
--- a/apps/web/src/app/settings/emergency-add-edit.component.ts
+++ b/apps/web/src/app/settings/emergency-add-edit.component.ts
@@ -4,7 +4,7 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { EventService } from "@bitwarden/common/abstractions/event.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
diff --git a/apps/web/src/app/settings/organization-plans.component.html b/apps/web/src/app/settings/organization-plans.component.html
index 7b827ce7c79..a282aaf05e6 100644
--- a/apps/web/src/app/settings/organization-plans.component.html
+++ b/apps/web/src/app/settings/organization-plans.component.html
@@ -24,68 +24,20 @@
|
{{ u.email }}
- {{
+ {{
"invited" | i18n
}}
- {{
+ {{
"accepted" | i18n
}}
{{ u.name }}
diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/components/add-edit.component.ts
index aa6ec4aee14..da7862cc017 100644
--- a/libs/angular/src/components/add-edit.component.ts
+++ b/libs/angular/src/components/add-edit.component.ts
@@ -1,10 +1,11 @@
import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Observable } from "rxjs";
import { AuditService } from "@bitwarden/common/abstractions/audit.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { EventService } from "@bitwarden/common/abstractions/event.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
@@ -51,7 +52,7 @@ export class AddEditComponent implements OnInit {
editMode = false;
cipher: CipherView;
- folders: FolderView[];
+ folders$: Observable;
collections: CollectionView[] = [];
title: string;
formPromise: Promise;
@@ -109,6 +110,7 @@ export class AddEditComponent implements OnInit {
{ name: "Maestro", value: "Maestro" },
{ name: "UnionPay", value: "UnionPay" },
{ name: "RuPay", value: "RuPay" },
+ { name: i18nService.t("cardBrandMir"), value: "Mir" },
{ name: i18nService.t("other"), value: "Other" },
];
this.cardExpMonthOptions = [
@@ -243,7 +245,7 @@ export class AddEditComponent implements OnInit {
}
}
- this.folders = await this.folderService.getAllDecrypted();
+ this.folders$ = this.folderService.folderViews$;
if (this.editMode && this.previousCipherId !== this.cipherId) {
this.eventService.collect(EventType.Cipher_ClientViewed, this.cipherId);
diff --git a/libs/angular/src/components/folder-add-edit.component.ts b/libs/angular/src/components/folder-add-edit.component.ts
index 9668f372ecd..2558482c2da 100644
--- a/libs/angular/src/components/folder-add-edit.component.ts
+++ b/libs/angular/src/components/folder-add-edit.component.ts
@@ -1,6 +1,7 @@
import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -20,6 +21,7 @@ export class FolderAddEditComponent implements OnInit {
constructor(
protected folderService: FolderService,
+ protected folderApiService: FolderApiServiceAbstraction,
protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService,
private logService: LogService
@@ -41,7 +43,7 @@ export class FolderAddEditComponent implements OnInit {
try {
const folder = await this.folderService.encrypt(this.folder);
- this.formPromise = this.folderService.saveWithServer(folder);
+ this.formPromise = this.folderApiService.save(folder);
await this.formPromise;
this.platformUtilsService.showToast(
"success",
@@ -70,7 +72,7 @@ export class FolderAddEditComponent implements OnInit {
}
try {
- this.deletePromise = this.folderService.deleteWithServer(this.folder.id);
+ this.deletePromise = this.folderApiService.delete(this.folder.id);
await this.deletePromise;
this.platformUtilsService.showToast("success", null, this.i18nService.t("deletedFolder"));
this.onDeletedFolder.emit(this.folder);
diff --git a/libs/angular/src/components/icon.component.ts b/libs/angular/src/components/icon.component.ts
index e715c57ec8d..0696649e1f9 100644
--- a/libs/angular/src/components/icon.component.ts
+++ b/libs/angular/src/components/icon.component.ts
@@ -20,6 +20,7 @@ const cardIcons: Record = {
Maestro: "card-maestro",
UnionPay: "card-union-pay",
RuPay: "card-ru-pay",
+ Mir: "card-mir",
};
@Component({
diff --git a/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts
index 3f5339c9165..bdfc45fcc1a 100644
--- a/libs/angular/src/components/register.component.ts
+++ b/libs/angular/src/components/register.component.ts
@@ -1,16 +1,23 @@
-import { Directive, OnInit } from "@angular/core";
+import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { AbstractControl, FormBuilder, ValidatorFn, Validators } from "@angular/forms";
import { Router } from "@angular/router";
+import { InputsFieldMatch } from "@bitwarden/angular/validators/inputsFieldMatch.validator";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { AuthService } from "@bitwarden/common/abstractions/auth.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
+import {
+ AllValidationErrors,
+ FormValidationErrorsService,
+} from "@bitwarden/common/abstractions/formValidationErrors.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { DEFAULT_KDF_ITERATIONS, DEFAULT_KDF_TYPE } from "@bitwarden/common/enums/kdfType";
+import { PasswordLogInCredentials } from "@bitwarden/common/models/domain/logInCredentials";
import { KeysRequest } from "@bitwarden/common/models/request/keysRequest";
import { ReferenceEventRequest } from "@bitwarden/common/models/request/referenceEventRequest";
import { RegisterRequest } from "@bitwarden/common/models/request/registerRequest";
@@ -19,22 +26,48 @@ import { CaptchaProtectedComponent } from "./captchaProtected.component";
@Directive()
export class RegisterComponent extends CaptchaProtectedComponent implements OnInit {
- name = "";
- email = "";
- masterPassword = "";
- confirmMasterPassword = "";
- hint = "";
+ @Input() isInTrialFlow = false;
+ @Output() createdAccount = new EventEmitter();
+
showPassword = false;
formPromise: Promise;
masterPasswordScore: number;
referenceData: ReferenceEventRequest;
showTerms = true;
- acceptPolicies = false;
+ showErrorSummary = false;
+
+ formGroup = this.formBuilder.group(
+ {
+ email: ["", [Validators.required, Validators.email]],
+ name: [""],
+ masterPassword: ["", [Validators.required, Validators.minLength(8)]],
+ confirmMasterPassword: ["", [Validators.required, Validators.minLength(8)]],
+ hint: [
+ null,
+ [
+ InputsFieldMatch.validateInputsDoesntMatch(
+ "masterPassword",
+ this.i18nService.t("hintEqualsPassword")
+ ),
+ ],
+ ],
+ acceptPolicies: [false, [this.acceptPoliciesValidation()]],
+ },
+ {
+ validator: InputsFieldMatch.validateFormInputsMatch(
+ "masterPassword",
+ "confirmMasterPassword",
+ this.i18nService.t("masterPassDoesntMatch")
+ ),
+ }
+ );
protected successRoute = "login";
private masterPasswordStrengthTimeout: any;
constructor(
+ protected formValidationErrorService: FormValidationErrorsService,
+ protected formBuilder: FormBuilder,
protected authService: AuthService,
protected router: Router,
i18nService: I18nService,
@@ -84,59 +117,38 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
}
}
- async submit() {
- if (!this.acceptPolicies && this.showTerms) {
+ async submit(showToast = true) {
+ let email = this.formGroup.get("email")?.value;
+ let name = this.formGroup.get("name")?.value;
+ const masterPassword = this.formGroup.get("masterPassword")?.value;
+ const hint = this.formGroup.get("hint")?.value;
+
+ this.formGroup.markAllAsTouched();
+ this.showErrorSummary = true;
+
+ if (this.formGroup.get("acceptPolicies").hasError("required")) {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
- this.i18nService.t("acceptPoliciesError")
+ this.i18nService.t("acceptPoliciesRequired")
);
return;
}
- if (this.email == null || this.email === "") {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("emailRequired")
- );
+ //web
+ if (this.formGroup.invalid && !showToast) {
return;
}
- if (this.email.indexOf("@") === -1) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("invalidEmail")
- );
- return;
- }
- if (this.masterPassword == null || this.masterPassword === "") {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("masterPassRequired")
- );
- return;
- }
- if (this.masterPassword.length < 8) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("masterPassLength")
- );
- return;
- }
- if (this.masterPassword !== this.confirmMasterPassword) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("masterPassDoesntMatch")
- );
+
+ //desktop, browser
+ if (this.formGroup.invalid && showToast) {
+ const errorText = this.getErrorToastMessage();
+ this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), errorText);
return;
}
const strengthResult = this.passwordGenerationService.passwordStrength(
- this.masterPassword,
+ masterPassword,
this.getPasswordStrengthUserInput()
);
if (strengthResult != null && strengthResult.score < 3) {
@@ -152,33 +164,19 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
}
}
- if (this.hint === this.masterPassword) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("hintEqualsPassword")
- );
- return;
- }
-
- this.name = this.name === "" ? null : this.name;
- this.email = this.email.trim().toLowerCase();
+ name = name === "" ? null : name;
+ email = email.trim().toLowerCase();
const kdf = DEFAULT_KDF_TYPE;
const kdfIterations = DEFAULT_KDF_ITERATIONS;
- const key = await this.cryptoService.makeKey(
- this.masterPassword,
- this.email,
- kdf,
- kdfIterations
- );
+ const key = await this.cryptoService.makeKey(masterPassword, email, kdf, kdfIterations);
const encKey = await this.cryptoService.makeEncKey(key);
- const hashedPassword = await this.cryptoService.hashPassword(this.masterPassword, key);
+ const hashedPassword = await this.cryptoService.hashPassword(masterPassword, key);
const keys = await this.cryptoService.makeKeyPair(encKey[0]);
const request = new RegisterRequest(
- this.email,
- this.name,
+ email,
+ name,
hashedPassword,
- this.hint,
+ hint,
encKey[1].encryptedString,
kdf,
kdfIterations,
@@ -203,25 +201,49 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
throw e;
}
}
- this.platformUtilsService.showToast("success", null, this.i18nService.t("newAccountCreated"));
- this.router.navigate([this.successRoute], { queryParams: { email: this.email } });
+
+ if (this.isInTrialFlow) {
+ this.platformUtilsService.showToast(
+ "success",
+ null,
+ this.i18nService.t("trialAccountCreated")
+ );
+ //login user here
+ const credentials = new PasswordLogInCredentials(
+ email,
+ masterPassword,
+ this.captchaToken,
+ null
+ );
+ await this.authService.logIn(credentials);
+
+ this.createdAccount.emit(this.formGroup.get("email")?.value);
+ } else {
+ this.platformUtilsService.showToast(
+ "success",
+ null,
+ this.i18nService.t("newAccountCreated")
+ );
+ this.router.navigate([this.successRoute], { queryParams: { email: email } });
+ }
} catch (e) {
this.logService.error(e);
}
}
- togglePassword(confirmField: boolean) {
+ togglePassword() {
this.showPassword = !this.showPassword;
- document.getElementById(confirmField ? "masterPasswordRetype" : "masterPassword").focus();
}
updatePasswordStrength() {
+ const masterPassword = this.formGroup.get("masterPassword")?.value;
+
if (this.masterPasswordStrengthTimeout != null) {
clearTimeout(this.masterPasswordStrengthTimeout);
}
this.masterPasswordStrengthTimeout = setTimeout(() => {
const strengthResult = this.passwordGenerationService.passwordStrength(
- this.masterPassword,
+ masterPassword,
this.getPasswordStrengthUserInput()
);
this.masterPasswordScore = strengthResult == null ? null : strengthResult.score;
@@ -230,19 +252,56 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn
private getPasswordStrengthUserInput() {
let userInput: string[] = [];
- const atPosition = this.email.indexOf("@");
+ const email = this.formGroup.get("email")?.value;
+ const name = this.formGroup.get("name").value;
+ const atPosition = email.indexOf("@");
if (atPosition > -1) {
userInput = userInput.concat(
- this.email
+ email
.substr(0, atPosition)
.trim()
.toLowerCase()
.split(/[^A-Za-z0-9]/)
);
}
- if (this.name != null && this.name !== "") {
- userInput = userInput.concat(this.name.trim().toLowerCase().split(" "));
+ if (name != null && name !== "") {
+ userInput = userInput.concat(name.trim().toLowerCase().split(" "));
}
return userInput;
}
+
+ private getErrorToastMessage() {
+ const error: AllValidationErrors = this.formValidationErrorService
+ .getFormValidationErrors(this.formGroup.controls)
+ .shift();
+
+ if (error) {
+ switch (error.errorName) {
+ case "email":
+ return this.i18nService.t("invalidEmail");
+ case "inputsDoesntMatchError":
+ return this.i18nService.t("masterPassDoesntMatch");
+ case "inputsMatchError":
+ return this.i18nService.t("hintEqualsPassword");
+ default:
+ return this.i18nService.t(this.errorTag(error));
+ }
+ }
+
+ return;
+ }
+
+ private errorTag(error: AllValidationErrors): string {
+ const name = error.errorName.charAt(0).toUpperCase() + error.errorName.slice(1);
+ return `${error.controlName}${name}`;
+ }
+
+ //validation would be ignored on selfhosted
+ private acceptPoliciesValidation(): ValidatorFn {
+ return (control: AbstractControl) => {
+ const ctrlValue = control.value;
+
+ return !ctrlValue && this.showTerms ? { required: true } : null;
+ };
+ }
}
diff --git a/libs/angular/src/components/set-password.component.ts b/libs/angular/src/components/set-password.component.ts
index 9ae12b9ebb6..3db85a65475 100644
--- a/libs/angular/src/components/set-password.component.ts
+++ b/libs/angular/src/components/set-password.component.ts
@@ -128,6 +128,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
);
const resetRequest = new OrganizationUserResetPasswordEnrollmentRequest();
+ resetRequest.masterPasswordHash = masterPasswordHash;
resetRequest.resetPasswordKey = encryptedKey.encryptedString;
return this.apiService.putOrganizationUserResetPasswordEnrollment(
diff --git a/libs/angular/src/images/cards/mir-dark.png b/libs/angular/src/images/cards/mir-dark.png
new file mode 100644
index 00000000000..e158470db06
Binary files /dev/null and b/libs/angular/src/images/cards/mir-dark.png differ
diff --git a/libs/angular/src/images/cards/mir-light.png b/libs/angular/src/images/cards/mir-light.png
new file mode 100644
index 00000000000..e4997415205
Binary files /dev/null and b/libs/angular/src/images/cards/mir-light.png differ
diff --git a/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts b/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts
index ed35390daee..313db3f04c5 100644
--- a/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts
+++ b/libs/angular/src/modules/vault-filter/components/collection-filter.component.ts
@@ -41,6 +41,7 @@ export class CollectionFilterComponent {
applyFilter(collection: CollectionView) {
this.activeFilter.resetFilter();
+ this.activeFilter.selectedCollection = true;
this.activeFilter.selectedCollectionId = collection.id;
this.onFilterChange.emit(this.activeFilter);
}
diff --git a/libs/angular/src/modules/vault-filter/models/vault-filter.model.spec.ts b/libs/angular/src/modules/vault-filter/models/vault-filter.model.spec.ts
new file mode 100644
index 00000000000..1c63481ab70
--- /dev/null
+++ b/libs/angular/src/modules/vault-filter/models/vault-filter.model.spec.ts
@@ -0,0 +1,237 @@
+import { CipherType } from "@bitwarden/common/enums/cipherType";
+import { CipherView } from "@bitwarden/common/models/view/cipherView";
+
+import { VaultFilter } from "./vault-filter.model";
+
+describe("VaultFilter", () => {
+ describe("filterFunction", () => {
+ describe("generic cipher", () => {
+ it("should return true when not filtering for anything specific", () => {
+ const cipher = createCipher();
+ const filterFunction = createFilterFunction({ status: "all" });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe("given a favorite cipher", () => {
+ const cipher = createCipher({ favorite: true });
+
+ it("should return true when filtering for favorites", () => {
+ const filterFunction = createFilterFunction({ status: "favorites" });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when filtering for trash", () => {
+ const filterFunction = createFilterFunction({ status: "trash" });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("given a deleted cipher", () => {
+ const cipher = createCipher({ deletedDate: new Date() });
+
+ it("should return true when filtering for trash", () => {
+ const filterFunction = createFilterFunction({ status: "trash" });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when filtering for favorites", () => {
+ const filterFunction = createFilterFunction({ status: "favorites" });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("given a cipher with type", () => {
+ it("should return true when filter matches cipher type", () => {
+ const cipher = createCipher({ type: CipherType.Identity });
+ const filterFunction = createFilterFunction({ cipherType: CipherType.Identity });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when filter does not match cipher type", () => {
+ const cipher = createCipher({ type: CipherType.Card });
+ const filterFunction = createFilterFunction({ cipherType: CipherType.Identity });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("given a cipher with folder id", () => {
+ it("should return true when filter matches folder id", () => {
+ const cipher = createCipher({ folderId: "folderId" });
+ const filterFunction = createFilterFunction({
+ selectedFolder: true,
+ selectedFolderId: "folderId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when filter does not match folder id", () => {
+ const cipher = createCipher({ folderId: "folderId" });
+ const filterFunction = createFilterFunction({
+ selectedFolder: true,
+ selectedFolderId: "anotherFolderId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("given a cipher without folder", () => {
+ const cipher = createCipher({ folderId: null });
+
+ it("should return true when filtering on unassigned folder", () => {
+ const filterFunction = createFilterFunction({
+ selectedFolder: true,
+ selectedFolderId: null,
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe("given an organizational cipher (with organization and collections)", () => {
+ const cipher = createCipher({
+ organizationId: "organizationId",
+ collectionIds: ["collectionId", "anotherId"],
+ });
+
+ it("should return true when filter matches collection id", () => {
+ const filterFunction = createFilterFunction({
+ selectedCollection: true,
+ selectedCollectionId: "collectionId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return false when filter does not match collection id", () => {
+ const filterFunction = createFilterFunction({
+ selectedCollection: true,
+ selectedCollectionId: "nonMatchingId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+
+ it("should return false when filter does not match organization id", () => {
+ const filterFunction = createFilterFunction({
+ selectedOrganizationId: "anotherOrganizationId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+
+ it("should return false when filtering for my vault only", () => {
+ const filterFunction = createFilterFunction({
+ myVaultOnly: true,
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+ });
+
+ describe("given an unassigned organizational cipher (with organization, without collection)", () => {
+ const cipher = createCipher({ organizationId: "organizationId", collectionIds: [] });
+
+ it("should return true when filtering for unassigned collection", () => {
+ const filterFunction = createFilterFunction({
+ selectedCollection: true,
+ selectedCollectionId: null,
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return true when filter matches organization id", () => {
+ const filterFunction = createFilterFunction({
+ selectedOrganizationId: "organizationId",
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe("given an individual cipher (without organization or collection)", () => {
+ const cipher = createCipher({ organizationId: null, collectionIds: [] });
+
+ it("should return false when filtering for unassigned collection", () => {
+ const filterFunction = createFilterFunction({
+ selectedCollection: true,
+ selectedCollectionId: null,
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(false);
+ });
+
+ it("should return true when filtering for my vault only", () => {
+ const cipher = createCipher({ organizationId: null });
+ const filterFunction = createFilterFunction({
+ myVaultOnly: true,
+ });
+
+ const result = filterFunction(cipher);
+
+ expect(result).toBe(true);
+ });
+ });
+ });
+});
+
+function createFilterFunction(options: Partial = {}) {
+ return new VaultFilter(options).buildFilter();
+}
+
+function createCipher(options: Partial = {}) {
+ const cipher = new CipherView();
+
+ cipher.favorite = options.favorite ?? false;
+ cipher.deletedDate = options.deletedDate;
+ cipher.type = options.type;
+ cipher.folderId = options.folderId;
+ cipher.collectionIds = options.collectionIds;
+ cipher.organizationId = options.organizationId;
+
+ return cipher;
+}
diff --git a/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts b/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts
index f28cd20336e..942704f1285 100644
--- a/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts
+++ b/libs/angular/src/modules/vault-filter/models/vault-filter.model.ts
@@ -1,9 +1,13 @@
import { CipherType } from "@bitwarden/common/enums/cipherType";
+import { CipherView } from "@bitwarden/common/models/view/cipherView";
import { CipherStatus } from "./cipher-status.model";
+export type VaultFilterFunction = (cipher: CipherView) => boolean;
+
export class VaultFilter {
cipherType?: CipherType;
+ selectedCollection = false; // This is needed because of how the "Unassigned" collection works. It has a null id.
selectedCollectionId?: string;
status?: CipherStatus;
selectedFolder = false; // This is needed because of how the "No Folder" folder works. It has a null id.
@@ -19,6 +23,7 @@ export class VaultFilter {
resetFilter() {
this.cipherType = null;
this.status = null;
+ this.selectedCollection = false;
this.selectedCollectionId = null;
this.selectedFolder = false;
this.selectedFolderId = null;
@@ -29,4 +34,41 @@ export class VaultFilter {
this.selectedOrganizationId = null;
this.resetFilter();
}
+
+ buildFilter(): VaultFilterFunction {
+ return (cipher) => {
+ let cipherPassesFilter = true;
+ if (this.status === "favorites" && cipherPassesFilter) {
+ cipherPassesFilter = cipher.favorite;
+ }
+ if (this.status === "trash" && cipherPassesFilter) {
+ cipherPassesFilter = cipher.isDeleted;
+ }
+ if (this.cipherType != null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.type === this.cipherType;
+ }
+ if (this.selectedFolder && this.selectedFolderId == null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.folderId == null;
+ }
+ if (this.selectedFolder && this.selectedFolderId != null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.folderId === this.selectedFolderId;
+ }
+ if (this.selectedCollection && this.selectedCollectionId == null && cipherPassesFilter) {
+ cipherPassesFilter =
+ cipher.organizationId != null &&
+ (cipher.collectionIds == null || cipher.collectionIds.length === 0);
+ }
+ if (this.selectedCollection && this.selectedCollectionId != null && cipherPassesFilter) {
+ cipherPassesFilter =
+ cipher.collectionIds != null && cipher.collectionIds.includes(this.selectedCollectionId);
+ }
+ if (this.selectedOrganizationId != null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.organizationId === this.selectedOrganizationId;
+ }
+ if (this.myVaultOnly && cipherPassesFilter) {
+ cipherPassesFilter = cipher.organizationId === null;
+ }
+ return cipherPassesFilter;
+ };
+ }
}
diff --git a/libs/angular/src/modules/vault-filter/vault-filter.component.ts b/libs/angular/src/modules/vault-filter/vault-filter.component.ts
index b620ed82e2d..84396472efc 100644
--- a/libs/angular/src/modules/vault-filter/vault-filter.component.ts
+++ b/libs/angular/src/modules/vault-filter/vault-filter.component.ts
@@ -1,4 +1,5 @@
import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { firstValueFrom, Observable } from "rxjs";
import { Organization } from "@bitwarden/common/models/domain/organization";
import { ITreeNodeObject } from "@bitwarden/common/models/domain/treeNode";
@@ -28,7 +29,7 @@ export class VaultFilterComponent implements OnInit {
activePersonalOwnershipPolicy: boolean;
activeSingleOrganizationPolicy: boolean;
collections: DynamicTreeNode;
- folders: DynamicTreeNode;
+ folders$: Observable>;
constructor(protected vaultFilterService: VaultFilterService) {}
@@ -45,7 +46,7 @@ export class VaultFilterComponent implements OnInit {
this.activeSingleOrganizationPolicy =
await this.vaultFilterService.checkForSingleOrganizationPolicy();
}
- this.folders = await this.vaultFilterService.buildFolders();
+ this.folders$ = await this.vaultFilterService.buildNestedFolders();
this.collections = await this.initCollections();
this.isLoaded = true;
}
@@ -67,13 +68,13 @@ export class VaultFilterComponent implements OnInit {
async applyFilter(filter: VaultFilter) {
if (filter.refreshCollectionsAndFolders) {
await this.reloadCollectionsAndFolders(filter);
- filter = this.pruneInvalidatedFilterSelections(filter);
+ filter = await this.pruneInvalidatedFilterSelections(filter);
}
this.onFilterChange.emit(filter);
}
async reloadCollectionsAndFolders(filter: VaultFilter) {
- this.folders = await this.vaultFilterService.buildFolders(filter.selectedOrganizationId);
+ this.folders$ = await this.vaultFilterService.buildNestedFolders(filter.selectedOrganizationId);
this.collections = filter.myVaultOnly
? null
: await this.vaultFilterService.buildCollections(filter.selectedOrganizationId);
@@ -95,14 +96,17 @@ export class VaultFilterComponent implements OnInit {
this.onEditFolder.emit(folder);
}
- protected pruneInvalidatedFilterSelections(filter: VaultFilter): VaultFilter {
- filter = this.pruneInvalidFolderSelection(filter);
+ protected async pruneInvalidatedFilterSelections(filter: VaultFilter): Promise {
+ filter = await this.pruneInvalidFolderSelection(filter);
filter = this.pruneInvalidCollectionSelection(filter);
return filter;
}
- protected pruneInvalidFolderSelection(filter: VaultFilter): VaultFilter {
- if (filter.selectedFolder && !this.folders?.hasId(filter.selectedFolderId)) {
+ protected async pruneInvalidFolderSelection(filter: VaultFilter): Promise {
+ if (
+ filter.selectedFolder &&
+ !(await firstValueFrom(this.folders$))?.hasId(filter.selectedFolderId)
+ ) {
filter.selectedFolder = false;
filter.selectedFolderId = null;
}
@@ -111,9 +115,12 @@ export class VaultFilterComponent implements OnInit {
protected pruneInvalidCollectionSelection(filter: VaultFilter): VaultFilter {
if (
- filter.selectedCollectionId != null &&
- !this.collections?.hasId(filter.selectedCollectionId)
+ filter.myVaultOnly ||
+ (filter.selectedCollection &&
+ filter.selectedCollectionId != null &&
+ !this.collections?.hasId(filter.selectedCollectionId))
) {
+ filter.selectedCollection = false;
filter.selectedCollectionId = null;
}
return filter;
diff --git a/libs/angular/src/modules/vault-filter/vault-filter.service.ts b/libs/angular/src/modules/vault-filter/vault-filter.service.ts
index ea5f52ee909..38757d042c8 100644
--- a/libs/angular/src/modules/vault-filter/vault-filter.service.ts
+++ b/libs/angular/src/modules/vault-filter/vault-filter.service.ts
@@ -1,18 +1,23 @@
import { Injectable } from "@angular/core";
+import { firstValueFrom, from, mergeMap, Observable } from "rxjs";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { OrganizationService } from "@bitwarden/common/abstractions/organization.service";
import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
import { Organization } from "@bitwarden/common/models/domain/organization";
+import { TreeNode } from "@bitwarden/common/models/domain/treeNode";
import { CollectionView } from "@bitwarden/common/models/view/collectionView";
import { FolderView } from "@bitwarden/common/models/view/folderView";
import { DynamicTreeNode } from "./models/dynamic-tree-node.model";
+const NestingDelimiter = "/";
+
@Injectable()
export class VaultFilterService {
constructor(
@@ -36,25 +41,30 @@ export class VaultFilterService {
return await this.organizationService.getAll();
}
- async buildFolders(organizationId?: string): Promise> {
- const storedFolders = await this.folderService.getAllDecrypted();
- let folders: FolderView[];
- if (organizationId != null) {
- const ciphers = await this.cipherService.getAllDecrypted();
- const orgCiphers = ciphers.filter((c) => c.organizationId == organizationId);
- folders = storedFolders.filter(
- (f) =>
- orgCiphers.filter((oc) => oc.folderId == f.id).length > 0 ||
- ciphers.filter((c) => c.folderId == f.id).length < 1
- );
- } else {
- folders = storedFolders;
- }
- const nestedFolders = await this.folderService.getAllNested(folders);
- return new DynamicTreeNode({
- fullList: folders,
- nestedList: nestedFolders,
- });
+ buildNestedFolders(organizationId?: string): Observable> {
+ const transformation = async (storedFolders: FolderView[]) => {
+ let folders: FolderView[];
+ if (organizationId != null) {
+ const ciphers = await this.cipherService.getAllDecrypted();
+ const orgCiphers = ciphers.filter((c) => c.organizationId == organizationId);
+ folders = storedFolders.filter(
+ (f) =>
+ orgCiphers.filter((oc) => oc.folderId == f.id).length > 0 ||
+ ciphers.filter((c) => c.folderId == f.id).length < 1
+ );
+ } else {
+ folders = storedFolders;
+ }
+ const nestedFolders = await this.getAllFoldersNested(folders);
+ return new DynamicTreeNode({
+ fullList: folders,
+ nestedList: nestedFolders,
+ });
+ };
+
+ return this.folderService.folderViews$.pipe(
+ mergeMap((folders) => from(transformation(folders)))
+ );
}
async buildCollections(organizationId?: string): Promise> {
@@ -79,4 +89,23 @@ export class VaultFilterService {
async checkForPersonalOwnershipPolicy(): Promise {
return await this.policyService.policyAppliesToUser(PolicyType.PersonalOwnership);
}
+
+ protected async getAllFoldersNested(folders: FolderView[]): Promise[]> {
+ const nodes: TreeNode[] = [];
+ folders.forEach((f) => {
+ const folderCopy = new FolderView();
+ folderCopy.id = f.id;
+ folderCopy.revisionDate = f.revisionDate;
+ const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
+ ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, NestingDelimiter);
+ });
+ return nodes;
+ }
+
+ async getFolderNested(id: string): Promise> {
+ const folders = await this.getAllFoldersNested(
+ await firstValueFrom(this.folderService.folderViews$)
+ );
+ return ServiceUtils.getTreeNodeObject(folders, id) as TreeNode;
+ }
}
diff --git a/libs/angular/src/pipes/credit-card-number.pipe.ts b/libs/angular/src/pipes/credit-card-number.pipe.ts
index 11500ef9510..a90ae9724d3 100644
--- a/libs/angular/src/pipes/credit-card-number.pipe.ts
+++ b/libs/angular/src/pipes/credit-card-number.pipe.ts
@@ -25,6 +25,12 @@ const numberFormats: Record = {
{ cardLength: 19, blocks: [6, 13] },
],
Amex: [{ cardLength: 15, blocks: [4, 6, 5] }],
+ Mir: [
+ { cardLength: 16, blocks: [4, 4, 4, 4] },
+ { cardLength: 17, blocks: [5, 4, 4, 4] },
+ { cardLength: 18, blocks: [6, 4, 4, 4] },
+ { cardLength: 19, blocks: [7, 4, 4, 4] },
+ ],
Other: [{ cardLength: 16, blocks: [4, 4, 4, 4] }],
};
diff --git a/libs/angular/src/scss/icons.scss b/libs/angular/src/scss/icons.scss
index 58c860ff7ed..eaf061912d3 100644
--- a/libs/angular/src/scss/icons.scss
+++ b/libs/angular/src/scss/icons.scss
@@ -9,6 +9,7 @@ $card-icons: (
"mastercard": $card-icons-base + "mastercard-light.png",
"union-pay": $card-icons-base + "union_pay-light.png",
"ru-pay": $card-icons-base + "ru_pay-light.png",
+ "mir": $card-icons-base + "mir-light.png",
);
$card-icons-dark: (
@@ -21,6 +22,7 @@ $card-icons-dark: (
"mastercard": $card-icons-base + "mastercard-dark.png",
"union-pay": $card-icons-base + "union_pay-dark.png",
"ru-pay": $card-icons-base + "ru_pay-dark.png",
+ "mir": $card-icons-base + "mir-dark.png",
);
.credit-card-icon {
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 1314abf4dac..e90acd075e7 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -16,7 +16,12 @@ import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/
import { EventService as EventServiceAbstraction } from "@bitwarden/common/abstractions/event.service";
import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abstractions/export.service";
import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/fileUpload.service";
-import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
+import {
+ FolderService as FolderServiceAbstraction,
+ InternalFolderService,
+} from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { FormValidationErrorsService as FormValidationErrorsServiceAbstraction } from "@bitwarden/common/abstractions/formValidationErrors.service";
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/abstractions/keyConnector.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -57,7 +62,9 @@ import { EnvironmentService } from "@bitwarden/common/services/environment.servi
import { EventService } from "@bitwarden/common/services/event.service";
import { ExportService } from "@bitwarden/common/services/export.service";
import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
-import { FolderService } from "@bitwarden/common/services/folder.service";
+import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
+import { FolderService } from "@bitwarden/common/services/folder/folder.service";
+import { FormValidationErrorsService } from "@bitwarden/common/services/formValidationErrors.service";
import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
import { NotificationsService } from "@bitwarden/common/services/notifications.service";
import { OrganizationService } from "@bitwarden/common/services/organization.service";
@@ -213,12 +220,20 @@ export const LOG_MAC_FAILURES = new InjectionToken("LOG_MAC_FAILURES");
useClass: FolderService,
deps: [
CryptoServiceAbstraction,
- ApiServiceAbstraction,
I18nServiceAbstraction,
CipherServiceAbstraction,
StateServiceAbstraction,
],
},
+ {
+ provide: InternalFolderService,
+ useExisting: FolderServiceAbstraction,
+ },
+ {
+ provide: FolderApiServiceAbstraction,
+ useClass: FolderApiService,
+ deps: [FolderServiceAbstraction, ApiServiceAbstraction],
+ },
{ provide: LogService, useFactory: () => new ConsoleLogService(false) },
{
provide: CollectionServiceAbstraction,
@@ -291,6 +306,7 @@ export const LOG_MAC_FAILURES = new InjectionToken("LOG_MAC_FAILURES");
StateServiceAbstraction,
OrganizationServiceAbstraction,
ProviderServiceAbstraction,
+ FolderApiServiceAbstraction,
LOGOUT_CALLBACK,
],
},
@@ -444,6 +460,10 @@ export const LOG_MAC_FAILURES = new InjectionToken("LOG_MAC_FAILURES");
provide: AbstractThemingService,
useClass: ThemingService,
},
+ {
+ provide: FormValidationErrorsServiceAbstraction,
+ useClass: FormValidationErrorsService,
+ },
],
})
export class JslibServicesModule {}
diff --git a/libs/angular/src/services/theming/theming.service.ts b/libs/angular/src/services/theming/theming.service.ts
index 7d67503694c..38eb574a725 100644
--- a/libs/angular/src/services/theming/theming.service.ts
+++ b/libs/angular/src/services/theming/theming.service.ts
@@ -1,4 +1,3 @@
-import { MediaMatcher } from "@angular/cdk/layout";
import { DOCUMENT } from "@angular/common";
import { Inject, Injectable } from "@angular/core";
import { BehaviorSubject, filter, fromEvent, Observable } from "rxjs";
@@ -6,6 +5,8 @@ import { BehaviorSubject, filter, fromEvent, Observable } from "rxjs";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { ThemeType } from "@bitwarden/common/enums/themeType";
+import { WINDOW } from "../jslib-services.module";
+
import { Theme } from "./theme";
import { ThemeBuilder } from "./themeBuilder";
import { AbstractThemingService } from "./theming.service.abstraction";
@@ -17,7 +18,7 @@ export class ThemingService implements AbstractThemingService {
constructor(
private stateService: StateService,
- private mediaMatcher: MediaMatcher,
+ @Inject(WINDOW) private window: Window,
@Inject(DOCUMENT) private document: Document
) {
this.monitorThemeChanges();
@@ -55,14 +56,14 @@ export class ThemingService implements AbstractThemingService {
// We use a media match query for monitoring the system theme on web and browser, but this doesn't work for electron apps on Linux.
// In desktop we override these methods to track systemTheme with the electron renderer instead, which works for all OSs.
protected async getSystemTheme(): Promise {
- return this.mediaMatcher.matchMedia("(prefers-color-scheme: dark)").matches
+ return this.window.matchMedia("(prefers-color-scheme: dark)").matches
? ThemeType.Dark
: ThemeType.Light;
}
protected monitorSystemThemeChanges(): void {
fromEvent(
- this.mediaMatcher.matchMedia("(prefers-color-scheme: dark)"),
+ this.window.matchMedia("(prefers-color-scheme: dark)"),
"change"
).subscribe((event) => {
this.updateSystemTheme(event.matches ? ThemeType.Dark : ThemeType.Light);
diff --git a/libs/angular/src/validators/inputsFieldMatch.validator.ts b/libs/angular/src/validators/inputsFieldMatch.validator.ts
new file mode 100644
index 00000000000..9ef1ab789df
--- /dev/null
+++ b/libs/angular/src/validators/inputsFieldMatch.validator.ts
@@ -0,0 +1,57 @@
+import { AbstractControl, FormGroup, ValidatorFn } from "@angular/forms";
+
+import { FormGroupControls } from "@bitwarden/common/abstractions/formValidationErrors.service";
+
+export class InputsFieldMatch {
+ //check to ensure two fields do not have the same value
+ static validateInputsDoesntMatch(matchTo: string, errorMessage: string): ValidatorFn {
+ return (control: AbstractControl) => {
+ if (control.parent && control.parent.controls) {
+ return control?.value === (control?.parent?.controls as FormGroupControls)[matchTo].value
+ ? {
+ inputsMatchError: {
+ message: errorMessage,
+ },
+ }
+ : null;
+ }
+
+ return null;
+ };
+ }
+
+ //check to ensure two fields have the same value
+ static validateInputsMatch(matchTo: string, errorMessage: string): ValidatorFn {
+ return (control: AbstractControl) => {
+ if (control.parent && control.parent.controls) {
+ return control?.value === (control?.parent?.controls as FormGroupControls)[matchTo].value
+ ? null
+ : {
+ inputsDoesntMatchError: {
+ message: errorMessage,
+ },
+ };
+ }
+
+ return null;
+ };
+ }
+
+ //checks the formGroup if two fields have the same value and validation is controlled from either field
+ static validateFormInputsMatch(field: string, fieldMatchTo: string, errorMessage: string) {
+ return (formGroup: FormGroup) => {
+ const fieldCtrl = formGroup.controls[field];
+ const fieldMatchToCtrl = formGroup.controls[fieldMatchTo];
+
+ if (fieldCtrl.value !== fieldMatchToCtrl.value) {
+ fieldMatchToCtrl.setErrors({
+ inputsDoesntMatchError: {
+ message: errorMessage,
+ },
+ });
+ } else {
+ fieldMatchToCtrl.setErrors(null);
+ }
+ };
+ }
+}
diff --git a/libs/common/spec/services/export.service.spec.ts b/libs/common/spec/services/export.service.spec.ts
index 7c0a20c4507..bad26ab351e 100644
--- a/libs/common/spec/services/export.service.spec.ts
+++ b/libs/common/spec/services/export.service.spec.ts
@@ -1,10 +1,11 @@
import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
+import { BehaviorSubject } from "rxjs";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { CipherType } from "@bitwarden/common/enums/cipherType";
import { KdfType } from "@bitwarden/common/enums/kdfType";
import { Utils } from "@bitwarden/common/misc/utils";
@@ -97,8 +98,8 @@ describe("ExportService", () => {
folderService = Substitute.for();
cryptoService = Substitute.for();
- folderService.getAllDecrypted().resolves([]);
- folderService.getAll().resolves([]);
+ folderService.folderViews$.returns(new BehaviorSubject([]));
+ folderService.folders$.returns(new BehaviorSubject([]));
exportService = new ExportService(
folderService,
diff --git a/libs/common/spec/services/folder.service.spec.ts b/libs/common/spec/services/folder.service.spec.ts
new file mode 100644
index 00000000000..e4f269b5361
--- /dev/null
+++ b/libs/common/spec/services/folder.service.spec.ts
@@ -0,0 +1,195 @@
+import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
+import { BehaviorSubject, firstValueFrom } from "rxjs";
+
+import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service";
+import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
+import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { FolderData } from "@bitwarden/common/models/data/folderData";
+import { EncString } from "@bitwarden/common/models/domain/encString";
+import { FolderView } from "@bitwarden/common/models/view/folderView";
+import { ContainerService } from "@bitwarden/common/services/container.service";
+import { FolderService } from "@bitwarden/common/services/folder/folder.service";
+import { StateService } from "@bitwarden/common/services/state.service";
+
+describe("Folder Service", () => {
+ let folderService: FolderService;
+
+ let cryptoService: SubstituteOf;
+ let i18nService: SubstituteOf;
+ let cipherService: SubstituteOf;
+ let stateService: SubstituteOf;
+ let broadcasterService: SubstituteOf;
+ let activeAccount: BehaviorSubject;
+
+ beforeEach(() => {
+ cryptoService = Substitute.for();
+ i18nService = Substitute.for();
+ cipherService = Substitute.for();
+ stateService = Substitute.for();
+ broadcasterService = Substitute.for();
+ activeAccount = new BehaviorSubject("123");
+
+ stateService.getEncryptedFolders().resolves({
+ "1": folderData("1", "test"),
+ });
+ stateService.activeAccount.returns(activeAccount);
+ (window as any).bitwardenContainerService = new ContainerService(cryptoService);
+
+ folderService = new FolderService(
+ cryptoService,
+ i18nService,
+ cipherService,
+ stateService,
+ broadcasterService
+ );
+ });
+
+ it("encrypt", async () => {
+ const model = new FolderView();
+ model.id = "2";
+ model.name = "Test Folder";
+
+ cryptoService.encrypt(Arg.any()).resolves(new EncString("ENC"));
+ cryptoService.decryptToUtf8(Arg.any()).resolves("DEC");
+
+ const result = await folderService.encrypt(model);
+
+ expect(result).toEqual({
+ id: "2",
+ name: {
+ encryptedString: "ENC",
+ encryptionType: 0,
+ },
+ });
+ });
+
+ describe("get", () => {
+ it("exists", async () => {
+ const result = await folderService.get("1");
+
+ expect(result).toEqual({
+ id: "1",
+ name: {
+ decryptedValue: [],
+ encryptedString: "test",
+ encryptionType: 0,
+ },
+ revisionDate: null,
+ });
+ });
+
+ it("not exists", async () => {
+ const result = await folderService.get("2");
+
+ expect(result).toBe(undefined);
+ });
+ });
+
+ it("upsert", async () => {
+ await folderService.upsert(folderData("2", "test 2"));
+
+ expect(await firstValueFrom(folderService.folders$)).toEqual([
+ {
+ id: "1",
+ name: {
+ decryptedValue: [],
+ encryptedString: "test",
+ encryptionType: 0,
+ },
+ revisionDate: null,
+ },
+ {
+ id: "2",
+ name: {
+ decryptedValue: [],
+ encryptedString: "test 2",
+ encryptionType: 0,
+ },
+ revisionDate: null,
+ },
+ ]);
+
+ expect(await firstValueFrom(folderService.folderViews$)).toEqual([
+ { id: "1", name: [], revisionDate: null },
+ { id: "2", name: [], revisionDate: null },
+ { id: null, name: [], revisionDate: null },
+ ]);
+ });
+
+ it("replace", async () => {
+ await folderService.replace({ "2": folderData("2", "test 2") });
+
+ expect(await firstValueFrom(folderService.folders$)).toEqual([
+ {
+ id: "2",
+ name: {
+ decryptedValue: [],
+ encryptedString: "test 2",
+ encryptionType: 0,
+ },
+ revisionDate: null,
+ },
+ ]);
+
+ expect(await firstValueFrom(folderService.folderViews$)).toEqual([
+ { id: "2", name: [], revisionDate: null },
+ { id: null, name: [], revisionDate: null },
+ ]);
+ });
+
+ it("delete", async () => {
+ await folderService.delete("1");
+
+ expect((await firstValueFrom(folderService.folders$)).length).toBe(0);
+
+ expect(await firstValueFrom(folderService.folderViews$)).toEqual([
+ { id: null, name: [], revisionDate: null },
+ ]);
+ });
+
+ it("clearCache", async () => {
+ await folderService.clearCache();
+
+ expect((await firstValueFrom(folderService.folders$)).length).toBe(1);
+ expect((await firstValueFrom(folderService.folderViews$)).length).toBe(0);
+ });
+
+ describe("clear", () => {
+ it("null userId", async () => {
+ await folderService.clear();
+
+ stateService.received(1).setEncryptedFolders(Arg.any(), Arg.any());
+
+ expect((await firstValueFrom(folderService.folders$)).length).toBe(0);
+ expect((await firstValueFrom(folderService.folderViews$)).length).toBe(0);
+ });
+
+ it("matching userId", async () => {
+ stateService.getUserId().resolves("1");
+ await folderService.clear("1");
+
+ stateService.received(1).setEncryptedFolders(Arg.any(), Arg.any());
+
+ expect((await firstValueFrom(folderService.folders$)).length).toBe(0);
+ expect((await firstValueFrom(folderService.folderViews$)).length).toBe(0);
+ });
+
+ it("missmatching userId", async () => {
+ await folderService.clear("12");
+
+ stateService.received(1).setEncryptedFolders(Arg.any(), Arg.any());
+
+ expect((await firstValueFrom(folderService.folders$)).length).toBe(1);
+ expect((await firstValueFrom(folderService.folderViews$)).length).toBe(2);
+ });
+ });
+
+ function folderData(id: string, name: string) {
+ const data = new FolderData({} as any);
+ data.id = id;
+ data.name = name;
+
+ return data;
+ }
+});
diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts
index 5f0789943b5..34646565684 100644
--- a/libs/common/spec/services/import.service.spec.ts
+++ b/libs/common/spec/services/import.service.spec.ts
@@ -4,7 +4,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
-import { FolderService } from "@bitwarden/common/abstractions/folder.service";
+import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { BitwardenPasswordProtectedImporter } from "@bitwarden/common/importers/bitwardenPasswordProtectedImporter";
diff --git a/libs/common/spec/services/stateMigration.service.spec.ts b/libs/common/spec/services/stateMigration.service.spec.ts
index 46fb13d70a1..7ac12f51e30 100644
--- a/libs/common/spec/services/stateMigration.service.spec.ts
+++ b/libs/common/spec/services/stateMigration.service.spec.ts
@@ -9,6 +9,9 @@ import { StateMigrationService } from "@bitwarden/common/services/stateMigration
const userId = "USER_ID";
+// Note: each test calls the private migration method for that migration,
+// so that we don't accidentally run all following migrations as well
+
describe("State Migration Service", () => {
let storageService: SubstituteOf;
let secureStorageService: SubstituteOf;
@@ -66,13 +69,13 @@ describe("State Migration Service", () => {
storageService.get(userId, Arg.any()).resolves(accountVersion3);
- await stateMigrationService.migrate();
+ await (stateMigrationService as any).migrateStateFrom3To4();
storageService.received(1).save(userId, expectedAccountVersion4, Arg.any());
});
it("updates StateVersion number", async () => {
- await stateMigrationService.migrate();
+ await (stateMigrationService as any).migrateStateFrom3To4();
storageService.received(1).save(
"global",
@@ -81,4 +84,47 @@ describe("State Migration Service", () => {
);
});
});
+
+ describe("StateVersion 4 to 5 migration", () => {
+ it("migrates organization keys to new format", async () => {
+ const accountVersion4 = new Account({
+ keys: {
+ organizationKeys: {
+ encrypted: {
+ orgOneId: "orgOneEncKey",
+ orgTwoId: "orgTwoEncKey",
+ orgThreeId: "orgThreeEncKey",
+ },
+ },
+ },
+ } as any);
+
+ const expectedAccount = new Account({
+ keys: {
+ organizationKeys: {
+ encrypted: {
+ orgOneId: {
+ type: "organization",
+ key: "orgOneEncKey",
+ },
+ orgTwoId: {
+ type: "organization",
+ key: "orgTwoEncKey",
+ },
+ orgThreeId: {
+ type: "organization",
+ key: "orgThreeEncKey",
+ },
+ },
+ },
+ },
+ });
+
+ const migratedAccount = await (stateMigrationService as any).migrateAccountFrom4To5(
+ accountVersion4
+ );
+
+ expect(migratedAccount).toEqual(expectedAccount);
+ });
+ });
});
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index d485328d0d2..365e3cd43dc 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -1,3 +1,4 @@
+import { OrganizationApiKeyType } from "../enums/organizationApiKeyType";
import { OrganizationConnectionType } from "../enums/organizationConnectionType";
import { PolicyType } from "../enums/policyType";
import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest";
@@ -23,7 +24,6 @@ import { EmergencyAccessInviteRequest } from "../models/request/emergencyAccessI
import { EmergencyAccessPasswordRequest } from "../models/request/emergencyAccessPasswordRequest";
import { EmergencyAccessUpdateRequest } from "../models/request/emergencyAccessUpdateRequest";
import { EventRequest } from "../models/request/eventRequest";
-import { FolderRequest } from "../models/request/folderRequest";
import { GroupRequest } from "../models/request/groupRequest";
import { IapCheckRequest } from "../models/request/iapCheckRequest";
import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest";
@@ -117,7 +117,6 @@ import {
EmergencyAccessViewResponse,
} from "../models/response/emergencyAccessResponse";
import { EventResponse } from "../models/response/eventResponse";
-import { FolderResponse } from "../models/response/folderResponse";
import { GroupDetailsResponse, GroupResponse } from "../models/response/groupResponse";
import { IdentityCaptchaResponse } from "../models/response/identityCaptchaResponse";
import { IdentityTokenResponse } from "../models/response/identityTokenResponse";
@@ -182,6 +181,16 @@ import { UserKeyResponse } from "../models/response/userKeyResponse";
import { SendAccessView } from "../models/view/sendAccessView";
export abstract class ApiService {
+ send: (
+ method: "GET" | "POST" | "PUT" | "DELETE",
+ path: string,
+ body: any,
+ authed: boolean,
+ hasResponse: boolean,
+ apiUrl?: string,
+ alterHeaders?: (headers: Headers) => void
+ ) => Promise;
+
postIdentityToken: (
request: PasswordTokenRequest | SsoTokenRequest | ApiTokenRequest
) => Promise;
@@ -228,11 +237,6 @@ export abstract class ApiService {
getUserBillingHistory: () => Promise;
getUserBillingPayment: () => Promise;
- getFolder: (id: string) => Promise;
- postFolder: (request: FolderRequest) => Promise;
- putFolder: (id: string, request: FolderRequest) => Promise;
- deleteFolder: (id: string) => Promise;
-
getSend: (id: string) => Promise;
postSendAccess: (
id: string,
@@ -259,6 +263,7 @@ export abstract class ApiService {
renewSendFileUploadUrl: (sendId: string, fileId: string) => Promise;
getCipher: (id: string) => Promise;
+ getFullCipherDetails: (id: string) => Promise;
getCipherAdmin: (id: string) => Promise;
getAttachmentData: (
cipherId: string,
@@ -569,7 +574,8 @@ export abstract class ApiService {
request: OrganizationApiKeyRequest
) => Promise;
getOrganizationApiKeyInformation: (
- id: string
+ id: string,
+ type?: OrganizationApiKeyType
) => Promise>;
postOrganizationRotateApiKey: (
id: string,
diff --git a/libs/common/src/abstractions/environment.service.ts b/libs/common/src/abstractions/environment.service.ts
index 8398b4c634e..84bceaa1972 100644
--- a/libs/common/src/abstractions/environment.service.ts
+++ b/libs/common/src/abstractions/environment.service.ts
@@ -9,6 +9,7 @@ export type Urls = {
notifications?: string;
events?: string;
keyConnector?: string;
+ scim?: string;
};
export type PayPalConfig = {
@@ -28,6 +29,7 @@ export abstract class EnvironmentService {
getIdentityUrl: () => string;
getEventsUrl: () => string;
getKeyConnectorUrl: () => string;
+ getScimUrl: () => string;
setUrlsFromStorage: () => Promise;
setUrls: (urls: Urls) => Promise;
getUrls: () => Urls;
diff --git a/libs/common/src/abstractions/folder.service.ts b/libs/common/src/abstractions/folder.service.ts
deleted file mode 100644
index f848de90920..00000000000
--- a/libs/common/src/abstractions/folder.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FolderData } from "../models/data/folderData";
-import { Folder } from "../models/domain/folder";
-import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
-import { TreeNode } from "../models/domain/treeNode";
-import { FolderView } from "../models/view/folderView";
-
-export abstract class FolderService {
- clearCache: (userId?: string) => Promise;
- encrypt: (model: FolderView, key?: SymmetricCryptoKey) => Promise;
- get: (id: string) => Promise;
- getAll: () => Promise;
- getAllDecrypted: () => Promise;
- getAllNested: (folders?: FolderView[]) => Promise[]>;
- getNested: (id: string) => Promise>;
- saveWithServer: (folder: Folder) => Promise;
- upsert: (folder: FolderData | FolderData[]) => Promise;
- replace: (folders: { [id: string]: FolderData }) => Promise;
- clear: (userId: string) => Promise;
- delete: (id: string | string[]) => Promise;
- deleteWithServer: (id: string) => Promise;
-}
diff --git a/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts
new file mode 100644
index 00000000000..97f3b724afe
--- /dev/null
+++ b/libs/common/src/abstractions/folder/folder-api.service.abstraction.ts
@@ -0,0 +1,8 @@
+import { Folder } from "@bitwarden/common/models/domain/folder";
+import { FolderResponse } from "@bitwarden/common/models/response/folderResponse";
+
+export class FolderApiServiceAbstraction {
+ save: (folder: Folder) => Promise;
+ delete: (id: string) => Promise;
+ get: (id: string) => Promise;
+}
diff --git a/libs/common/src/abstractions/folder/folder.service.abstraction.ts b/libs/common/src/abstractions/folder/folder.service.abstraction.ts
new file mode 100644
index 00000000000..42e0420f9b3
--- /dev/null
+++ b/libs/common/src/abstractions/folder/folder.service.abstraction.ts
@@ -0,0 +1,26 @@
+import { Observable } from "rxjs";
+
+import { FolderData } from "../../models/data/folderData";
+import { Folder } from "../../models/domain/folder";
+import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey";
+import { FolderView } from "../../models/view/folderView";
+
+export abstract class FolderService {
+ folders$: Observable;
+ folderViews$: Observable;
+
+ clearCache: () => Promise;
+ encrypt: (model: FolderView, key?: SymmetricCryptoKey) => Promise;
+ get: (id: string) => Promise;
+ /**
+ * @deprecated Only use in CLI!
+ */
+ getAllDecryptedFromState: () => Promise;
+}
+
+export abstract class InternalFolderService extends FolderService {
+ upsert: (folder: FolderData | FolderData[]) => Promise;
+ replace: (folders: { [id: string]: FolderData }) => Promise;
+ clear: (userId: string) => Promise;
+ delete: (id: string | string[]) => Promise;
+}
diff --git a/libs/common/src/abstractions/formValidationErrors.service.ts b/libs/common/src/abstractions/formValidationErrors.service.ts
new file mode 100644
index 00000000000..08a12443a0c
--- /dev/null
+++ b/libs/common/src/abstractions/formValidationErrors.service.ts
@@ -0,0 +1,13 @@
+import { AbstractControl } from "@angular/forms";
+export interface AllValidationErrors {
+ controlName: string;
+ errorName: string;
+}
+
+export interface FormGroupControls {
+ [key: string]: AbstractControl;
+}
+
+export abstract class FormValidationErrorsService {
+ getFormValidationErrors: (controls: FormGroupControls) => AllValidationErrors[];
+}
diff --git a/libs/common/src/abstractions/i18n.service.ts b/libs/common/src/abstractions/i18n.service.ts
index 4706e0d1aa8..23f2d4fd235 100644
--- a/libs/common/src/abstractions/i18n.service.ts
+++ b/libs/common/src/abstractions/i18n.service.ts
@@ -1,5 +1,7 @@
+import { Observable } from "rxjs";
+
export abstract class I18nService {
- locale: string;
+ locale$: Observable;
supportedTranslationLocales: string[];
translationLocale: string;
collator: Intl.Collator;
diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts
index ec24884e3c4..b88926635cb 100644
--- a/libs/common/src/abstractions/state.service.ts
+++ b/libs/common/src/abstractions/state.service.ts
@@ -1,10 +1,11 @@
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, Observable } from "rxjs";
import { KdfType } from "../enums/kdfType";
import { ThemeType } from "../enums/themeType";
import { UriMatchType } from "../enums/uriMatchType";
import { CipherData } from "../models/data/cipherData";
import { CollectionData } from "../models/data/collectionData";
+import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData";
import { EventData } from "../models/data/eventData";
import { FolderData } from "../models/data/folderData";
import { OrganizationData } from "../models/data/organizationData";
@@ -21,13 +22,14 @@ import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { WindowState } from "../models/domain/windowState";
import { CipherView } from "../models/view/cipherView";
import { CollectionView } from "../models/view/collectionView";
-import { FolderView } from "../models/view/folderView";
import { SendView } from "../models/view/sendView";
export abstract class StateService {
accounts: BehaviorSubject<{ [userId: string]: T }>;
activeAccount: BehaviorSubject;
+ activeAccountUnlocked: Observable;
+
addAccount: (account: T) => Promise;
setActiveUser: (userId: string) => Promise;
clean: (options?: StorageOptions) => Promise;
@@ -88,8 +90,6 @@ export abstract class StateService {
value: SymmetricCryptoKey,
options?: StorageOptions
) => Promise;
- getDecryptedFolders: (options?: StorageOptions) => Promise;
- setDecryptedFolders: (value: FolderView[], options?: StorageOptions) => Promise;
getDecryptedOrganizationKeys: (
options?: StorageOptions
) => Promise>;
@@ -183,14 +183,22 @@ export abstract class StateService {
) => Promise;
getEncryptedCryptoSymmetricKey: (options?: StorageOptions) => Promise;
setEncryptedCryptoSymmetricKey: (value: string, options?: StorageOptions) => Promise;
+ /**
+ * @deprecated Do not call this directly, use FolderService
+ */
getEncryptedFolders: (options?: StorageOptions) => Promise<{ [id: string]: FolderData }>;
+ /**
+ * @deprecated Do not call this directly, use FolderService
+ */
setEncryptedFolders: (
value: { [id: string]: FolderData },
options?: StorageOptions
) => Promise;
- getEncryptedOrganizationKeys: (options?: StorageOptions) => Promise;
+ getEncryptedOrganizationKeys: (
+ options?: StorageOptions
+ ) => Promise<{ [orgId: string]: EncryptedOrganizationKeyData }>;
setEncryptedOrganizationKeys: (
- value: Map,
+ value: { [orgId: string]: EncryptedOrganizationKeyData },
options?: StorageOptions
) => Promise;
getEncryptedPasswordGenerationHistory: (
diff --git a/libs/common/src/enums/eventType.ts b/libs/common/src/enums/eventType.ts
index d6268aea559..43a45fc32d9 100644
--- a/libs/common/src/enums/eventType.ts
+++ b/libs/common/src/enums/eventType.ts
@@ -48,6 +48,8 @@ export enum EventType {
OrganizationUser_AdminResetPassword = 1508,
OrganizationUser_ResetSsoLink = 1509,
OrganizationUser_FirstSsoLogin = 1510,
+ OrganizationUser_Deactivated = 1511,
+ OrganizationUser_Activated = 1512,
Organization_Updated = 1600,
Organization_PurgedVault = 1601,
diff --git a/libs/common/src/enums/organizationApiKeyType.ts b/libs/common/src/enums/organizationApiKeyType.ts
index 27479a8de02..44ba7f8391d 100644
--- a/libs/common/src/enums/organizationApiKeyType.ts
+++ b/libs/common/src/enums/organizationApiKeyType.ts
@@ -1,4 +1,5 @@
export enum OrganizationApiKeyType {
Default = 0,
BillingSync = 1,
+ Scim = 2,
}
diff --git a/libs/common/src/enums/organizationConnectionType.ts b/libs/common/src/enums/organizationConnectionType.ts
index 1291874370a..d2f9700a6a0 100644
--- a/libs/common/src/enums/organizationConnectionType.ts
+++ b/libs/common/src/enums/organizationConnectionType.ts
@@ -1,3 +1,4 @@
export enum OrganizationConnectionType {
CloudBillingSync = 1,
+ Scim = 2,
}
diff --git a/libs/common/src/enums/permissions.ts b/libs/common/src/enums/permissions.ts
index bb0021506a9..46ee9066203 100644
--- a/libs/common/src/enums/permissions.ts
+++ b/libs/common/src/enums/permissions.ts
@@ -25,4 +25,5 @@ export enum Permissions {
DeleteAssignedCollections,
ManageSso,
ManageBilling,
+ ManageScim,
}
diff --git a/libs/common/src/enums/scimProviderType.ts b/libs/common/src/enums/scimProviderType.ts
new file mode 100644
index 00000000000..43c518fdfbf
--- /dev/null
+++ b/libs/common/src/enums/scimProviderType.ts
@@ -0,0 +1,9 @@
+export enum ScimProviderType {
+ Default = 0,
+ AzureAd = 1,
+ Okta = 2,
+ OneLogin = 3,
+ JumpCloud = 4,
+ GoogleWorkspace = 5,
+ Rippling = 6,
+}
diff --git a/libs/common/src/enums/stateVersion.ts b/libs/common/src/enums/stateVersion.ts
index 5aeb02e5409..cc36f53f57f 100644
--- a/libs/common/src/enums/stateVersion.ts
+++ b/libs/common/src/enums/stateVersion.ts
@@ -3,5 +3,6 @@ export enum StateVersion {
Two = 2, // Move to a typed State object
Three = 3, // Fix migration of users' premium status
Four = 4, // Fix 'Never Lock' option by removing stale data
- Latest = Four,
+ Five = 5, // Migrate to new storage of encrypted organization keys
+ Latest = Five,
}
diff --git a/libs/common/src/importers/baseImporter.ts b/libs/common/src/importers/baseImporter.ts
index 122b34724d8..0e1192a652b 100644
--- a/libs/common/src/importers/baseImporter.ts
+++ b/libs/common/src/importers/baseImporter.ts
@@ -301,6 +301,12 @@ export abstract class BaseImporter {
return "Visa";
}
+ // Mir
+ re = new RegExp("^220[0-4]");
+ if (cardNum.match(re) != null) {
+ return "Mir";
+ }
+
return null;
}
diff --git a/libs/common/src/models/api/permissionsApi.ts b/libs/common/src/models/api/permissionsApi.ts
index bac79bd3cf1..c35cb69cb54 100644
--- a/libs/common/src/models/api/permissionsApi.ts
+++ b/libs/common/src/models/api/permissionsApi.ts
@@ -25,6 +25,7 @@ export class PermissionsApi extends BaseResponse {
managePolicies: boolean;
manageUsers: boolean;
manageResetPassword: boolean;
+ manageScim: boolean;
constructor(data: any = null) {
super(data);
@@ -51,5 +52,6 @@ export class PermissionsApi extends BaseResponse {
this.managePolicies = this.getResponseProperty("ManagePolicies");
this.manageUsers = this.getResponseProperty("ManageUsers");
this.manageResetPassword = this.getResponseProperty("ManageResetPassword");
+ this.manageScim = this.getResponseProperty("ManageScim");
}
}
diff --git a/libs/common/src/models/api/scimConfigApi.ts b/libs/common/src/models/api/scimConfigApi.ts
new file mode 100644
index 00000000000..2269ac59691
--- /dev/null
+++ b/libs/common/src/models/api/scimConfigApi.ts
@@ -0,0 +1,17 @@
+import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType";
+
+import { BaseResponse } from "../response/baseResponse";
+
+export class ScimConfigApi extends BaseResponse {
+ enabled: boolean;
+ scimProvider: ScimProviderType;
+
+ constructor(data: any) {
+ super(data);
+ if (data == null) {
+ return;
+ }
+ this.enabled = this.getResponseProperty("Enabled");
+ this.scimProvider = this.getResponseProperty("ScimProvider");
+ }
+}
diff --git a/libs/common/src/models/data/encryptedOrganizationKeyData.ts b/libs/common/src/models/data/encryptedOrganizationKeyData.ts
new file mode 100644
index 00000000000..8ecbeefb814
--- /dev/null
+++ b/libs/common/src/models/data/encryptedOrganizationKeyData.ts
@@ -0,0 +1,14 @@
+export type EncryptedOrganizationKeyData =
+ | OrganizationEncryptedOrganizationKeyData
+ | ProviderEncryptedOrganizationKeyData;
+
+type OrganizationEncryptedOrganizationKeyData = {
+ type: "organization";
+ key: string;
+};
+
+type ProviderEncryptedOrganizationKeyData = {
+ type: "provider";
+ key: string;
+ providerId: string;
+};
diff --git a/libs/common/src/models/data/organizationData.ts b/libs/common/src/models/data/organizationData.ts
index d093821fc31..5d5e5229594 100644
--- a/libs/common/src/models/data/organizationData.ts
+++ b/libs/common/src/models/data/organizationData.ts
@@ -19,6 +19,7 @@ export class OrganizationData {
useApi: boolean;
useSso: boolean;
useKeyConnector: boolean;
+ useScim: boolean;
useResetPassword: boolean;
selfHost: boolean;
usersGetPremium: boolean;
@@ -58,6 +59,7 @@ export class OrganizationData {
this.useApi = response.useApi;
this.useSso = response.useSso;
this.useKeyConnector = response.useKeyConnector;
+ this.useScim = response.useScim;
this.useResetPassword = response.useResetPassword;
this.selfHost = response.selfHost;
this.usersGetPremium = response.usersGetPremium;
diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts
index 7d2077960fd..ff4b60345d8 100644
--- a/libs/common/src/models/domain/account.ts
+++ b/libs/common/src/models/domain/account.ts
@@ -3,6 +3,7 @@ import { KdfType } from "../../enums/kdfType";
import { UriMatchType } from "../../enums/uriMatchType";
import { CipherData } from "../data/cipherData";
import { CollectionData } from "../data/collectionData";
+import { EncryptedOrganizationKeyData } from "../data/encryptedOrganizationKeyData";
import { EventData } from "../data/eventData";
import { FolderData } from "../data/folderData";
import { OrganizationData } from "../data/organizationData";
@@ -11,7 +12,6 @@ import { ProviderData } from "../data/providerData";
import { SendData } from "../data/sendData";
import { CipherView } from "../view/cipherView";
import { CollectionView } from "../view/collectionView";
-import { FolderView } from "../view/folderView";
import { SendView } from "../view/sendView";
import { EncString } from "./encString";
@@ -31,15 +31,19 @@ export class DataEncryptionPair {
decrypted?: TDecrypted[];
}
+// This is a temporary structure to handle migrated `DataEncryptionPair` to
+// avoid needing a data migration at this stage. It should be replaced with
+// proper data migrations when `DataEncryptionPair` is deprecated.
+export class TemporaryDataEncryption {
+ encrypted?: { [id: string]: TEncrypted };
+}
+
export class AccountData {
ciphers?: DataEncryptionPair = new DataEncryptionPair<
CipherData,
CipherView
>();
- folders?: DataEncryptionPair = new DataEncryptionPair<
- FolderData,
- FolderView
- >();
+ folders? = new TemporaryDataEncryption();
localData?: any;
sends?: DataEncryptionPair = new DataEncryptionPair();
collections?: DataEncryptionPair = new DataEncryptionPair<
@@ -66,8 +70,11 @@ export class AccountKeys {
string,
SymmetricCryptoKey
>();
- organizationKeys?: EncryptionPair> = new EncryptionPair<
- any,
+ organizationKeys?: EncryptionPair<
+ { [orgId: string]: EncryptedOrganizationKeyData },
+ Map
+ > = new EncryptionPair<
+ { [orgId: string]: EncryptedOrganizationKeyData },
Map
>();
providerKeys?: EncryptionPair> = new EncryptionPair<
diff --git a/libs/common/src/models/domain/encryptedOrganizationKey.ts b/libs/common/src/models/domain/encryptedOrganizationKey.ts
new file mode 100644
index 00000000000..25a49aab148
--- /dev/null
+++ b/libs/common/src/models/domain/encryptedOrganizationKey.ts
@@ -0,0 +1,56 @@
+import { CryptoService } from "../../abstractions/crypto.service";
+import { EncryptedOrganizationKeyData } from "../../models/data/encryptedOrganizationKeyData";
+
+import { EncString } from "./encString";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+
+export abstract class BaseEncryptedOrganizationKey {
+ decrypt: (cryptoService: CryptoService) => Promise;
+
+ static fromData(data: EncryptedOrganizationKeyData) {
+ switch (data.type) {
+ case "organization":
+ return new EncryptedOrganizationKey(data.key);
+
+ case "provider":
+ return new ProviderEncryptedOrganizationKey(data.key, data.providerId);
+
+ default:
+ return null;
+ }
+ }
+}
+
+export class EncryptedOrganizationKey implements BaseEncryptedOrganizationKey {
+ constructor(private key: string) {}
+
+ async decrypt(cryptoService: CryptoService) {
+ const decValue = await cryptoService.rsaDecrypt(this.key);
+ return new SymmetricCryptoKey(decValue);
+ }
+
+ toData(): EncryptedOrganizationKeyData {
+ return {
+ type: "organization",
+ key: this.key,
+ };
+ }
+}
+
+export class ProviderEncryptedOrganizationKey implements BaseEncryptedOrganizationKey {
+ constructor(private key: string, private providerId: string) {}
+
+ async decrypt(cryptoService: CryptoService) {
+ const providerKey = await cryptoService.getProviderKey(this.providerId);
+ const decValue = await cryptoService.decryptToBytes(new EncString(this.key), providerKey);
+ return new SymmetricCryptoKey(decValue);
+ }
+
+ toData(): EncryptedOrganizationKeyData {
+ return {
+ type: "provider",
+ key: this.key,
+ providerId: this.providerId,
+ };
+ }
+}
diff --git a/libs/common/src/models/domain/organization.ts b/libs/common/src/models/domain/organization.ts
index ba1c8e1a173..c15d936234f 100644
--- a/libs/common/src/models/domain/organization.ts
+++ b/libs/common/src/models/domain/organization.ts
@@ -20,6 +20,7 @@ export class Organization {
useApi: boolean;
useSso: boolean;
useKeyConnector: boolean;
+ useScim: boolean;
useResetPassword: boolean;
selfHost: boolean;
usersGetPremium: boolean;
@@ -63,6 +64,7 @@ export class Organization {
this.useApi = obj.useApi;
this.useSso = obj.useSso;
this.useKeyConnector = obj.useKeyConnector;
+ this.useScim = obj.useScim;
this.useResetPassword = obj.useResetPassword;
this.selfHost = obj.selfHost;
this.usersGetPremium = obj.usersGetPremium;
@@ -173,6 +175,10 @@ export class Organization {
return this.isAdmin || this.permissions.manageSso;
}
+ get canManageScim() {
+ return this.isAdmin || this.permissions.manageScim;
+ }
+
get canManagePolicies() {
return this.isAdmin || this.permissions.managePolicies;
}
@@ -207,6 +213,7 @@ export class Organization {
(permissions.includes(Permissions.ManageUsers) && this.canManageUsers) ||
(permissions.includes(Permissions.ManageUsersPassword) && this.canManageUsersPassword) ||
(permissions.includes(Permissions.ManageSso) && this.canManageSso) ||
+ (permissions.includes(Permissions.ManageScim) && this.canManageScim) ||
(permissions.includes(Permissions.ManageBilling) && this.canManageBilling);
return specifiedPermissions && (this.enabled || this.isOwner);
diff --git a/libs/common/src/models/request/organizationConnectionRequest.ts b/libs/common/src/models/request/organizationConnectionRequest.ts
index 69964cb09e6..2506ac1d080 100644
--- a/libs/common/src/models/request/organizationConnectionRequest.ts
+++ b/libs/common/src/models/request/organizationConnectionRequest.ts
@@ -1,9 +1,10 @@
import { OrganizationConnectionType } from "../../enums/organizationConnectionType";
import { BillingSyncConfigRequest } from "./billingSyncConfigRequest";
+import { ScimConfigRequest } from "./scimConfigRequest";
/**API request config types for OrganizationConnectionRequest */
-export type OrganizationConnectionRequestConfigs = BillingSyncConfigRequest;
+export type OrganizationConnectionRequestConfigs = BillingSyncConfigRequest | ScimConfigRequest;
export class OrganizationConnectionRequest {
constructor(
diff --git a/libs/common/src/models/request/passwordRequest.ts b/libs/common/src/models/request/passwordRequest.ts
index 9f7df7df373..eb3498a27f5 100644
--- a/libs/common/src/models/request/passwordRequest.ts
+++ b/libs/common/src/models/request/passwordRequest.ts
@@ -2,5 +2,6 @@ import { SecretVerificationRequest } from "./secretVerificationRequest";
export class PasswordRequest extends SecretVerificationRequest {
newMasterPasswordHash: string;
+ masterPasswordHint: string;
key: string;
}
diff --git a/libs/common/src/models/request/scimConfigRequest.ts b/libs/common/src/models/request/scimConfigRequest.ts
new file mode 100644
index 00000000000..7549661cdd1
--- /dev/null
+++ b/libs/common/src/models/request/scimConfigRequest.ts
@@ -0,0 +1,5 @@
+import { ScimProviderType } from "@bitwarden/common/enums/scimProviderType";
+
+export class ScimConfigRequest {
+ constructor(private enabled: boolean, private scimProvider: ScimProviderType = null) {}
+}
diff --git a/libs/common/src/models/response/errorResponse.ts b/libs/common/src/models/response/errorResponse.ts
index 3a0d22e695d..859803b441f 100644
--- a/libs/common/src/models/response/errorResponse.ts
+++ b/libs/common/src/models/response/errorResponse.ts
@@ -21,15 +21,13 @@ export class ErrorResponse extends BaseResponse {
}
}
- if (errorModel) {
+ if (status === 429) {
+ this.message = "Rate limit exceeded. Try again later.";
+ } else if (errorModel) {
this.message = this.getResponseProperty("Message", errorModel);
this.validationErrors = this.getResponseProperty("ValidationErrors", errorModel);
this.captchaSiteKey = this.validationErrors?.HCaptcha_SiteKey?.[0];
this.captchaRequired = !Utils.isNullOrWhitespace(this.captchaSiteKey);
- } else {
- if (status === 429) {
- this.message = "Rate limit exceeded. Try again later.";
- }
}
this.statusCode = status;
}
diff --git a/libs/common/src/models/response/organizationConnectionResponse.ts b/libs/common/src/models/response/organizationConnectionResponse.ts
index a1e9a3de679..7f39d250f3b 100644
--- a/libs/common/src/models/response/organizationConnectionResponse.ts
+++ b/libs/common/src/models/response/organizationConnectionResponse.ts
@@ -1,10 +1,11 @@
import { OrganizationConnectionType } from "../../enums/organizationConnectionType";
import { BillingSyncConfigApi } from "../api/billingSyncConfigApi";
+import { ScimConfigApi } from "../api/scimConfigApi";
import { BaseResponse } from "./baseResponse";
/**API response config types for OrganizationConnectionResponse */
-export type OrganizationConnectionConfigApis = BillingSyncConfigApi;
+export type OrganizationConnectionConfigApis = BillingSyncConfigApi | ScimConfigApi;
export class OrganizationConnectionResponse<
TConfig extends OrganizationConnectionConfigApis
diff --git a/libs/common/src/models/response/profileOrganizationResponse.ts b/libs/common/src/models/response/profileOrganizationResponse.ts
index 39b7644caaf..0287ae96c99 100644
--- a/libs/common/src/models/response/profileOrganizationResponse.ts
+++ b/libs/common/src/models/response/profileOrganizationResponse.ts
@@ -17,6 +17,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
useApi: boolean;
useSso: boolean;
useKeyConnector: boolean;
+ useScim: boolean;
useResetPassword: boolean;
selfHost: boolean;
usersGetPremium: boolean;
@@ -57,6 +58,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
this.useApi = this.getResponseProperty("UseApi");
this.useSso = this.getResponseProperty("UseSso");
this.useKeyConnector = this.getResponseProperty("UseKeyConnector") ?? false;
+ this.useScim = this.getResponseProperty("UseScim") ?? false;
this.useResetPassword = this.getResponseProperty("UseResetPassword");
this.selfHost = this.getResponseProperty("SelfHost");
this.usersGetPremium = this.getResponseProperty("UsersGetPremium");
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 9f2108663cf..9950bfdef19 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -4,6 +4,7 @@ import { EnvironmentService } from "../abstractions/environment.service";
import { PlatformUtilsService } from "../abstractions/platformUtils.service";
import { TokenService } from "../abstractions/token.service";
import { DeviceType } from "../enums/deviceType";
+import { OrganizationApiKeyType } from "../enums/organizationApiKeyType";
import { OrganizationConnectionType } from "../enums/organizationConnectionType";
import { PolicyType } from "../enums/policyType";
import { Utils } from "../misc/utils";
@@ -30,7 +31,6 @@ import { EmergencyAccessInviteRequest } from "../models/request/emergencyAccessI
import { EmergencyAccessPasswordRequest } from "../models/request/emergencyAccessPasswordRequest";
import { EmergencyAccessUpdateRequest } from "../models/request/emergencyAccessUpdateRequest";
import { EventRequest } from "../models/request/eventRequest";
-import { FolderRequest } from "../models/request/folderRequest";
import { GroupRequest } from "../models/request/groupRequest";
import { IapCheckRequest } from "../models/request/iapCheckRequest";
import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest";
@@ -126,7 +126,6 @@ import {
} from "../models/response/emergencyAccessResponse";
import { ErrorResponse } from "../models/response/errorResponse";
import { EventResponse } from "../models/response/eventResponse";
-import { FolderResponse } from "../models/response/folderResponse";
import { GroupDetailsResponse, GroupResponse } from "../models/response/groupResponse";
import { IdentityCaptchaResponse } from "../models/response/identityCaptchaResponse";
import { IdentityTokenResponse } from "../models/response/identityTokenResponse";
@@ -487,27 +486,6 @@ export class ApiService implements ApiServiceAbstraction {
return new BillingPaymentResponse(r);
}
- // Folder APIs
-
- async getFolder(id: string): Promise {
- const r = await this.send("GET", "/folders/" + id, null, true, true);
- return new FolderResponse(r);
- }
-
- async postFolder(request: FolderRequest): Promise {
- const r = await this.send("POST", "/folders", request, true, true);
- return new FolderResponse(r);
- }
-
- async putFolder(id: string, request: FolderRequest): Promise {
- const r = await this.send("PUT", "/folders/" + id, request, true, true);
- return new FolderResponse(r);
- }
-
- deleteFolder(id: string): Promise {
- return this.send("DELETE", "/folders/" + id, null, true, false);
- }
-
// Send APIs
async getSend(id: string): Promise {
@@ -612,6 +590,11 @@ export class ApiService implements ApiServiceAbstraction {
return new CipherResponse(r);
}
+ async getFullCipherDetails(id: string): Promise {
+ const r = await this.send("GET", "/ciphers/" + id + "/details", null, true, true);
+ return new CipherResponse(r);
+ }
+
async getCipherAdmin(id: string): Promise {
const r = await this.send("GET", "/ciphers/" + id + "/admin", null, true, true);
return new CipherResponse(r);
@@ -1412,7 +1395,7 @@ export class ApiService implements ApiServiceAbstraction {
// Plan APIs
async getPlans(): Promise> {
- const r = await this.send("GET", "/plans/", null, true, true);
+ const r = await this.send("GET", "/plans/", null, false, true);
return new ListResponse(r, PlanResponse);
}
@@ -1840,15 +1823,14 @@ export class ApiService implements ApiServiceAbstraction {
}
async getOrganizationApiKeyInformation(
- id: string
+ id: string,
+ type: OrganizationApiKeyType = null
): Promise> {
- const r = await this.send(
- "GET",
- "/organizations/" + id + "/api-key-information",
- null,
- true,
- true
- );
+ const uri =
+ type === null
+ ? "/organizations/" + id + "/api-key-information"
+ : "/organizations/" + id + "/api-key-information/" + type;
+ const r = await this.send("GET", uri, null, true, true);
return new ListResponse(r, OrganizationApiKeyInformationResponse);
}
@@ -2566,7 +2548,7 @@ export class ApiService implements ApiServiceAbstraction {
await this.tokenService.setToken(response.accessToken);
}
- private async send(
+ async send(
method: "GET" | "POST" | "PUT" | "DELETE",
path: string,
body: any,
diff --git a/libs/common/src/services/collection.service.ts b/libs/common/src/services/collection.service.ts
index 4d3563d7c5d..12054916e01 100644
--- a/libs/common/src/services/collection.service.ts
+++ b/libs/common/src/services/collection.service.ts
@@ -86,6 +86,7 @@ export class CollectionService implements CollectionServiceAbstraction {
const collections = await this.getAll();
decryptedCollections = await this.decryptMany(collections);
+
await this.stateService.setDecryptedCollections(decryptedCollections);
return decryptedCollections;
}
diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts
index d4f9bd1de17..0d625295e42 100644
--- a/libs/common/src/services/crypto.service.ts
+++ b/libs/common/src/services/crypto.service.ts
@@ -13,9 +13,11 @@ import { KeySuffixOptions } from "../enums/keySuffixOptions";
import { sequentialize } from "../misc/sequentialize";
import { Utils } from "../misc/utils";
import { EEFLongWordList } from "../misc/wordlist";
+import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData";
import { EncArrayBuffer } from "../models/domain/encArrayBuffer";
import { EncString } from "../models/domain/encString";
import { EncryptedObject } from "../models/domain/encryptedObject";
+import { BaseEncryptedOrganizationKey } from "../models/domain/encryptedOrganizationKey";
import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { ProfileOrganizationResponse } from "../models/response/profileOrganizationResponse";
import { ProfileProviderOrganizationResponse } from "../models/response/profileProviderOrganizationResponse";
@@ -58,23 +60,28 @@ export class CryptoService implements CryptoServiceAbstraction {
}
async setOrgKeys(
- orgs: ProfileOrganizationResponse[],
- providerOrgs: ProfileProviderOrganizationResponse[]
+ orgs: ProfileOrganizationResponse[] = [],
+ providerOrgs: ProfileProviderOrganizationResponse[] = []
): Promise {
- const orgKeys: any = {};
+ const encOrgKeyData: { [orgId: string]: EncryptedOrganizationKeyData } = {};
+
orgs.forEach((org) => {
- orgKeys[org.id] = org.key;
+ encOrgKeyData[org.id] = {
+ type: "organization",
+ key: org.key,
+ };
});
- for (const providerOrg of providerOrgs) {
- // Convert provider encrypted keys to user encrypted.
- const providerKey = await this.getProviderKey(providerOrg.providerId);
- const decValue = await this.decryptToBytes(new EncString(providerOrg.key), providerKey);
- orgKeys[providerOrg.id] = (await this.rsaEncrypt(decValue)).encryptedString;
- }
+ providerOrgs.forEach((org) => {
+ encOrgKeyData[org.id] = {
+ type: "provider",
+ providerId: org.providerId,
+ key: org.key,
+ };
+ });
await this.stateService.setDecryptedOrganizationKeys(null);
- return await this.stateService.setEncryptedOrganizationKeys(orgKeys);
+ return await this.stateService.setEncryptedOrganizationKeys(encOrgKeyData);
}
async setProviderKeys(providers: ProfileProviderResponse[]): Promise {
@@ -211,35 +218,36 @@ export class CryptoService implements CryptoServiceAbstraction {
@sequentialize(() => "getOrgKeys")
async getOrgKeys(): Promise> {
- const orgKeys: Map = new Map();
+ const result: Map = new Map();
const decryptedOrganizationKeys = await this.stateService.getDecryptedOrganizationKeys();
if (decryptedOrganizationKeys != null && decryptedOrganizationKeys.size > 0) {
return decryptedOrganizationKeys;
}
- const encOrgKeys = await this.stateService.getEncryptedOrganizationKeys();
- if (encOrgKeys == null) {
+ const encOrgKeyData = await this.stateService.getEncryptedOrganizationKeys();
+ if (encOrgKeyData == null) {
return null;
}
let setKey = false;
- for (const orgId in encOrgKeys) {
- // eslint-disable-next-line
- if (!encOrgKeys.hasOwnProperty(orgId)) {
+ for (const orgId of Object.keys(encOrgKeyData)) {
+ if (result.has(orgId)) {
continue;
}
- const decValue = await this.rsaDecrypt(encOrgKeys[orgId]);
- orgKeys.set(orgId, new SymmetricCryptoKey(decValue));
+ const encOrgKey = BaseEncryptedOrganizationKey.fromData(encOrgKeyData[orgId]);
+ const decOrgKey = await encOrgKey.decrypt(this);
+ result.set(orgId, decOrgKey);
+
setKey = true;
}
if (setKey) {
- await this.stateService.setDecryptedOrganizationKeys(orgKeys);
+ await this.stateService.setDecryptedOrganizationKeys(result);
}
- return orgKeys;
+ return result;
}
async getOrgKey(orgId: string): Promise {
diff --git a/libs/common/src/services/environment.service.ts b/libs/common/src/services/environment.service.ts
index b13afd59acd..c22d7d85e62 100644
--- a/libs/common/src/services/environment.service.ts
+++ b/libs/common/src/services/environment.service.ts
@@ -19,6 +19,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
private notificationsUrl: string;
private eventsUrl: string;
private keyConnectorUrl: string;
+ private scimUrl: string = null;
constructor(private stateService: StateService) {
this.stateService.activeAccount.subscribe(async () => {
@@ -111,6 +112,16 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
return this.keyConnectorUrl;
}
+ getScimUrl() {
+ if (this.scimUrl != null) {
+ return this.scimUrl + "/v2";
+ }
+
+ return this.getWebVaultUrl() === "https://vault.bitwarden.com"
+ ? "https://scim.bitwarden.com/v2"
+ : this.getWebVaultUrl() + "/scim/v2";
+ }
+
async setUrlsFromStorage(): Promise {
const urls: any = await this.stateService.getEnvironmentUrls();
const envUrls = new EnvironmentUrls();
@@ -123,6 +134,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
this.notificationsUrl = urls.notifications;
this.eventsUrl = envUrls.events = urls.events;
this.keyConnectorUrl = urls.keyConnector;
+ // scimUrl is not saved to storage
}
async setUrls(urls: Urls): Promise {
@@ -135,6 +147,9 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
urls.events = this.formatUrl(urls.events);
urls.keyConnector = this.formatUrl(urls.keyConnector);
+ // scimUrl cannot be cleared
+ urls.scim = this.formatUrl(urls.scim) ?? this.scimUrl;
+
await this.stateService.setEnvironmentUrls({
base: urls.base,
api: urls.api,
@@ -144,6 +159,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
notifications: urls.notifications,
events: urls.events,
keyConnector: urls.keyConnector,
+ // scimUrl is not saved to storage
});
this.baseUrl = urls.base;
@@ -154,6 +170,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
this.notificationsUrl = urls.notifications;
this.eventsUrl = urls.events;
this.keyConnectorUrl = urls.keyConnector;
+ this.scimUrl = urls.scim;
this.urlsSubject.next(urls);
@@ -170,6 +187,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
notifications: this.notificationsUrl,
events: this.eventsUrl,
keyConnector: this.keyConnectorUrl,
+ scim: this.scimUrl,
};
}
diff --git a/libs/common/src/services/export.service.ts b/libs/common/src/services/export.service.ts
index c6f08be6d26..11695936196 100644
--- a/libs/common/src/services/export.service.ts
+++ b/libs/common/src/services/export.service.ts
@@ -1,4 +1,5 @@
import * as papa from "papaparse";
+import { firstValueFrom } from "rxjs";
import { ApiService } from "../abstractions/api.service";
import { CipherService } from "../abstractions/cipher.service";
@@ -8,7 +9,7 @@ import {
ExportFormat,
ExportService as ExportServiceAbstraction,
} from "../abstractions/export.service";
-import { FolderService } from "../abstractions/folder.service";
+import { FolderService } from "../abstractions/folder/folder.service.abstraction";
import { CipherType } from "../enums/cipherType";
import { DEFAULT_KDF_ITERATIONS, KdfType } from "../enums/kdfType";
import { Utils } from "../misc/utils";
@@ -115,7 +116,7 @@ export class ExportService implements ExportServiceAbstraction {
const promises = [];
promises.push(
- this.folderService.getAllDecrypted().then((folders) => {
+ firstValueFrom(this.folderService.folderViews$).then((folders) => {
decFolders = folders;
})
);
@@ -191,7 +192,7 @@ export class ExportService implements ExportServiceAbstraction {
const promises = [];
promises.push(
- this.folderService.getAll().then((f) => {
+ firstValueFrom(this.folderService.folders$).then((f) => {
folders = f;
})
);
diff --git a/libs/common/src/services/folder.service.ts b/libs/common/src/services/folder.service.ts
deleted file mode 100644
index f791c07f4d2..00000000000
--- a/libs/common/src/services/folder.service.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import { ApiService } from "../abstractions/api.service";
-import { CipherService } from "../abstractions/cipher.service";
-import { CryptoService } from "../abstractions/crypto.service";
-import { FolderService as FolderServiceAbstraction } from "../abstractions/folder.service";
-import { I18nService } from "../abstractions/i18n.service";
-import { StateService } from "../abstractions/state.service";
-import { ServiceUtils } from "../misc/serviceUtils";
-import { Utils } from "../misc/utils";
-import { CipherData } from "../models/data/cipherData";
-import { FolderData } from "../models/data/folderData";
-import { Folder } from "../models/domain/folder";
-import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
-import { TreeNode } from "../models/domain/treeNode";
-import { FolderRequest } from "../models/request/folderRequest";
-import { FolderResponse } from "../models/response/folderResponse";
-import { FolderView } from "../models/view/folderView";
-
-const NestingDelimiter = "/";
-
-export class FolderService implements FolderServiceAbstraction {
- constructor(
- private cryptoService: CryptoService,
- private apiService: ApiService,
- private i18nService: I18nService,
- private cipherService: CipherService,
- private stateService: StateService
- ) {}
-
- async clearCache(userId?: string): Promise {
- await this.stateService.setDecryptedFolders(null, { userId: userId });
- }
-
- async encrypt(model: FolderView, key?: SymmetricCryptoKey): Promise {
- const folder = new Folder();
- folder.id = model.id;
- folder.name = await this.cryptoService.encrypt(model.name, key);
- return folder;
- }
-
- async get(id: string): Promise {
- const folders = await this.stateService.getEncryptedFolders();
- // eslint-disable-next-line
- if (folders == null || !folders.hasOwnProperty(id)) {
- return null;
- }
-
- return new Folder(folders[id]);
- }
-
- async getAll(): Promise {
- const folders = await this.stateService.getEncryptedFolders();
- const response: Folder[] = [];
- for (const id in folders) {
- // eslint-disable-next-line
- if (folders.hasOwnProperty(id)) {
- response.push(new Folder(folders[id]));
- }
- }
- return response;
- }
-
- async getAllDecrypted(): Promise {
- const decryptedFolders = await this.stateService.getDecryptedFolders();
- if (decryptedFolders != null) {
- return decryptedFolders;
- }
-
- const hasKey = await this.cryptoService.hasKey();
- if (!hasKey) {
- throw new Error("No key.");
- }
-
- const decFolders: FolderView[] = [];
- const promises: Promise[] = [];
- const folders = await this.getAll();
- folders.forEach((folder) => {
- promises.push(folder.decrypt().then((f) => decFolders.push(f)));
- });
-
- await Promise.all(promises);
- decFolders.sort(Utils.getSortFunction(this.i18nService, "name"));
-
- const noneFolder = new FolderView();
- noneFolder.name = this.i18nService.t("noneFolder");
- decFolders.push(noneFolder);
-
- await this.stateService.setDecryptedFolders(decFolders);
- return decFolders;
- }
-
- async getAllNested(folders?: FolderView[]): Promise[]> {
- folders = folders ?? (await this.getAllDecrypted());
- const nodes: TreeNode[] = [];
- folders.forEach((f) => {
- const folderCopy = new FolderView();
- folderCopy.id = f.id;
- folderCopy.revisionDate = f.revisionDate;
- const parts = f.name != null ? f.name.replace(/^\/+|\/+$/g, "").split(NestingDelimiter) : [];
- ServiceUtils.nestedTraverse(nodes, 0, parts, folderCopy, null, NestingDelimiter);
- });
- return nodes;
- }
-
- async getNested(id: string): Promise> {
- const folders = await this.getAllNested();
- return ServiceUtils.getTreeNodeObject(folders, id) as TreeNode;
- }
-
- async saveWithServer(folder: Folder): Promise {
- const request = new FolderRequest(folder);
-
- let response: FolderResponse;
- if (folder.id == null) {
- response = await this.apiService.postFolder(request);
- folder.id = response.id;
- } else {
- response = await this.apiService.putFolder(folder.id, request);
- }
-
- const data = new FolderData(response);
- await this.upsert(data);
- }
-
- async upsert(folder: FolderData | FolderData[]): Promise {
- let folders = await this.stateService.getEncryptedFolders();
- if (folders == null) {
- folders = {};
- }
-
- if (folder instanceof FolderData) {
- const f = folder as FolderData;
- folders[f.id] = f;
- } else {
- (folder as FolderData[]).forEach((f) => {
- folders[f.id] = f;
- });
- }
-
- await this.stateService.setDecryptedFolders(null);
- await this.stateService.setEncryptedFolders(folders);
- }
-
- async replace(folders: { [id: string]: FolderData }): Promise {
- await this.stateService.setDecryptedFolders(null);
- await this.stateService.setEncryptedFolders(folders);
- }
-
- async clear(userId?: string): Promise {
- await this.stateService.setDecryptedFolders(null, { userId: userId });
- await this.stateService.setEncryptedFolders(null, { userId: userId });
- }
-
- async delete(id: string | string[]): Promise {
- const folders = await this.stateService.getEncryptedFolders();
- if (folders == null) {
- return;
- }
-
- if (typeof id === "string") {
- if (folders[id] == null) {
- return;
- }
- delete folders[id];
- } else {
- (id as string[]).forEach((i) => {
- delete folders[i];
- });
- }
-
- await this.stateService.setDecryptedFolders(null);
- await this.stateService.setEncryptedFolders(folders);
-
- // Items in a deleted folder are re-assigned to "No Folder"
- const ciphers = await this.stateService.getEncryptedCiphers();
- if (ciphers != null) {
- const updates: CipherData[] = [];
- for (const cId in ciphers) {
- if (ciphers[cId].folderId === id) {
- ciphers[cId].folderId = null;
- updates.push(ciphers[cId]);
- }
- }
- if (updates.length > 0) {
- this.cipherService.upsert(updates);
- }
- }
- }
-
- async deleteWithServer(id: string): Promise {
- await this.apiService.deleteFolder(id);
- await this.delete(id);
- }
-}
diff --git a/libs/common/src/services/folder/folder-api.service.ts b/libs/common/src/services/folder/folder-api.service.ts
new file mode 100644
index 00000000000..d855c063539
--- /dev/null
+++ b/libs/common/src/services/folder/folder-api.service.ts
@@ -0,0 +1,50 @@
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
+import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
+import { FolderData } from "@bitwarden/common/models/data/folderData";
+import { Folder } from "@bitwarden/common/models/domain/folder";
+import { FolderRequest } from "@bitwarden/common/models/request/folderRequest";
+import { FolderResponse } from "@bitwarden/common/models/response/folderResponse";
+
+export class FolderApiService implements FolderApiServiceAbstraction {
+ constructor(private folderService: InternalFolderService, private apiService: ApiService) {}
+
+ async save(folder: Folder): Promise {
+ const request = new FolderRequest(folder);
+
+ let response: FolderResponse;
+ if (folder.id == null) {
+ response = await this.postFolder(request);
+ folder.id = response.id;
+ } else {
+ response = await this.putFolder(folder.id, request);
+ }
+
+ const data = new FolderData(response);
+ await this.folderService.upsert(data);
+ }
+
+ async delete(id: string): Promise {
+ await this.deleteFolder(id);
+ await this.folderService.delete(id);
+ }
+
+ async get(id: string): Promise {
+ const r = await this.apiService.send("GET", "/folders/" + id, null, true, true);
+ return new FolderResponse(r);
+ }
+
+ private async postFolder(request: FolderRequest): Promise {
+ const r = await this.apiService.send("POST", "/folders", request, true, true);
+ return new FolderResponse(r);
+ }
+
+ async putFolder(id: string, request: FolderRequest): Promise {
+ const r = await this.apiService.send("PUT", "/folders/" + id, request, true, true);
+ return new FolderResponse(r);
+ }
+
+ private deleteFolder(id: string): Promise {
+ return this.apiService.send("DELETE", "/folders/" + id, null, true, false);
+ }
+}
diff --git a/libs/common/src/services/folder/folder.service.ts b/libs/common/src/services/folder/folder.service.ts
new file mode 100644
index 00000000000..222ea44fb35
--- /dev/null
+++ b/libs/common/src/services/folder/folder.service.ts
@@ -0,0 +1,163 @@
+import { BehaviorSubject } from "rxjs";
+
+import { CipherService } from "../../abstractions/cipher.service";
+import { CryptoService } from "../../abstractions/crypto.service";
+import { InternalFolderService as InternalFolderServiceAbstraction } from "../../abstractions/folder/folder.service.abstraction";
+import { I18nService } from "../../abstractions/i18n.service";
+import { StateService } from "../../abstractions/state.service";
+import { Utils } from "../../misc/utils";
+import { CipherData } from "../../models/data/cipherData";
+import { FolderData } from "../../models/data/folderData";
+import { Folder } from "../../models/domain/folder";
+import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey";
+import { FolderView } from "../../models/view/folderView";
+
+export class FolderService implements InternalFolderServiceAbstraction {
+ private _folders: BehaviorSubject = new BehaviorSubject([]);
+ private _folderViews: BehaviorSubject = new BehaviorSubject([]);
+
+ folders$ = this._folders.asObservable();
+ folderViews$ = this._folderViews.asObservable();
+
+ constructor(
+ private cryptoService: CryptoService,
+ private i18nService: I18nService,
+ private cipherService: CipherService,
+ private stateService: StateService
+ ) {
+ this.stateService.activeAccountUnlocked.subscribe(async (unlocked) => {
+ if ((Utils.global as any).bitwardenContainerService == null) {
+ return;
+ }
+
+ if (!unlocked) {
+ this._folders.next([]);
+ this._folderViews.next([]);
+ return;
+ }
+
+ const data = await this.stateService.getEncryptedFolders();
+
+ await this.updateObservables(data);
+ });
+ }
+
+ async clearCache(): Promise {
+ this._folderViews.next([]);
+ }
+
+ // TODO: This should be moved to EncryptService or something
+ async encrypt(model: FolderView, key?: SymmetricCryptoKey): Promise {
+ const folder = new Folder();
+ folder.id = model.id;
+ folder.name = await this.cryptoService.encrypt(model.name, key);
+ return folder;
+ }
+
+ async get(id: string): Promise {
+ const folders = this._folders.getValue();
+
+ return folders.find((folder) => folder.id === id);
+ }
+
+ /**
+ * @deprecated Only use in CLI!
+ */
+ async getAllDecryptedFromState(): Promise {
+ const data = await this.stateService.getEncryptedFolders();
+ const folders = Object.values(data || {}).map((f) => new Folder(f));
+
+ return this.decryptFolders(folders);
+ }
+
+ async upsert(folder: FolderData | FolderData[]): Promise {
+ let folders = await this.stateService.getEncryptedFolders();
+ if (folders == null) {
+ folders = {};
+ }
+
+ if (folder instanceof FolderData) {
+ const f = folder as FolderData;
+ folders[f.id] = f;
+ } else {
+ (folder as FolderData[]).forEach((f) => {
+ folders[f.id] = f;
+ });
+ }
+
+ await this.updateObservables(folders);
+ await this.stateService.setEncryptedFolders(folders);
+ }
+
+ async replace(folders: { [id: string]: FolderData }): Promise {
+ await this.updateObservables(folders);
+ await this.stateService.setEncryptedFolders(folders);
+ }
+
+ async clear(userId?: string): Promise {
+ if (userId == null || userId == (await this.stateService.getUserId())) {
+ this._folders.next([]);
+ this._folderViews.next([]);
+ }
+ await this.stateService.setEncryptedFolders(null, { userId: userId });
+ }
+
+ async delete(id: string | string[]): Promise {
+ const folders = await this.stateService.getEncryptedFolders();
+ if (folders == null) {
+ return;
+ }
+
+ if (typeof id === "string") {
+ if (folders[id] == null) {
+ return;
+ }
+ delete folders[id];
+ } else {
+ (id as string[]).forEach((i) => {
+ delete folders[i];
+ });
+ }
+
+ await this.updateObservables(folders);
+ await this.stateService.setEncryptedFolders(folders);
+
+ // Items in a deleted folder are re-assigned to "No Folder"
+ const ciphers = await this.stateService.getEncryptedCiphers();
+ if (ciphers != null) {
+ const updates: CipherData[] = [];
+ for (const cId in ciphers) {
+ if (ciphers[cId].folderId === id) {
+ ciphers[cId].folderId = null;
+ updates.push(ciphers[cId]);
+ }
+ }
+ if (updates.length > 0) {
+ this.cipherService.upsert(updates);
+ }
+ }
+ }
+
+ private async updateObservables(foldersMap: { [id: string]: FolderData }) {
+ const folders = Object.values(foldersMap || {}).map((f) => new Folder(f));
+
+ this._folders.next(folders);
+
+ if (await this.cryptoService.hasKey()) {
+ this._folderViews.next(await this.decryptFolders(folders));
+ }
+ }
+
+ private async decryptFolders(folders: Folder[]) {
+ const decryptFolderPromises = folders.map((f) => f.decrypt());
+ const decryptedFolders = await Promise.all(decryptFolderPromises);
+
+ decryptedFolders.sort(Utils.getSortFunction(this.i18nService, "name"));
+
+ const noneFolder = new FolderView();
+ noneFolder.name = this.i18nService.t("noneFolder");
+ decryptedFolders.push(noneFolder);
+
+ return decryptedFolders;
+ }
+}
diff --git a/libs/common/src/services/formValidationErrors.service.ts b/libs/common/src/services/formValidationErrors.service.ts
new file mode 100644
index 00000000000..c5ce5377eb8
--- /dev/null
+++ b/libs/common/src/services/formValidationErrors.service.ts
@@ -0,0 +1,31 @@
+import { FormGroup, ValidationErrors } from "@angular/forms";
+
+import {
+ FormGroupControls,
+ FormValidationErrorsService as FormValidationErrorsAbstraction,
+ AllValidationErrors,
+} from "../abstractions/formValidationErrors.service";
+
+export class FormValidationErrorsService implements FormValidationErrorsAbstraction {
+ getFormValidationErrors(controls: FormGroupControls): AllValidationErrors[] {
+ let errors: AllValidationErrors[] = [];
+ Object.keys(controls).forEach((key) => {
+ const control = controls[key];
+ if (control instanceof FormGroup) {
+ errors = errors.concat(this.getFormValidationErrors(control.controls));
+ }
+
+ const controlErrors: ValidationErrors = controls[key].errors;
+ if (controlErrors !== null) {
+ Object.keys(controlErrors).forEach((keyError) => {
+ errors.push({
+ controlName: key,
+ errorName: keyError,
+ });
+ });
+ }
+ });
+
+ return errors;
+ }
+}
diff --git a/libs/common/src/services/i18n.service.ts b/libs/common/src/services/i18n.service.ts
index fda8f839ead..9281cc8cf4d 100644
--- a/libs/common/src/services/i18n.service.ts
+++ b/libs/common/src/services/i18n.service.ts
@@ -1,7 +1,10 @@
+import { Observable, ReplaySubject } from "rxjs";
+
import { I18nService as I18nServiceAbstraction } from "../abstractions/i18n.service";
export class I18nService implements I18nServiceAbstraction {
- locale: string;
+ private _locale = new ReplaySubject(1);
+ locale$: Observable = this._locale.asObservable();
// First locale is the default (English)
supportedTranslationLocales: string[] = ["en"];
translationLocale: string;
@@ -85,10 +88,14 @@ export class I18nService implements I18nServiceAbstraction {
}
this.inited = true;
- this.locale = this.translationLocale = locale != null ? locale : this.systemLanguage;
+ this.translationLocale = locale != null ? locale : this.systemLanguage;
+ this._locale.next(this.translationLocale);
try {
- this.collator = new Intl.Collator(this.locale, { numeric: true, sensitivity: "base" });
+ this.collator = new Intl.Collator(this.translationLocale, {
+ numeric: true,
+ sensitivity: "base",
+ });
} catch {
this.collator = null;
}
diff --git a/libs/common/src/services/import.service.ts b/libs/common/src/services/import.service.ts
index 86226d7d6a7..2b1b7bd5678 100644
--- a/libs/common/src/services/import.service.ts
+++ b/libs/common/src/services/import.service.ts
@@ -2,7 +2,7 @@ import { ApiService } from "../abstractions/api.service";
import { CipherService } from "../abstractions/cipher.service";
import { CollectionService } from "../abstractions/collection.service";
import { CryptoService } from "../abstractions/crypto.service";
-import { FolderService } from "../abstractions/folder.service";
+import { FolderService } from "../abstractions/folder/folder.service.abstraction";
import { I18nService } from "../abstractions/i18n.service";
import { ImportService as ImportServiceAbstraction } from "../abstractions/import.service";
import { PlatformUtilsService } from "../abstractions/platformUtils.service";
diff --git a/libs/common/src/services/search.service.ts b/libs/common/src/services/search.service.ts
index c020dd299f9..fe2c87c33d8 100644
--- a/libs/common/src/services/search.service.ts
+++ b/libs/common/src/services/search.service.ts
@@ -14,16 +14,23 @@ export class SearchService implements SearchServiceAbstraction {
indexedEntityId?: string = null;
private indexing = false;
private index: lunr.Index = null;
- private searchableMinLength = 2;
+ private readonly immediateSearchLocales: string[] = ["zh-CN", "zh-TW", "ja", "ko", "vi"];
+ private readonly defaultSearchableMinLength: number = 2;
+ private searchableMinLength: number = this.defaultSearchableMinLength;
constructor(
private cipherService: CipherService,
private logService: LogService,
private i18nService: I18nService
) {
- if (["zh-CN", "zh-TW"].indexOf(i18nService.locale) !== -1) {
- this.searchableMinLength = 1;
- }
+ this.i18nService.locale$.subscribe((locale) => {
+ if (this.immediateSearchLocales.indexOf(locale) !== -1) {
+ this.searchableMinLength = 1;
+ } else {
+ this.searchableMinLength = this.defaultSearchableMinLength;
+ }
+ });
+
//register lunr pipeline function
lunr.Pipeline.registerFunction(this.normalizeAccentsPipelineFunction, "normalizeAccents");
}
diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts
index c2ae787482a..8fe91210f64 100644
--- a/libs/common/src/services/state.service.ts
+++ b/libs/common/src/services/state.service.ts
@@ -13,6 +13,7 @@ import { StateFactory } from "../factories/stateFactory";
import { Utils } from "../misc/utils";
import { CipherData } from "../models/data/cipherData";
import { CollectionData } from "../models/data/collectionData";
+import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData";
import { EventData } from "../models/data/eventData";
import { FolderData } from "../models/data/folderData";
import { OrganizationData } from "../models/data/organizationData";
@@ -31,7 +32,6 @@ import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { WindowState } from "../models/domain/windowState";
import { CipherView } from "../models/view/cipherView";
import { CollectionView } from "../models/view/collectionView";
-import { FolderView } from "../models/view/folderView";
import { SendView } from "../models/view/sendView";
const keys = {
@@ -56,6 +56,7 @@ export class StateService<
{
accounts = new BehaviorSubject<{ [userId: string]: TAccount }>({});
activeAccount = new BehaviorSubject(null);
+ activeAccountUnlocked = new BehaviorSubject(false);
private hasBeenInited = false;
private isRecoveredSession = false;
@@ -70,7 +71,21 @@ export class StateService<
protected stateMigrationService: StateMigrationService,
protected stateFactory: StateFactory,
protected useAccountCache: boolean = true
- ) {}
+ ) {
+ // If the account gets changed, verify the new account is unlocked
+ this.activeAccount.subscribe(async (userId) => {
+ if (userId == null && this.activeAccountUnlocked.getValue() == false) {
+ return;
+ } else if (userId == null) {
+ this.activeAccountUnlocked.next(false);
+ }
+
+ // FIXME: This should be refactored into AuthService or a similar service,
+ // as checking for the existance of the crypto key is a low level
+ // implementation detail.
+ this.activeAccountUnlocked.next((await this.getCryptoMasterKey()) != null);
+ });
+ }
async init(): Promise {
if (this.hasBeenInited) {
@@ -499,6 +514,15 @@ export class StateService<
account,
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
+
+ if (options.userId == this.activeAccount.getValue()) {
+ const nextValue = value != null;
+
+ // Avoid emitting if we are already unlocked
+ if (this.activeAccountUnlocked.getValue() != nextValue) {
+ this.activeAccountUnlocked.next(nextValue);
+ }
+ }
}
async getCryptoMasterKeyAuto(options?: StorageOptions): Promise {
@@ -658,24 +682,6 @@ export class StateService<
);
}
- @withPrototypeForArrayMembers(FolderView)
- async getDecryptedFolders(options?: StorageOptions): Promise {
- return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.data?.folders?.decrypted;
- }
-
- async setDecryptedFolders(value: FolderView[], options?: StorageOptions): Promise {
- const account = await this.getAccount(
- this.reconcileOptions(options, await this.defaultInMemoryOptions())
- );
- account.data.folders.decrypted = value;
- await this.saveAccount(
- account,
- this.reconcileOptions(options, await this.defaultInMemoryOptions())
- );
- }
-
@withPrototypeForMap(SymmetricCryptoKey, SymmetricCryptoKey.initFromJson)
async getDecryptedOrganizationKeys(
options?: StorageOptions
@@ -1363,14 +1369,16 @@ export class StateService<
);
}
- async getEncryptedOrganizationKeys(options?: StorageOptions): Promise {
+ async getEncryptedOrganizationKeys(
+ options?: StorageOptions
+ ): Promise<{ [orgId: string]: EncryptedOrganizationKeyData }> {
return (
await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
)?.keys?.organizationKeys.encrypted;
}
async setEncryptedOrganizationKeys(
- value: Map,
+ value: { [orgId: string]: EncryptedOrganizationKeyData },
options?: StorageOptions
): Promise {
const account = await this.getAccount(
@@ -1940,52 +1948,52 @@ export class StateService<
async getPasswordGenerationOptions(options?: StorageOptions): Promise {
return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
+ await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
)?.settings?.passwordGenerationOptions;
}
async setPasswordGenerationOptions(value: any, options?: StorageOptions): Promise {
const account = await this.getAccount(
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
account.settings.passwordGenerationOptions = value;
await this.saveAccount(
account,
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
}
async getUsernameGenerationOptions(options?: StorageOptions): Promise {
return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
+ await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
)?.settings?.usernameGenerationOptions;
}
async setUsernameGenerationOptions(value: any, options?: StorageOptions): Promise {
const account = await this.getAccount(
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
account.settings.usernameGenerationOptions = value;
await this.saveAccount(
account,
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
}
async getGeneratorOptions(options?: StorageOptions): Promise {
return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
+ await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
)?.settings?.generatorOptions;
}
async setGeneratorOptions(value: any, options?: StorageOptions): Promise {
const account = await this.getAccount(
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
account.settings.generatorOptions = value;
await this.saveAccount(
account,
- this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
);
}
diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts
index 0fc38aa2976..0d723e98473 100644
--- a/libs/common/src/services/stateMigration.service.ts
+++ b/libs/common/src/services/stateMigration.service.ts
@@ -155,6 +155,15 @@ export class StateMigrationService<
case StateVersion.Three:
await this.migrateStateFrom3To4();
break;
+ case StateVersion.Four: {
+ const authenticatedAccounts = await this.getAuthenticatedAccounts();
+ for (const account of authenticatedAccounts) {
+ const migratedAccount = await this.migrateAccountFrom4To5(account);
+ await this.set(account.profile.userId, migratedAccount);
+ }
+ await this.setCurrentStateVersion(StateVersion.Five);
+ break;
+ }
}
currentStateVersion += 1;
@@ -488,6 +497,20 @@ export class StateMigrationService<
await this.set(keys.global, globals);
}
+ protected async migrateAccountFrom4To5(account: TAccount): Promise {
+ const encryptedOrgKeys = account.keys?.organizationKeys?.encrypted;
+ if (encryptedOrgKeys != null) {
+ for (const [orgId, encKey] of Object.entries(encryptedOrgKeys)) {
+ encryptedOrgKeys[orgId] = {
+ type: "organization",
+ key: encKey as unknown as string, // Account v4 does not reflect the current account model so we have to cast
+ };
+ }
+ }
+
+ return account;
+ }
+
protected get options(): StorageOptions {
return { htmlStorageLocation: HtmlStorageLocation.Local };
}
@@ -510,4 +533,15 @@ export class StateMigrationService<
protected async getCurrentStateVersion(): Promise {
return (await this.getGlobals())?.stateVersion ?? StateVersion.One;
}
+
+ protected async setCurrentStateVersion(newVersion: StateVersion): Promise {
+ const globals = await this.getGlobals();
+ globals.stateVersion = newVersion;
+ await this.set(keys.global, globals);
+ }
+
+ protected async getAuthenticatedAccounts(): Promise {
+ const authenticatedUserIds = await this.get(keys.authenticatedAccounts);
+ return Promise.all(authenticatedUserIds.map((id) => this.get(id)));
+ }
}
diff --git a/libs/common/src/services/sync.service.ts b/libs/common/src/services/sync.service.ts
index c054a211f1c..b96ff24d392 100644
--- a/libs/common/src/services/sync.service.ts
+++ b/libs/common/src/services/sync.service.ts
@@ -2,7 +2,8 @@ import { ApiService } from "../abstractions/api.service";
import { CipherService } from "../abstractions/cipher.service";
import { CollectionService } from "../abstractions/collection.service";
import { CryptoService } from "../abstractions/crypto.service";
-import { FolderService } from "../abstractions/folder.service";
+import { FolderApiServiceAbstraction } from "../abstractions/folder/folder-api.service.abstraction";
+import { InternalFolderService } from "../abstractions/folder/folder.service.abstraction";
import { KeyConnectorService } from "../abstractions/keyConnector.service";
import { LogService } from "../abstractions/log.service";
import { MessagingService } from "../abstractions/messaging.service";
@@ -40,7 +41,7 @@ export class SyncService implements SyncServiceAbstraction {
constructor(
private apiService: ApiService,
private settingsService: SettingsService,
- private folderService: FolderService,
+ private folderService: InternalFolderService,
private cipherService: CipherService,
private cryptoService: CryptoService,
private collectionService: CollectionService,
@@ -52,6 +53,7 @@ export class SyncService implements SyncServiceAbstraction {
private stateService: StateService,
private organizationService: OrganizationService,
private providerService: ProviderService,
+ private folderApiService: FolderApiServiceAbstraction,
private logoutCallback: (expired: boolean) => Promise
) {}
@@ -127,7 +129,7 @@ export class SyncService implements SyncServiceAbstraction {
(!isEdit && localFolder == null) ||
(isEdit && localFolder != null && localFolder.revisionDate < notification.revisionDate)
) {
- const remoteFolder = await this.apiService.getFolder(notification.id);
+ const remoteFolder = await this.folderApiService.get(notification.id);
if (remoteFolder != null) {
await this.folderService.upsert(new FolderData(remoteFolder));
this.messagingService.send("syncedUpsertedFolder", { folderId: notification.id });
@@ -196,7 +198,7 @@ export class SyncService implements SyncServiceAbstraction {
}
if (shouldUpdate) {
- const remoteCipher = await this.apiService.getCipher(notification.id);
+ const remoteCipher = await this.apiService.getFullCipherDetails(notification.id);
if (remoteCipher != null) {
await this.cipherService.upsert(new CipherData(remoteCipher));
this.messagingService.send("syncedUpsertedCipher", { cipherId: notification.id });
diff --git a/libs/common/src/services/vaultTimeout.service.ts b/libs/common/src/services/vaultTimeout.service.ts
index 935c55d8e6b..d087ab4277c 100644
--- a/libs/common/src/services/vaultTimeout.service.ts
+++ b/libs/common/src/services/vaultTimeout.service.ts
@@ -2,7 +2,7 @@ import { AuthService } from "../abstractions/auth.service";
import { CipherService } from "../abstractions/cipher.service";
import { CollectionService } from "../abstractions/collection.service";
import { CryptoService } from "../abstractions/crypto.service";
-import { FolderService } from "../abstractions/folder.service";
+import { FolderService } from "../abstractions/folder/folder.service.abstraction";
import { KeyConnectorService } from "../abstractions/keyConnector.service";
import { MessagingService } from "../abstractions/messaging.service";
import { PlatformUtilsService } from "../abstractions/platformUtils.service";
@@ -80,6 +80,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
if (userId == null || userId === (await this.stateService.getUserId())) {
this.searchService.clearIndex();
+ await this.folderService.clearCache();
}
await this.stateService.setEverBeenUnlocked(true, { userId: userId });
@@ -91,7 +92,6 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
await this.cryptoService.clearKeyPair(true, userId);
await this.cryptoService.clearEncKey(true, userId);
- await this.folderService.clearCache(userId);
await this.cipherService.clearCache(userId);
await this.collectionService.clearCache(userId);
diff --git a/libs/components/src/badge/badge.directive.ts b/libs/components/src/badge/badge.directive.ts
index 4d949bc6811..352da9c41fd 100644
--- a/libs/components/src/badge/badge.directive.ts
+++ b/libs/components/src/badge/badge.directive.ts
@@ -26,11 +26,10 @@ const hoverStyles: Record = {
export class BadgeDirective {
@HostBinding("class") get classList() {
return [
- "tw-inline-block",
- "tw-py-1",
+ "tw-inline",
+ "tw-py-0.5",
"tw-px-1.5",
"tw-font-bold",
- "tw-leading-none",
"tw-text-center",
"!tw-text-contrast",
"tw-rounded",
diff --git a/libs/components/src/form-field/error.component.ts b/libs/components/src/form-field/error.component.ts
index 26c1eec78f5..5cf95545e2a 100644
--- a/libs/components/src/form-field/error.component.ts
+++ b/libs/components/src/form-field/error.component.ts
@@ -26,6 +26,8 @@ export class BitErrorComponent {
return this.i18nService.t("inputRequired");
case "email":
return this.i18nService.t("inputEmail");
+ case "minlength":
+ return this.i18nService.t("inputMinLength", this.error[1]?.requiredLength);
default:
// Attempt to show a custom error message.
if (this.error[1]?.message) {
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 96cacb97645..d1d00c59175 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -180,6 +180,27 @@ const ButtonGroupTemplate: Story = (args: BitFormFieldCom
export const ButtonInputGroup = ButtonGroupTemplate.bind({});
ButtonInputGroup.args = {};
+const DisabledButtonInputGroupTemplate: Story = (
+ args: BitFormFieldComponent
+) => ({
+ props: args,
+ template: `
+
+ Label
+
+
+
+
+ `,
+});
+
+export const DisabledButtonInputGroup = DisabledButtonInputGroupTemplate.bind({});
+DisabledButtonInputGroup.args = {};
+
const SelectTemplate: Story = (args: BitFormFieldComponent) => ({
props: args,
template: `
diff --git a/libs/components/src/form-field/prefix.directive.ts b/libs/components/src/form-field/prefix.directive.ts
index 010dbc056e5..edf600d4e7f 100644
--- a/libs/components/src/form-field/prefix.directive.ts
+++ b/libs/components/src/form-field/prefix.directive.ts
@@ -10,6 +10,8 @@ export const PrefixClasses = [
"tw-border-secondary-500",
"tw-text-muted",
"tw-rounded-none",
+ "disabled:!tw-text-muted",
+ "disabled:tw-border-secondary-500",
];
@Directive({
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index cb45e12228e..5ccceae874c 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -1,8 +1,10 @@
export * from "./badge";
export * from "./banner";
export * from "./button";
+export * from "./toggle-group";
export * from "./callout";
export * from "./form-field";
export * from "./menu";
export * from "./utils/i18n-mock.service";
+export * from "./tabs";
export * from "./submit-button";
diff --git a/libs/components/src/stories/icons.stories.mdx b/libs/components/src/stories/icons.stories.mdx
new file mode 100644
index 00000000000..516fc090705
--- /dev/null
+++ b/libs/components/src/stories/icons.stories.mdx
@@ -0,0 +1,188 @@
+
+
+import { Meta } from "@storybook/addon-docs/";
+
+
+
+# Iconography
+
+Avoid using icons to convey information unless paired with meaningful, clear text. If an icon must be used and text cannot be displayed visually along with the icon, use an `aria-label` to provide the text to screen readers, and a `title` attribute to provide the text visually through a tool tip. Note: this pattern should only be followed for very common iconography such as, a settings cog icon or an options menu icon.
+
+## Status Indicators
+
+| Icon | bwi-name | Usage |
+| -------------------------------------------- | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| | bwi-ban | option or feature not available. Example: send maximum access count was reached |
+| | bwi-check | confirmation action (Example: "confirm member"), successful confirmation (toast or callout), or shows currently selected option in a menu. Use with success color variable if applicable. |
+| | bwi-error | error; used in form field error states and error toasts, banners, and callouts. Do not use as a close or clear icon. Use with danger color variable. |
+| | bwi-exclamation-circle | deprecated error icon; use bwi-error |
+| | bwi-exclamation-triangle | warning; used in warning callouts, banners, and toasts. Use with warning color variable. |
+| | bwi-info-circle | information; used in info callouts, banners, and toasts. Use with info color variable. |
+| | bwi-question-circle | link to help documentation or hover tooltip |
+| | bwi-spinner | loading |
+
+## Bitwarden Objects
+
+| Icon | bwi-name | Usage |
+| ----------------------------------- | --------------- | --------------------------------------------------- |
+| | bwi-business | organization or vault for Free, Teams or Enterprise |
+| | bwi-collection | collection |
+| | bwi-credit-card | card item type |
+| | bwi-family | family vault or organization |
+| | bwi-folder | folder |
+| | bwi-globe | login item type |
+| | bwi-id-card | identity item type |
+| | bwi-send | send action or feature |
+| | bwi-send-f | - |
+| | bwi-sticky-note | secure note item type |
+| | bwi-users | user group |
+| | bwi-vault | general vault |
+
+## Actions
+
+| Icon | bwi-name | Usage |
+| ------------------------------------- | ----------------- | -------------------------------------------- |
+| | bwi-check-circle | check if password has been exposed |
+| | bwi-check-square | select all action |
+| | bwi-clone | copy to clipboard action |
+| | bwi-close | close action |
+| | bwi-cog | settings |
+| | bwi-cog-f | settings |
+| | bwi-cogs | deprecated; do not use in app. |
+| | bwi-download | download or export |
+| | bwi-envelope | action related to emailing a user |
+| | bwi-external-link | open in new window or popout |
+| | bwi-eye | show icon for password fields |
+| | bwi-eye-slash | hide icon for password fields |
+| | bwi-files | clone action / duplicate an item |
+| | bwi-generate | generate action in edit item forms |
+| | bwi-generate-f | generate feature or action |
+| | bwi-lock | lock vault action |
+| | bwi-lock-f | - |
+| | bwi-minus-circle | remove action |
+| | bwi-minus-square | unselect all action |
+| | bwi-paste | paste from clipbaord action |
+| | bwi-pencil-square | edit action |
+| | bwi-play | start or play action |
+| | bwi-plus | new or add option in contained buttons/links |
+| | bwi-plus-circle | new or add option in text buttons/links |
+| | bwi-plus-square | - |
+| | bwi-refresh | "re"-action; such as refresh or regenerate |
+| | bwi-refresh-tab | - |
+| | bwi-save | alternate download action |
+| | bwi-save-changes | save changes action |
+| | bwi-search | search action |
+| | bwi-share | - |
+| | bwi-share-arrow | - |
+| | bwi-share-square | avoid using; use external-link instead |
+| | bwi-sign-in | sign-in action |
+| | bwi-sign-out | sign-out action |
+| | bwi-star | favorite action |
+| | bwi-star-f | favorited / unfavorite action |
+| | bwi-stop | stop action |
+| | bwi-trash | delete action or trash area |
+| | bwi-undo | restore action |
+| | bwi-unlock | unlocked |
+
+## Directional and Menu Indicators
+
+| Icon | bwi-name | Usage |
+| ------------------------------------------ | ---------------------- | ------------------------------------------------------- |
+| | bwi-angle-down | drop down or expandable options |
+| | bwi-angle-left | - |
+| | bwi-angle-right | collapsed section that can be expanded |
+| | bwi-arrow-circle-down | table sort order |
+| | bwi-arrow-circle-left | - |
+| | bwi-arrow-circle-right | - |
+| | bwi-arrow-circle-up | table sort order |
+| | bwi-caret-down | - |
+| | bwi-caret-right | - |
+| | bwi-chevron-up | - |
+| | bwi-dbl-angle-left | - |
+| | bwi-dbl-angle-right | - |
+| | bwi-ellipsis-h | more options menu horizontal; used in mobile list items |
+| | bwi-ellipsis-v | more optioins menu vertical; used primarily in tables |
+| | bwi-filter | Product switcher |
+| | bwi-hamburger | navigation indicator |
+| | bwi-list | toggle list/grid view |
+| | bwi-list-alt | view item action in extension |
+| | bwi-long-arrow-right | - |
+| | bwi-numbered-list | toggle numbered list view |
+
+## Misc Objects
+
+| Icon | bwi-name | Usage |
+| ----------------------------------------- | --------------------- | ---------------------------------------------- |
+| | bwi-bank | - |
+| | bwi-billing | billing options |
+| | bwi-bitcoin | crypto |
+| | bwi-bolt | deprecated "danger" icon |
+| | bwi-bookmark | bookmark or save related actions |
+| | bwi-browser | web browser |
+| | bwi-bug | test or debug action |
+| | bwi-camera | actions related to camera use |
+| | bwi-chain-broken | unlink action |
+| | bwi-chat | - |
+| | bwi-cli | cli client or code |
+| | bwi-clock | use for time based actions or views |
+| | bwi-cut | cut or omit actions |
+| | bwi-dashboard | statuses or dashboard views |
+| | bwi-desktop | desktop client |
+| | bwi-dollar | account credit |
+| | bwi-file | file related objects or actions |
+| | bwi-file-pdf | PDF related object or actions |
+| | bwi-file-text | text related objects or actions |
+| | bwi-bw-folder-open-f1 | - |
+| | bwi-folder-closed-f | - |
+| | bwi-folder-open | - |
+| | bwi-frown | - |
+| | bwi-hashtag | link to specific id |
+| | bwi-key | key or password related objects or actions |
+| | bwi-learning | learning center |
+| | bwi-lightbulb | - |
+| | bwi-link | link action |
+| | bwi-mobile | mobile client |
+| | bwi-money | - |
+| | bwi-paperclip | attachments |
+| | bwi-pencil | editing |
+| | bwi-provider | relates to provider or provider portal |
+| | bwi-providers | - |
+| | bwi-puzzle | - |
+| | bwi-rocket | - |
+| | bwi-rss | - |
+| | bwi-server | - |
+| | bwi-shield | - |
+| | bwi-sitemap | - |
+| | bwi-sliders | reporting or filtering |
+| | bwi-square | - |
+| | bwi-tag | labels |
+| | bwi-thumb-tack | - |
+| | bwi-thumbs-up | - |
+| | bwi-universal-access | use for accessiblity related actions |
+| | bwi-user | relates to current user or organization member |
+| | bwi-user-circle | - |
+| | bwi-user-f | - |
+| | bwi-wrench | tools or aditional configuration options |
+
+## Platforms and Logos
+
+| Icon | bwi-name | Usage |
+| --------------------------------- | ------------- | ---------------------------- |
+| | bwi-android | android support |
+| | bwi-apple | apple/IOS support |
+| | bwi-chrome | chrome support |
+| | bwi-discourse | community forum |
+| | bwi-edge | edge support |
+| | bwi-facebook | link to our facebook page |
+| | bwi-firefox | support for firefox |
+| | bwi-github | link to our github page |
+| | bwi-google | link to our google page |
+| | bwi-linkedin | link to our linkedIn page |
+| | bwi-linux | linux support |
+| | bwi-opera | support for Opera |
+| | bwi-paypal | PayPal |
+| | bwi-reddit | link to our reddit community |
+| | bwi-safari | safari support |
+| | bwi-twitter | link to our twitter page |
+| | bwi-windows | support for windows |
+| | bwi-youtube | link to our youtube page |
diff --git a/libs/components/src/tabs/index.ts b/libs/components/src/tabs/index.ts
new file mode 100644
index 00000000000..9b45ff1d43b
--- /dev/null
+++ b/libs/components/src/tabs/index.ts
@@ -0,0 +1,3 @@
+export * from "./tabs.module";
+export * from "./tab-group.component";
+export * from "./tab-item.component";
diff --git a/libs/components/src/tabs/tab-group.component.html b/libs/components/src/tabs/tab-group.component.html
new file mode 100644
index 00000000000..ad681b168f0
--- /dev/null
+++ b/libs/components/src/tabs/tab-group.component.html
@@ -0,0 +1,6 @@
+
+
+
diff --git a/libs/components/src/tabs/tab-group.component.ts b/libs/components/src/tabs/tab-group.component.ts
new file mode 100644
index 00000000000..856ab1f1e22
--- /dev/null
+++ b/libs/components/src/tabs/tab-group.component.ts
@@ -0,0 +1,7 @@
+import { Component } from "@angular/core";
+
+@Component({
+ selector: "bit-tab-group",
+ templateUrl: "./tab-group.component.html",
+})
+export class TabGroupComponent {}
diff --git a/libs/components/src/tabs/tab-item.component.html b/libs/components/src/tabs/tab-item.component.html
new file mode 100644
index 00000000000..951cfb3be18
--- /dev/null
+++ b/libs/components/src/tabs/tab-item.component.html
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
diff --git a/libs/components/src/tabs/tab-item.component.ts b/libs/components/src/tabs/tab-item.component.ts
new file mode 100644
index 00000000000..cda332e26d5
--- /dev/null
+++ b/libs/components/src/tabs/tab-item.component.ts
@@ -0,0 +1,54 @@
+import { Component, Input } from "@angular/core";
+
+@Component({
+ selector: "bit-tab-item",
+ templateUrl: "./tab-item.component.html",
+})
+export class TabItemComponent {
+ @Input() route: string; // ['/route']
+ @Input() disabled = false;
+
+ get baseClassList(): string[] {
+ return [
+ "tw-block",
+ "tw-relative",
+ "tw-py-2",
+ "tw-px-4",
+ "tw-font-semibold",
+ "tw-transition",
+ "tw-rounded-t",
+ "tw-border-0",
+ "tw-border-x",
+ "tw-border-t-4",
+ "tw-border-transparent",
+ "tw-border-solid",
+ "!tw-text-main",
+ "hover:tw-underline",
+ "hover:!tw-text-main",
+ "focus:tw-z-10",
+ "focus:tw-outline-none",
+ "focus:tw-ring-2",
+ "focus:tw-ring-primary-700",
+ "disabled:tw-bg-secondary-100",
+ "disabled:!tw-text-muted",
+ "disabled:tw-no-underline",
+ "disabled:tw-cursor-not-allowed",
+ ];
+ }
+
+ get activeClassList(): string {
+ return [
+ "tw--mb-px",
+ "tw-border-x-secondary-300",
+ "tw-border-t-primary-500",
+ "tw-border-b",
+ "tw-border-b-background",
+ "tw-bg-background",
+ "!tw-text-primary-500",
+ "hover:tw-border-t-primary-700",
+ "hover:!tw-text-primary-700",
+ "focus:tw-border-t-primary-700",
+ "focus:!tw-text-primary-700",
+ ].join(" ");
+ }
+}
diff --git a/libs/components/src/tabs/tabs.module.ts b/libs/components/src/tabs/tabs.module.ts
new file mode 100644
index 00000000000..016bde504a5
--- /dev/null
+++ b/libs/components/src/tabs/tabs.module.ts
@@ -0,0 +1,13 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+import { RouterModule } from "@angular/router";
+
+import { TabGroupComponent } from "./tab-group.component";
+import { TabItemComponent } from "./tab-item.component";
+
+@NgModule({
+ imports: [CommonModule, RouterModule],
+ exports: [TabGroupComponent, TabItemComponent],
+ declarations: [TabGroupComponent, TabItemComponent],
+})
+export class TabsModule {}
diff --git a/libs/components/src/tabs/tabs.stories.ts b/libs/components/src/tabs/tabs.stories.ts
new file mode 100644
index 00000000000..15ee57fa7d5
--- /dev/null
+++ b/libs/components/src/tabs/tabs.stories.ts
@@ -0,0 +1,84 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { RouterModule } from "@angular/router";
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { TabGroupComponent } from "./tab-group.component";
+import { TabItemComponent } from "./tab-item.component";
+
+@Component({
+ selector: "bit-tab-active-dummy",
+ template: "Router - Active selected",
+})
+class ActiveDummyComponent {}
+
+@Component({
+ selector: "bit-tab-item-2-dummy",
+ template: "Router - Item 2 selected",
+})
+class ItemTwoDummyComponent {}
+
+@Component({
+ selector: "bit-tab-item-3-dummy",
+ template: "Router - Item 3 selected",
+})
+class ItemThreeDummyComponent {}
+
+@Component({
+ selector: "bit-tab-disabled-dummy",
+ template: "Router - Disabled selected",
+})
+class DisabledDummyComponent {}
+
+export default {
+ title: "Component Library/Tabs",
+ component: TabGroupComponent,
+ decorators: [
+ moduleMetadata({
+ declarations: [
+ TabGroupComponent,
+ TabItemComponent,
+ ActiveDummyComponent,
+ ItemTwoDummyComponent,
+ ItemThreeDummyComponent,
+ DisabledDummyComponent,
+ ],
+ imports: [
+ CommonModule,
+ RouterModule.forRoot(
+ [
+ { path: "", redirectTo: "active", pathMatch: "full" },
+ { path: "active", component: ActiveDummyComponent },
+ { path: "item-2", component: ItemTwoDummyComponent },
+ { path: "item-3", component: ItemThreeDummyComponent },
+ { path: "disabled", component: DisabledDummyComponent },
+ ],
+ { useHash: true }
+ ),
+ ],
+ }),
+ ],
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17922",
+ },
+ },
+} as Meta;
+
+const TabGroupTemplate: Story = (args: TabGroupComponent) => ({
+ props: args,
+ template: `
+
+ Active
+ Item 2
+ Item 3
+ Disabled
+
+
+
+
+ `,
+});
+
+export const TabGroup = TabGroupTemplate.bind({});
diff --git a/libs/components/src/toggle-group/index.ts b/libs/components/src/toggle-group/index.ts
new file mode 100644
index 00000000000..bb7dba253e1
--- /dev/null
+++ b/libs/components/src/toggle-group/index.ts
@@ -0,0 +1,2 @@
+export * from "./toggle-group.component";
+export * from "./toggle-group.module";
diff --git a/libs/components/src/toggle-group/toggle-group.component.html b/libs/components/src/toggle-group/toggle-group.component.html
new file mode 100644
index 00000000000..6dbc7430638
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle-group.component.html
@@ -0,0 +1 @@
+
diff --git a/libs/components/src/toggle-group/toggle-group.component.spec.ts b/libs/components/src/toggle-group/toggle-group.component.spec.ts
new file mode 100644
index 00000000000..3bce3472e81
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle-group.component.spec.ts
@@ -0,0 +1,69 @@
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { ToggleGroupModule } from "./toggle-group.module";
+import { ToggleComponent } from "./toggle.component";
+
+describe("Button", () => {
+ let fixture: ComponentFixture;
+ let testAppComponent: TestApp;
+ let buttonElements: ToggleComponent[];
+ let radioButtons: HTMLInputElement[];
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ imports: [ToggleGroupModule],
+ declarations: [TestApp],
+ });
+
+ TestBed.compileComponents();
+ fixture = TestBed.createComponent(TestApp);
+ testAppComponent = fixture.debugElement.componentInstance;
+ buttonElements = fixture.debugElement
+ .queryAll(By.css("bit-toggle"))
+ .map((e) => e.componentInstance);
+ radioButtons = fixture.debugElement
+ .queryAll(By.css("input[type=radio]"))
+ .map((e) => e.nativeElement);
+
+ fixture.detectChanges();
+ }));
+
+ it("should select second element when setting selected to second", () => {
+ testAppComponent.selected = "second";
+ fixture.detectChanges();
+
+ expect(buttonElements[1].selected).toBe(true);
+ });
+
+ it("should not select second element when setting selected to third", () => {
+ testAppComponent.selected = "third";
+ fixture.detectChanges();
+
+ expect(buttonElements[1].selected).toBe(false);
+ });
+
+ it("should emit new value when changing selection by clicking on radio button", () => {
+ testAppComponent.selected = "first";
+ fixture.detectChanges();
+
+ radioButtons[1].click();
+
+ expect(testAppComponent.selected).toBe("second");
+ });
+});
+
+@Component({
+ selector: "test-app",
+ template: `
+
+ First
+ Second
+ Third
+
+ `,
+})
+class TestApp {
+ selected?: string;
+}
diff --git a/libs/components/src/toggle-group/toggle-group.component.ts b/libs/components/src/toggle-group/toggle-group.component.ts
new file mode 100644
index 00000000000..adaed4bdb01
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle-group.component.ts
@@ -0,0 +1,24 @@
+import { Component, EventEmitter, HostBinding, Input, Output } from "@angular/core";
+
+let nextId = 0;
+
+@Component({
+ selector: "bit-toggle-group",
+ templateUrl: "./toggle-group.component.html",
+ preserveWhitespaces: false,
+})
+export class ToggleGroupComponent {
+ private id = nextId++;
+ name = `bit-toggle-group-${this.id}`;
+
+ @Input() selected?: unknown;
+ @Output() selectedChange = new EventEmitter();
+
+ @HostBinding("attr.role") role = "radiogroup";
+ @HostBinding("class") classList = ["tw-flex"];
+
+ onInputInteraction(value: unknown) {
+ this.selected = value;
+ this.selectedChange.emit(value);
+ }
+}
diff --git a/libs/components/src/toggle-group/toggle-group.module.ts b/libs/components/src/toggle-group/toggle-group.module.ts
new file mode 100644
index 00000000000..fe1ce0ec52f
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle-group.module.ts
@@ -0,0 +1,14 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+
+import { BadgeModule } from "../badge";
+
+import { ToggleGroupComponent } from "./toggle-group.component";
+import { ToggleComponent } from "./toggle.component";
+
+@NgModule({
+ imports: [CommonModule, BadgeModule],
+ exports: [ToggleGroupComponent, ToggleComponent],
+ declarations: [ToggleGroupComponent, ToggleComponent],
+})
+export class ToggleGroupModule {}
diff --git a/libs/components/src/toggle-group/toggle-group.stories.ts b/libs/components/src/toggle-group/toggle-group.stories.ts
new file mode 100644
index 00000000000..8cc06f8c32d
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle-group.stories.ts
@@ -0,0 +1,54 @@
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { BadgeModule } from "../badge";
+
+import { ToggleGroupComponent } from "./toggle-group.component";
+import { ToggleComponent } from "./toggle.component";
+
+export default {
+ title: "Component Library/Toggle Group",
+ component: ToggleGroupComponent,
+ args: {
+ selected: "all",
+ },
+ decorators: [
+ moduleMetadata({
+ declarations: [ToggleGroupComponent, ToggleComponent],
+ imports: [BadgeModule],
+ }),
+ ],
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17157",
+ },
+ },
+} as Meta;
+
+const Template: Story = (args: ToggleGroupComponent) => ({
+ props: args,
+ template: `
+
+
+ All 3
+
+
+
+ Invited
+
+
+
+ Accepted 2
+
+
+
+ Deactivated
+
+
+ `,
+});
+
+export const Default = Template.bind({});
+Default.args = {
+ selected: "all",
+};
diff --git a/libs/components/src/toggle-group/toggle.component.html b/libs/components/src/toggle-group/toggle.component.html
new file mode 100644
index 00000000000..471ed5f0c03
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle.component.html
@@ -0,0 +1,11 @@
+
+
diff --git a/libs/components/src/toggle-group/toggle.component.spec.ts b/libs/components/src/toggle-group/toggle.component.spec.ts
new file mode 100644
index 00000000000..37c2e2ac101
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle.component.spec.ts
@@ -0,0 +1,71 @@
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { ToggleGroupComponent } from "./toggle-group.component";
+import { ToggleGroupModule } from "./toggle-group.module";
+
+describe("Button", () => {
+ let mockGroupComponent: MockedButtonGroupComponent;
+ let fixture: ComponentFixture;
+ let testAppComponent: TestApp;
+ let radioButton: HTMLInputElement;
+
+ beforeEach(waitForAsync(() => {
+ mockGroupComponent = new MockedButtonGroupComponent();
+
+ TestBed.configureTestingModule({
+ imports: [ToggleGroupModule],
+ declarations: [TestApp],
+ providers: [{ provide: ToggleGroupComponent, useValue: mockGroupComponent }],
+ });
+
+ TestBed.compileComponents();
+ fixture = TestBed.createComponent(TestApp);
+ testAppComponent = fixture.debugElement.componentInstance;
+ radioButton = fixture.debugElement.query(By.css("input[type=radio]")).nativeElement;
+ }));
+
+ it("should emit value when clicking on radio button", () => {
+ testAppComponent.value = "value";
+ fixture.detectChanges();
+
+ radioButton.click();
+ fixture.detectChanges();
+
+ expect(mockGroupComponent.onInputInteraction).toHaveBeenCalledWith("value");
+ });
+
+ it("should check radio button when selected matches value", () => {
+ testAppComponent.value = "value";
+ fixture.detectChanges();
+
+ mockGroupComponent.selected = "value";
+ fixture.detectChanges();
+
+ expect(radioButton.checked).toBe(true);
+ });
+
+ it("should not check radio button when selected does not match value", () => {
+ testAppComponent.value = "value";
+ fixture.detectChanges();
+
+ mockGroupComponent.selected = "nonMatchingValue";
+ fixture.detectChanges();
+
+ expect(radioButton.checked).toBe(false);
+ });
+});
+
+class MockedButtonGroupComponent implements Partial {
+ onInputInteraction = jest.fn();
+ selected = null;
+}
+
+@Component({
+ selector: "test-app",
+ template: ` Element`,
+})
+class TestApp {
+ value?: string;
+}
diff --git a/libs/components/src/toggle-group/toggle.component.ts b/libs/components/src/toggle-group/toggle.component.ts
new file mode 100644
index 00000000000..557ab38b386
--- /dev/null
+++ b/libs/components/src/toggle-group/toggle.component.ts
@@ -0,0 +1,80 @@
+import { HostBinding, Component, Input } from "@angular/core";
+
+import { ToggleGroupComponent } from "./toggle-group.component";
+
+let nextId = 0;
+
+@Component({
+ selector: "bit-toggle",
+ templateUrl: "./toggle.component.html",
+ preserveWhitespaces: false,
+})
+export class ToggleComponent {
+ id = nextId++;
+
+ @Input() value?: string;
+
+ constructor(private groupComponent: ToggleGroupComponent) {}
+
+ @HostBinding("tabIndex") tabIndex = "-1";
+ @HostBinding("class") classList = ["tw-group"];
+
+ get name() {
+ return this.groupComponent.name;
+ }
+
+ get selected() {
+ return this.groupComponent.selected === this.value;
+ }
+
+ get inputClasses() {
+ return ["tw-peer", "tw-appearance-none", "tw-outline-none"];
+ }
+
+ get labelClasses() {
+ return [
+ "!tw-font-semibold",
+ "tw-transition",
+ "tw-text-center",
+ "tw-border-text-muted",
+ "!tw-text-muted",
+ "tw-border-solid",
+ "tw-border-y",
+ "tw-border-r",
+ "tw-border-l-0",
+ "tw-cursor-pointer",
+ "group-first-of-type:tw-border-l",
+ "group-first-of-type:tw-rounded-l",
+ "group-last-of-type:tw-rounded-r",
+
+ "peer-focus:tw-outline-none",
+ "peer-focus:tw-ring",
+ "peer-focus:tw-ring-offset-2",
+ "peer-focus:tw-ring-primary-500",
+ "peer-focus:tw-z-10",
+ "peer-focus:tw-bg-primary-500",
+ "peer-focus:tw-border-primary-500",
+ "peer-focus:!tw-text-contrast",
+
+ "hover:tw-no-underline",
+ "hover:tw-bg-text-muted",
+ "hover:tw-border-text-muted",
+ "hover:!tw-text-contrast",
+
+ "peer-checked:tw-bg-primary-500",
+ "peer-checked:tw-border-primary-500",
+ "peer-checked:!tw-text-contrast",
+ "tw-py-1.5",
+ "tw-px-3",
+
+ // Fix for badge being pushed slightly lower when inside a button.
+ // Insipired by bootstrap, which does the same.
+ "[&>[bitBadge]]:tw-relative",
+ "[&>[bitBadge]]:-tw-top-[1px]",
+ ];
+ }
+
+ onInputInteraction() {
+ this.groupComponent.onInputInteraction(this.value);
+ }
+}
diff --git a/libs/components/src/utils/i18n-mock.service.ts b/libs/components/src/utils/i18n-mock.service.ts
index ffc2b031d37..19f756fc360 100644
--- a/libs/components/src/utils/i18n-mock.service.ts
+++ b/libs/components/src/utils/i18n-mock.service.ts
@@ -1,7 +1,9 @@
+import { Observable } from "rxjs";
+
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
export class I18nMockService implements I18nService {
- locale: string;
+ locale$: Observable;
supportedTranslationLocales: string[];
translationLocale: string;
collator: Intl.Collator;
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index fd0caec7490..31ff19cb501 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -60,6 +60,8 @@ module.exports = {
info: "var(--color-info-500)",
primary: {
300: "var(--color-primary-300)",
+ 500: "var(--color-primary-500)",
+ 700: "var(--color-primary-700)",
},
},
ringOffsetColor: ({ theme }) => ({
diff --git a/libs/shared/eslintrc.json b/libs/shared/eslintrc.json
deleted file mode 100644
index 70c61bc7c4c..00000000000
--- a/libs/shared/eslintrc.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "parser": "@typescript-eslint/parser",
- "plugins": ["@typescript-eslint"],
- "extends": [
- "eslint:recommended",
- "plugin:@typescript-eslint/recommended",
- "plugin:import/recommended",
- "plugin:import/typescript",
- "prettier"
- ],
- "rules": {
- "@typescript-eslint/no-explicit-any": "off", // TODO: This should be re-enabled
- "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
- "@typescript-eslint/explicit-member-accessibility": [
- "error",
- {
- "accessibility": "no-public"
- }
- ],
- "@typescript-eslint/no-this-alias": [
- "error",
- {
- "allowedNames": ["self"]
- }
- ],
- "no-console": "warn",
- "import/no-unresolved": "off" // TODO: Look into turning off once each package is an actual package.
- }
-}
diff --git a/package-lock.json b/package-lock.json
index da511d2ed33..3e99454453c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,14 +121,14 @@
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"del": "^6.0.0",
- "electron": "16.2.7",
- "electron-builder": "22.11.10",
- "electron-log": "^4.4.7",
+ "electron": "^19.0.8",
+ "electron-builder": "^22.11.10",
+ "electron-log": "^4.4.8",
"electron-notarize": "^1.2.1",
"electron-rebuild": "^3.2.7",
"electron-reload": "^2.0.0-alpha.1",
- "electron-store": "^8.0.1",
- "electron-updater": "^5.0.1",
+ "electron-store": "^8.0.2",
+ "electron-updater": "^5.0.5",
"eslint": "^8.14.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.7.1",
@@ -186,7 +186,7 @@
},
"apps/cli": {
"name": "@bitwarden/cli",
- "version": "1.22.1",
+ "version": "2022.6.2",
"license": "GPL-3.0-only",
"dependencies": {
"@koa/multer": "^3.0.0",
@@ -227,7 +227,7 @@
},
"apps/web": {
"name": "@bitwarden/web-vault",
- "version": "2022.6.0"
+ "version": "2022.6.1"
},
"libs/angular": {
"name": "@bitwarden/angular",
@@ -15740,6 +15740,19 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
+ "node_modules/app-builder-lib/node_modules/builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/app-builder-lib/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -17732,6 +17745,42 @@
}
},
"node_modules/builder-util-runtime": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz",
+ "integrity": "sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/builder-util-runtime/node_modules/debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/builder-util/node_modules/argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+ "dev": true
+ },
+ "node_modules/builder-util/node_modules/builder-util-runtime": {
"version": "8.7.9",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
"integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
@@ -17744,12 +17793,6 @@
"node": ">=12.0.0"
}
},
- "node_modules/builder-util/node_modules/argparse": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
- "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
- "dev": true
- },
"node_modules/builder-util/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -21183,6 +21226,19 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
+ "node_modules/dmg-builder/node_modules/builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/dmg-builder/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -21199,7 +21255,6 @@
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
"integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
- "deprecated": "Disk image license agreements are deprecated by Apple and will probably be removed in a future macOS release. Discussion at: https://github.com/argv-minus-one/dmg-license/issues/11",
"dev": true,
"optional": true,
"os": [
@@ -21602,14 +21657,14 @@
}
},
"node_modules/electron": {
- "version": "16.2.7",
- "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.7.tgz",
- "integrity": "sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA==",
+ "version": "19.0.8",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.8.tgz",
+ "integrity": "sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
- "@electron/get": "^1.13.0",
- "@types/node": "^14.6.2",
+ "@electron/get": "^1.14.1",
+ "@types/node": "^16.11.26",
"extract-zip": "^1.0.3"
},
"bin": {
@@ -21655,10 +21710,23 @@
"@types/yargs-parser": "*"
}
},
+ "node_modules/electron-builder/node_modules/builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/electron-log": {
- "version": "4.4.7",
- "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
- "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A==",
+ "version": "4.4.8",
+ "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+ "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==",
"dev": true
},
"node_modules/electron-notarize": {
@@ -21752,6 +21820,19 @@
"mime": "^2.5.2"
}
},
+ "node_modules/electron-publish/node_modules/builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
"node_modules/electron-rebuild": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.7.tgz",
@@ -22016,19 +22097,20 @@
"dev": true
},
"node_modules/electron-updater": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.1.tgz",
- "integrity": "sha512-dNnXPCqYmergXy3jgg4UICuD50Orug9GQe/5xfHy+BE2Fy0icB0QE+y6iQWdCDf7yeONxwMBf4HgIkGG5pIaVg==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.5.tgz",
+ "integrity": "sha512-YcKEI9zpU+c0sNXTpjw3UpzP8Pfuuwo70T42oLYm0hHc0dy41ih51oENlhxgooa2+uzzpXhoCOyrpG+w6CB0Pw==",
"dev": true,
"dependencies": {
"@types/semver": "^7.3.6",
- "builder-util-runtime": "9.0.0",
+ "builder-util-runtime": "9.0.2",
"fs-extra": "^10.0.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
- "semver": "^7.3.5"
+ "semver": "^7.3.5",
+ "typed-emitter": "^2.1.0"
}
},
"node_modules/electron-updater/node_modules/argparse": {
@@ -22037,19 +22119,6 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
- "node_modules/electron-updater/node_modules/builder-util-runtime": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz",
- "integrity": "sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==",
- "dev": true,
- "dependencies": {
- "debug": "^4.3.2",
- "sax": "^1.2.4"
- },
- "engines": {
- "node": ">=12.0.0"
- }
- },
"node_modules/electron-updater/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -22062,12 +22131,6 @@
"js-yaml": "bin/js-yaml.js"
}
},
- "node_modules/electron/node_modules/@types/node": {
- "version": "14.18.21",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz",
- "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==",
- "dev": true
- },
"node_modules/element-resize-detector": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.4.tgz",
@@ -43512,6 +43575,15 @@
"node": ">= 0.6"
}
},
+ "node_modules/typed-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz",
+ "integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==",
+ "dev": true,
+ "optionalDependencies": {
+ "rxjs": "*"
+ }
+ },
"node_modules/typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -51639,7 +51711,7 @@
"postcss": "^7.0.36",
"postcss-loader": "^4.2.0",
"raw-loader": "^4.0.2",
- "react": "^18.0.0",
+ "react": "^16.14.0",
"react-dom": "^16.14.0",
"read-pkg-up": "^7.0.1",
"regenerator-runtime": "^0.13.7",
@@ -57874,6 +57946,16 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
+ "builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ }
+ },
"js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -59464,6 +59546,16 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
+ "builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ }
+ },
"js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -59476,13 +59568,24 @@
}
},
"builder-util-runtime": {
- "version": "8.7.9",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
- "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz",
+ "integrity": "sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA==",
"dev": true,
"requires": {
- "debug": "^4.3.2",
+ "debug": "^4.3.4",
"sax": "^1.2.4"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ }
}
},
"builtin-status-codes": {
@@ -62134,6 +62237,16 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
+ "builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ }
+ },
"js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -62479,22 +62592,14 @@
}
},
"electron": {
- "version": "16.2.7",
- "resolved": "https://registry.npmjs.org/electron/-/electron-16.2.7.tgz",
- "integrity": "sha512-aZKF3b00+rqW/HGs8lJM5DhPNj+mOfCuhLSiFXV6J9dQCIRhctJTmToOrwXfbCxvXK8as8eQTNl5uSfnHmH6tA==",
+ "version": "19.0.8",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.8.tgz",
+ "integrity": "sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==",
"dev": true,
"requires": {
- "@electron/get": "^1.13.0",
- "@types/node": "^14.6.2",
+ "@electron/get": "^1.14.1",
+ "@types/node": "^16.11.26",
"extract-zip": "^1.0.3"
- },
- "dependencies": {
- "@types/node": {
- "version": "14.18.21",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz",
- "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==",
- "dev": true
- }
}
},
"electron-builder": {
@@ -62525,13 +62630,23 @@
"requires": {
"@types/yargs-parser": "*"
}
+ },
+ "builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ }
}
}
},
"electron-log": {
- "version": "4.4.7",
- "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
- "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A==",
+ "version": "4.4.8",
+ "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+ "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA==",
"dev": true
},
"electron-notarize": {
@@ -62611,6 +62726,18 @@
"fs-extra": "^10.0.0",
"lazy-val": "^1.0.5",
"mime": "^2.5.2"
+ },
+ "dependencies": {
+ "builder-util-runtime": {
+ "version": "8.7.9",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.9.tgz",
+ "integrity": "sha512-HCOkbKncb6eZSjnw1XnGgiXs7CQzORZit8zPK8IMHpU5GnZi6htS6KQdSMXU4ekDprfW3JLTRBHK9uxU2x++/g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.2",
+ "sax": "^1.2.4"
+ }
+ }
}
},
"electron-rebuild": {
@@ -62802,19 +62929,20 @@
"dev": true
},
"electron-updater": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.1.tgz",
- "integrity": "sha512-dNnXPCqYmergXy3jgg4UICuD50Orug9GQe/5xfHy+BE2Fy0icB0QE+y6iQWdCDf7yeONxwMBf4HgIkGG5pIaVg==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.5.tgz",
+ "integrity": "sha512-YcKEI9zpU+c0sNXTpjw3UpzP8Pfuuwo70T42oLYm0hHc0dy41ih51oENlhxgooa2+uzzpXhoCOyrpG+w6CB0Pw==",
"dev": true,
"requires": {
"@types/semver": "^7.3.6",
- "builder-util-runtime": "9.0.0",
+ "builder-util-runtime": "9.0.2",
"fs-extra": "^10.0.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
- "semver": "^7.3.5"
+ "semver": "^7.3.5",
+ "typed-emitter": "^2.1.0"
},
"dependencies": {
"argparse": {
@@ -62823,16 +62951,6 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
"dev": true
},
- "builder-util-runtime": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz",
- "integrity": "sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==",
- "dev": true,
- "requires": {
- "debug": "^4.3.2",
- "sax": "^1.2.4"
- }
- },
"js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -79569,6 +79687,15 @@
"mime-types": "~2.1.24"
}
},
+ "typed-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz",
+ "integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==",
+ "dev": true,
+ "requires": {
+ "rxjs": "*"
+ }
+ },
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
diff --git a/package.json b/package.json
index ac70e52938b..10e1d9f76ca 100644
--- a/package.json
+++ b/package.json
@@ -82,14 +82,14 @@
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"del": "^6.0.0",
- "electron": "16.2.7",
+ "electron": "19.0.8",
"electron-builder": "22.11.10",
- "electron-log": "^4.4.7",
+ "electron-log": "^4.4.8",
"electron-notarize": "^1.2.1",
"electron-rebuild": "^3.2.7",
"electron-reload": "^2.0.0-alpha.1",
- "electron-store": "^8.0.1",
- "electron-updater": "^5.0.1",
+ "electron-store": "^8.0.2",
+ "electron-updater": "^5.0.5",
"eslint": "^8.14.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.7.1",
diff --git a/tsconfig.json b/tsconfig.json
index 158581cb3a4..23d9a8f46da 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,5 +27,5 @@
}
]
},
- "include": ["apps/*/src/*", "libs/*/src/*"]
+ "include": ["apps/*/src/*", "libs/*/src/**/*"]
}
|