diff --git a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts
index 9f28a2ea06..d9035ad741 100644
--- a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts
+++ b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts
@@ -1,4 +1,5 @@
import { Component } from "@angular/core";
+import { FormBuilder } from "@angular/forms";
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.component";
@@ -19,7 +20,8 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
i18nService: I18nService,
platformUtilsService: PlatformUtilsService,
logService: LogService,
- dialogService: DialogServiceAbstraction
+ dialogService: DialogServiceAbstraction,
+ formBuilder: FormBuilder
) {
super(
folderService,
@@ -27,7 +29,8 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
i18nService,
platformUtilsService,
logService,
- dialogService
+ dialogService,
+ formBuilder
);
}
}
diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts
index 1555199d0c..07fd92e032 100644
--- a/apps/desktop/src/vault/app/vault/view.component.ts
+++ b/apps/desktop/src/vault/app/vault/view.component.ts
@@ -106,9 +106,13 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
this.onViewCipherPasswordHistory.emit(this.cipher);
}
- async copy(value: string, typeI18nKey: string, aType: string) {
- super.copy(value, typeI18nKey, aType);
- this.messagingService.send("minimizeOnCopy");
+ async copy(value: string, typeI18nKey: string, aType: string): Promise
{
+ const hasCopied = await super.copy(value, typeI18nKey, aType);
+ if (hasCopied) {
+ this.messagingService.send("minimizeOnCopy");
+ }
+
+ return hasCopied;
}
onWindowHidden() {
diff --git a/apps/web/config/eudevtest.json b/apps/web/config/eudevtest.json
deleted file mode 100644
index faaba2177c..0000000000
--- a/apps/web/config/eudevtest.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "urls": {
- "icons": "https://icons.eudevtest.bitwarden.pw",
- "notifications": "https://notifications.eudevtest.bitwarden.pw",
- "scim": "https://scim.eudevtest.bitwarden.pw"
- },
- "flags": {
- "secretsManager": true,
- "showPasswordless": true
- }
-}
diff --git a/apps/web/config/euprd.json b/apps/web/config/euprd.json
index 576b5b4cfa..4218593ede 100644
--- a/apps/web/config/euprd.json
+++ b/apps/web/config/euprd.json
@@ -1,6 +1,6 @@
{
"urls": {
- "icons": "https://icons.bitwarden.net",
+ "icons": "https://icons.bitwarden.eu",
"notifications": "https://notifications.bitwarden.eu",
"scim": "https://scim.bitwarden.eu"
},
diff --git a/apps/web/config/euqa.json b/apps/web/config/euqa.json
new file mode 100644
index 0000000000..496b52065c
--- /dev/null
+++ b/apps/web/config/euqa.json
@@ -0,0 +1,11 @@
+{
+ "urls": {
+ "icons": "https://icons.euqa.bitwarden.pw",
+ "notifications": "https://notifications.euqa.bitwarden.pw",
+ "scim": "https://scim.euqa.bitwarden.pw"
+ },
+ "flags": {
+ "secretsManager": true,
+ "showPasswordless": true
+ }
+}
diff --git a/apps/web/package.json b/apps/web/package.json
index 5b5f25d437..4be9ecc941 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -11,7 +11,7 @@
"build:bit:dev:watch": "cross-env ENV=development npm run build:bit:watch",
"build:bit:qa": "cross-env NODE_ENV=production ENV=qa npm run build:bit",
"build:bit:euprd": "cross-env NODE_ENV=production ENV=euprd npm run build:bit",
- "build:bit:eudevtest": "cross-env NODE_ENV=production ENV=eudevtest npm run build:bit",
+ "build:bit:euqa": "cross-env NODE_ENV=production ENV=euqa npm run build:bit",
"build:bit:cloud": "cross-env NODE_ENV=production ENV=cloud npm run build:bit",
"build:oss:selfhost:watch": "cross-env ENV=selfhosted npm run build:oss:watch",
"build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch",
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.html
new file mode 100644
index 0000000000..4e8b88af20
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.html
@@ -0,0 +1,46 @@
+
+ {{ "activateSecretsManager" | i18n }}
+
+ {{ "bulkEnableSecretsManagerDescription" | i18n }}
+
+
+
+ | {{ "member" | i18n }} |
+ {{ "role" | i18n }} |
+
+
+
+
+
+
+
+
+
+ {{ u | userName }}
+
+
+ {{ u.email }}
+
+
+ |
+ {{ u.type | userType }} |
+
+
+
+
+
+
+
+
+
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts
new file mode 100644
index 0000000000..9bb8fcbb10
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts
@@ -0,0 +1,53 @@
+import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog";
+import { Component, Inject, OnInit } from "@angular/core";
+
+import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
+import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { TableDataSource } from "@bitwarden/components";
+
+import { OrganizationUserView } from "../../../core";
+
+export type BulkEnableSecretsManagerDialogData = {
+ orgId: string;
+ users: OrganizationUserView[];
+};
+
+@Component({
+ templateUrl: `bulk-enable-sm-dialog.component.html`,
+})
+export class BulkEnableSecretsManagerDialogComponent implements OnInit {
+ protected dataSource = new TableDataSource();
+ constructor(
+ public dialogRef: DialogRef,
+ @Inject(DIALOG_DATA) private data: BulkEnableSecretsManagerDialogData,
+ private organizationUserService: OrganizationUserService,
+ private platformUtilsService: PlatformUtilsService,
+ private i18nService: I18nService
+ ) {}
+
+ ngOnInit(): void {
+ this.dataSource.data = this.data.users;
+ }
+
+ submit = async () => {
+ await this.organizationUserService.putOrganizationUserBulkEnableSecretsManager(
+ this.data.orgId,
+ this.dataSource.data.map((u) => u.id)
+ );
+ this.platformUtilsService.showToast(
+ "success",
+ null,
+ this.i18nService.t("activatedAccessToSecretsManager")
+ );
+ this.dialogRef.close();
+ };
+
+ static open(dialogService: DialogServiceAbstraction, data: BulkEnableSecretsManagerDialogData) {
+ return dialogService.open(
+ BulkEnableSecretsManagerDialogComponent,
+ { data }
+ );
+ }
+}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index 62bcb04bb7..2f48789209 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -255,7 +255,7 @@
- {{ "secretsManagerBeta" | i18n }}
+ {{ "secretsManager" | i18n }}
- {{ "secretsManagerBetaDesc" | i18n }}
+ {{ "secretsManagerAccessDescription" | i18n }}
- {{ "userAccessSecretsManager" | i18n }}
+ {{ "userAccessSecretsManagerGA" | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/members/members.module.ts b/apps/web/src/app/admin-console/organizations/members/members.module.ts
index 1efb10aace..71f5692a11 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.module.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.module.ts
@@ -4,6 +4,7 @@ import { LooseComponentsModule } from "../../../shared";
import { SharedOrganizationModule } from "../shared";
import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component";
+import { BulkEnableSecretsManagerDialogComponent } from "./components/bulk/bulk-enable-sm-dialog.component";
import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component";
import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
@@ -21,6 +22,7 @@ import { PeopleComponent } from "./people.component";
],
declarations: [
BulkConfirmComponent,
+ BulkEnableSecretsManagerDialogComponent,
BulkRemoveComponent,
BulkRestoreRevokeComponent,
BulkStatusComponent,
diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html
index c93380b466..ebb84856a4 100644
--- a/apps/web/src/app/admin-console/organizations/members/people.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/people.component.html
@@ -99,6 +99,12 @@
>
+
+
+
+