Merge branch 'master' into feature/org-admin-refresh

libs/common/src/services/login.service.ts

@@ -1,9 +1,12 @@
 import { LoginService as LoginServiceAbstraction } from "../abstractions/login.service";
+import { StateService } from "../abstractions/state.service";
 
 export class LoginService implements LoginServiceAbstraction {
   private _email: string;
   private _rememberEmail: boolean;
 
+  constructor(private stateService: StateService) {}
+
   getEmail() {
     return this._email;
   }
@@ -24,4 +27,9 @@ export class LoginService implements LoginServiceAbstraction {
     this._email = null;
     this._rememberEmail = null;
   }
+
+  async saveEmailSettings() {
+    await this.stateService.setRememberedEmail(this._rememberEmail ? this._email : null);
+    this.clearValues();
+  }
 }

libs/common/src/services/policy/policy.service.ts

@@ -268,7 +268,6 @@ export class PolicyService implements InternalPolicyServiceAbstraction {
 
     return organizations.some(
       (o) =>
-        o.enabled &&
         o.status >= OrganizationUserStatusType.Accepted &&
         o.usePolicies &&
         policySet.has(o.id) &&

libs/common/src/services/usernameGeneration.service.ts

@@ -17,7 +17,7 @@ const DefaultOptions = {
   wordIncludeNumber: true,
   subaddressType: "random",
   catchallType: "random",
-  forwardedService: "simplelogin",
+  forwardedService: "",
   forwardedAnonAddyDomain: "anonaddy.me",
 };