Merge branch 'main' into auth/pm-8111/browser-refresh-login-component

apps/browser/src/popup/app-routing.module.ts

@@ -420,8 +420,12 @@ const routes: Routes = [
           path: "hint",
           canActivate: [unauthGuardFn(unauthRouteOverrides)],
           data: {
-            pageTitle: "requestPasswordHint",
-            pageSubtitle: "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou",
+            pageTitle: {
+              key: "requestPasswordHint",
+            },
+            pageSubtitle: {
+              key: "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou",
+            },
             pageIcon: UserLockIcon,
             showBackButton: true,
             state: "hint",

apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts

@@ -3,6 +3,8 @@ import { Component } from "@angular/core";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
@@ -23,11 +25,19 @@ export class RequireSsoPolicy extends BasePolicy {
   templateUrl: "require-sso.component.html",
 })
 export class RequireSsoPolicyComponent extends BasePolicyComponent {
-  constructor(private i18nService: I18nService) {
+  constructor(
+    private i18nService: I18nService,
+    private configService: ConfigService,
+  ) {
     super();
   }
 
-  buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
+  async buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
+    if (await this.configService.getFeatureFlag(FeatureFlag.Pm13322AddPolicyDefinitions)) {
+      // We are now relying on server-side validation only
+      return super.buildRequest(policiesEnabledMap);
+    }
+
     const singleOrgEnabled = policiesEnabledMap.get(PolicyType.SingleOrg) ?? false;
     if (this.enabled.value && !singleOrgEnabled) {
       throw new Error(this.i18nService.t("requireSsoPolicyReqError"));

apps/web/src/app/admin-console/organizations/policies/single-org.component.ts

@@ -2,6 +2,8 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
@@ -18,11 +20,19 @@ export class SingleOrgPolicy extends BasePolicy {
   templateUrl: "single-org.component.html",
 })
 export class SingleOrgPolicyComponent extends BasePolicyComponent {
-  constructor(private i18nService: I18nService) {
+  constructor(
+    private i18nService: I18nService,
+    private configService: ConfigService,
+  ) {
     super();
   }
 
-  buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
+  async buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
+    if (await this.configService.getFeatureFlag(FeatureFlag.Pm13322AddPolicyDefinitions)) {
+      // We are now relying on server-side validation only
+      return super.buildRequest(policiesEnabledMap);
+    }
+
     if (!this.enabled.value) {
       if (policiesEnabledMap.get(PolicyType.RequireSso) ?? false) {
         throw new Error(

apps/web/src/app/oss-routing.module.ts

@@ -233,7 +233,9 @@ const routes: Routes = [
       path: "hint",
       canActivate: [unauthGuardFn()],
       data: {
-        pageTitle: "passwordHint",
+        pageTitle: {
+          key: "passwordHint",
+        },
         titleId: "passwordHint",
       },
       children: [
@@ -252,8 +254,12 @@ const routes: Routes = [
           path: "hint",
           canActivate: [unauthGuardFn()],
           data: {
-            pageTitle: "requestPasswordHint",
-            pageSubtitle: "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou",
+            pageTitle: {
+              key: "requestPasswordHint",
+            },
+            pageSubtitle: {
+              key: "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou",
+            },
             pageIcon: UserLockIcon,
             state: "hint",
           },

apps/web/src/locales/en/messages.json

@@ -9389,6 +9389,21 @@
   "editAccess": {
     "message": "Edit access"
   },
+  "textHelpText": {
+    "message": "Use text fields for data like security questions"
+  },
+  "hiddenHelpText": {
+    "message": "Use hidden fields for sensitive data like a password"
+  },
+  "checkBoxHelpText": {
+    "message": "Use checkboxes if you'd like to autofill a form's checkbox, like a remember email"
+  },
+  "linkedHelpText": {
+    "message": "Use a linked field when you are experiencing autofill issues for a specific website."
+  },
+  "linkedLabelHelpText": {
+    "message": "Enter the the field's html id, name, aria-label, or placeholder."
+  },
   "uppercaseDescription": {
     "message": "Include uppercase characters",
     "description": "Tooltip for the password generator uppercase character checkbox"