diff --git a/.storybook/main.ts b/.storybook/main.ts
index 544beb48c7..c71a74c2a7 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -38,9 +38,7 @@ const config: StorybookConfig = {
},
env: (config) => ({
...config,
- FLAGS: JSON.stringify({
- secretsManager: true,
- }),
+ FLAGS: JSON.stringify({}),
}),
webpackFinal: async (config, { configType }) => {
if (config.resolve) {
diff --git a/apps/browser/src/platform/flags.ts b/apps/browser/src/platform/flags.ts
index 71a20edc5e..36aa698a7b 100644
--- a/apps/browser/src/platform/flags.ts
+++ b/apps/browser/src/platform/flags.ts
@@ -11,13 +11,13 @@ import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-envi
import { BrowserApi } from "./browser/browser-api";
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type Flags = {
accountSwitching?: boolean;
} & SharedFlags;
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type DevFlags = {
storeSessionDecrypted?: boolean;
managedEnvironment?: GroupPolicyEnvironment;
diff --git a/apps/cli/src/platform/flags.ts b/apps/cli/src/platform/flags.ts
index 4e31e39e99..dc0103e243 100644
--- a/apps/cli/src/platform/flags.ts
+++ b/apps/cli/src/platform/flags.ts
@@ -7,11 +7,11 @@ import {
} from "@bitwarden/common/platform/misc/flags";
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type Flags = {} & SharedFlags;
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type DevFlags = {} & SharedDevFlags;
export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/apps/desktop/config/development.json b/apps/desktop/config/development.json
index d2b1073812..7a8659feff 100644
--- a/apps/desktop/config/development.json
+++ b/apps/desktop/config/development.json
@@ -1,7 +1,6 @@
{
"devFlags": {},
"flags": {
- "showDDGSetting": true,
"enableCipherKeyEncryption": false
}
}
diff --git a/apps/desktop/config/production.json b/apps/desktop/config/production.json
index 39b78094d0..f57c3d9bc3 100644
--- a/apps/desktop/config/production.json
+++ b/apps/desktop/config/production.json
@@ -1,6 +1,5 @@
{
"flags": {
- "showDDGSetting": true,
"enableCipherKeyEncryption": false
}
}
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index a613328878..07fcc5d3b8 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -24,7 +24,6 @@ import { DialogService } from "@bitwarden/components";
import { SetPinComponent } from "../../auth/components/set-pin.component";
import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
-import { flagEnabled } from "../../platform/flags";
import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
@Component({
@@ -146,7 +145,7 @@ export class SettingsComponent implements OnInit {
this.startToTrayDescText = this.i18nService.t(startToTrayKey + "Desc");
// DuckDuckGo browser is only for macos initially
- this.showDuckDuckGoIntegrationOption = flagEnabled("showDDGSetting") && isMac;
+ this.showDuckDuckGoIntegrationOption = isMac;
this.vaultTimeoutOptions = [
// { name: i18nService.t('immediately'), value: 0 },
diff --git a/apps/desktop/src/platform/flags.ts b/apps/desktop/src/platform/flags.ts
index 0481c8ce9b..dc0103e243 100644
--- a/apps/desktop/src/platform/flags.ts
+++ b/apps/desktop/src/platform/flags.ts
@@ -7,13 +7,11 @@ import {
} from "@bitwarden/common/platform/misc/flags";
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
-export type Flags = {
- showDDGSetting?: boolean;
-} & SharedFlags;
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type Flags = {} & SharedFlags;
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type DevFlags = {} & SharedDevFlags;
export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/apps/web/config/base.json b/apps/web/config/base.json
index a377298c63..5dc03a4633 100644
--- a/apps/web/config/base.json
+++ b/apps/web/config/base.json
@@ -11,7 +11,6 @@
"allowedHosts": "auto"
},
"flags": {
- "secretsManager": false,
"showPasswordless": false,
"enableCipherKeyEncryption": false
}
diff --git a/apps/web/config/cloud.json b/apps/web/config/cloud.json
index 6e5c65af1d..3faa292692 100644
--- a/apps/web/config/cloud.json
+++ b/apps/web/config/cloud.json
@@ -17,7 +17,6 @@
"proxyNotifications": "https://notifications.bitwarden.com"
},
"flags": {
- "secretsManager": true,
"showPasswordless": true,
"enableCipherKeyEncryption": false
}
diff --git a/apps/web/config/development.json b/apps/web/config/development.json
index 97742aee3d..44391a7450 100644
--- a/apps/web/config/development.json
+++ b/apps/web/config/development.json
@@ -20,7 +20,6 @@
}
],
"flags": {
- "secretsManager": true,
"showPasswordless": true,
"enableCipherKeyEncryption": false
},
diff --git a/apps/web/config/euprd.json b/apps/web/config/euprd.json
index 4b6c9fa909..72f0c1857d 100644
--- a/apps/web/config/euprd.json
+++ b/apps/web/config/euprd.json
@@ -11,7 +11,6 @@
"buttonAction": "https://www.paypal.com/cgi-bin/webscr"
},
"flags": {
- "secretsManager": true,
"showPasswordless": true,
"enableCipherKeyEncryption": false
}
diff --git a/apps/web/config/euqa.json b/apps/web/config/euqa.json
index 70caf3db62..5f74eb8829 100644
--- a/apps/web/config/euqa.json
+++ b/apps/web/config/euqa.json
@@ -21,7 +21,6 @@
}
],
"flags": {
- "secretsManager": true,
"showPasswordless": true
}
}
diff --git a/apps/web/config/qa.json b/apps/web/config/qa.json
index 0ce5f3dc7f..ac36b10784 100644
--- a/apps/web/config/qa.json
+++ b/apps/web/config/qa.json
@@ -27,7 +27,6 @@
}
],
"flags": {
- "secretsManager": true,
"showPasswordless": true,
"enableCipherKeyEncryption": false
}
diff --git a/apps/web/config/selfhosted.json b/apps/web/config/selfhosted.json
index e16df20ad5..7e916a1116 100644
--- a/apps/web/config/selfhosted.json
+++ b/apps/web/config/selfhosted.json
@@ -7,7 +7,6 @@
"port": 8081
},
"flags": {
- "secretsManager": true,
"showPasswordless": true,
"enableCipherKeyEncryption": false
}
diff --git a/apps/web/config/usdev.json b/apps/web/config/usdev.json
index 9b794d896d..af96a38c6a 100644
--- a/apps/web/config/usdev.json
+++ b/apps/web/config/usdev.json
@@ -5,7 +5,6 @@
"scim": "https://scim.usdev.bitwarden.pw"
},
"flags": {
- "secretsManager": true,
"showPasswordless": true
}
}
diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.ts b/apps/web/src/app/admin-console/organizations/members/people.component.ts
index 8a303ddfe5..0da0ab79f0 100644
--- a/apps/web/src/app/admin-console/organizations/members/people.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/people.component.ts
@@ -52,7 +52,6 @@ import { Collection } from "@bitwarden/common/vault/models/domain/collection";
import { CollectionDetailsResponse } from "@bitwarden/common/vault/models/response/collection.response";
import { DialogService, SimpleDialogOptions } from "@bitwarden/components";
-import { flagEnabled } from "../../../../utils/flags";
import { openEntityEventsDialog } from "../../../admin-console/organizations/manage/entity-events.component";
import { BasePeopleComponent } from "../../common/base.people.component";
import { GroupService } from "../core";
@@ -148,9 +147,7 @@ export class PeopleComponent
shareReplay({ refCount: true, bufferSize: 1 }),
);
- this.canUseSecretsManager$ = organization$.pipe(
- map((org) => org.useSecretsManager && flagEnabled("secretsManager")),
- );
+ this.canUseSecretsManager$ = organization$.pipe(map((org) => org.useSecretsManager));
const policies$ = organization$.pipe(
switchMap((organization) => {
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
index 449557b6f4..c9956f05e4 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
@@ -1,10 +1,8 @@
-
-
-
-
+
+
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
index a461785c31..eff5f08702 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.component.ts
@@ -1,16 +1,11 @@
import { AfterViewInit, ChangeDetectorRef, Component, Input } from "@angular/core";
import { IconButtonType } from "@bitwarden/components/src/icon-button/icon-button.component";
-
-import { flagEnabled } from "../../../utils/flags";
-
@Component({
selector: "product-switcher",
templateUrl: "./product-switcher.component.html",
})
export class ProductSwitcherComponent implements AfterViewInit {
- protected isEnabled = flagEnabled("secretsManager");
-
/**
* Passed to the product switcher's `bitIconButton`
*/
diff --git a/apps/web/src/utils/flags.ts b/apps/web/src/utils/flags.ts
index 902159147e..9d3c25d5cc 100644
--- a/apps/web/src/utils/flags.ts
+++ b/apps/web/src/utils/flags.ts
@@ -7,14 +7,13 @@ import {
} from "@bitwarden/common/platform/misc/flags";
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type Flags = {
- secretsManager?: boolean;
showPasswordless?: boolean;
} & SharedFlags;
// required to avoid linting errors when there are no flags
-/* eslint-disable-next-line @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type DevFlags = {} & SharedDevFlags;
export function flagEnabled(flag: keyof Flags): boolean {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
index f9ddcdad78..55dc2f8b71 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { AuthGuard } from "@bitwarden/angular/auth/guards";
-import { buildFlaggedRoute } from "@bitwarden/web-vault/app/oss-routing.module";
import { organizationEnabledGuard } from "./guards/sm-org-enabled.guard";
import { canActivateSM } from "./guards/sm.guard";
@@ -17,7 +16,7 @@ import { OrgSuspendedComponent } from "./shared/org-suspended.component";
import { TrashModule } from "./trash/trash.module";
const routes: Routes = [
- buildFlaggedRoute("secretsManager", {
+ {
path: "",
children: [
{
@@ -86,7 +85,7 @@ const routes: Routes = [
],
},
],
- }),
+ },
];
@NgModule({
diff --git a/libs/common/src/platform/misc/flags.ts b/libs/common/src/platform/misc/flags.ts
index c1f8d7757b..cc463b1060 100644
--- a/libs/common/src/platform/misc/flags.ts
+++ b/libs/common/src/platform/misc/flags.ts
@@ -1,5 +1,5 @@
// required to avoid linting errors when there are no flags
-/* eslint-disable @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type SharedFlags = {
multithreadDecryption: boolean;
showPasswordless?: boolean;
@@ -7,7 +7,7 @@ export type SharedFlags = {
};
// required to avoid linting errors when there are no flags
-/* eslint-disable @typescript-eslint/ban-types */
+// eslint-disable-next-line @typescript-eslint/ban-types
export type SharedDevFlags = {
noopNotifications: boolean;
};