[SM-1031] Remove SecretsManager & showDDG compile flags (#8610)

Remove old compile flags which should no longer be required, and may even cause issues. secretsManager: false hides the app switcher which is now used for more than just secrets manager.

.storybook/main.ts

@@ -38,9 +38,7 @@ const config: StorybookConfig = {
   },
   env: (config) => ({
     ...config,
-    FLAGS: JSON.stringify({
+    FLAGS: JSON.stringify({}),
-      secretsManager: true,
-    }),
   }),
   webpackFinal: async (config, { configType }) => {
     if (config.resolve) {

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;

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 {

apps/desktop/config/development.json

@@ -1,7 +1,6 @@
 {
   "devFlags": {},
   "flags": {
-    "showDDGSetting": true,
     "enableCipherKeyEncryption": false
   }
 }

apps/desktop/config/production.json

@@ -1,6 +1,5 @@
 {
   "flags": {
-    "showDDGSetting": true,
     "enableCipherKeyEncryption": false
   }
 }

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 },

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 */
+// eslint-disable-next-line @typescript-eslint/ban-types
-export type Flags = {
+export type Flags = {} & SharedFlags;
-  showDDGSetting?: 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 {

apps/web/config/base.json

@@ -11,7 +11,6 @@
     "allowedHosts": "auto"
   },
   "flags": {
-    "secretsManager": false,
     "showPasswordless": false,
     "enableCipherKeyEncryption": false
   }

apps/web/config/cloud.json

@@ -17,7 +17,6 @@
     "proxyNotifications": "https://notifications.bitwarden.com"
   },
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true,
     "enableCipherKeyEncryption": false
   }

apps/web/config/development.json

@@ -20,7 +20,6 @@
     }
   ],
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true,
     "enableCipherKeyEncryption": false
   },

apps/web/config/euprd.json

@@ -11,7 +11,6 @@
     "buttonAction": "https://www.paypal.com/cgi-bin/webscr"
   },
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true,
     "enableCipherKeyEncryption": false
   }

apps/web/config/euqa.json

@@ -21,7 +21,6 @@
     }
   ],
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true
   }
 }

apps/web/config/qa.json

@@ -27,7 +27,6 @@
     }
   ],
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true,
     "enableCipherKeyEncryption": false
   }

apps/web/config/selfhosted.json

@@ -7,7 +7,6 @@
     "port": 8081
   },
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true,
     "enableCipherKeyEncryption": false
   }

apps/web/config/usdev.json

@@ -5,7 +5,6 @@
     "scim": "https://scim.usdev.bitwarden.pw"
   },
   "flags": {
-    "secretsManager": true,
     "showPasswordless": true
   }
 }

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(
+    this.canUseSecretsManager$ = organization$.pipe(map((org) => org.useSecretsManager));
-      map((org) => org.useSecretsManager && flagEnabled("secretsManager")),
-    );
 
     const policies$ = organization$.pipe(
       switchMap((organization) => {

apps/web/src/app/layouts/product-switcher/product-switcher.component.html

@@ -1,10 +1,8 @@
-<ng-template [ngIf]="isEnabled">
+<button
-  <button
+  type="button"
-    type="button"
+  bitIconButton="bwi bwi-fw bwi-filter"
-    bitIconButton="bwi bwi-fw bwi-filter"
+  [bitMenuTriggerFor]="content?.menu"
-    [bitMenuTriggerFor]="content?.menu"
+  [buttonType]="buttonType"
-    [buttonType]="buttonType"
+  [attr.aria-label]="'switchProducts' | i18n"
-    [attr.aria-label]="'switchProducts' | i18n"
+></button>
-  ></button>
+<product-switcher-content #content></product-switcher-content>
-  <product-switcher-content #content></product-switcher-content>
-</ng-template>

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`
    */

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 {

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({

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;
 };