diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index 6d96602ec88..fe3e27ea9f1 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -32,8 +32,8 @@ import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard"; import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; import { LoginDecryptionOptionsComponent } from "../auth/login/login-decryption-options/login-decryption-options.component"; +import { LoginComponentV1 } from "../auth/login/login-v1.component"; import { LoginViaAuthRequestComponent } from "../auth/login/login-via-auth-request.component"; -import { LoginComponentV1 } from "../auth/login/login.component"; import { RegisterComponent } from "../auth/register.component"; import { RemovePasswordComponent } from "../auth/remove-password.component"; import { SetPasswordComponent } from "../auth/set-password.component"; diff --git a/apps/desktop/src/auth/login/login.component.html b/apps/desktop/src/auth/login/login-v1.component.html similarity index 100% rename from apps/desktop/src/auth/login/login.component.html rename to apps/desktop/src/auth/login/login-v1.component.html diff --git a/apps/desktop/src/auth/login/login.component.ts b/apps/desktop/src/auth/login/login-v1.component.ts similarity index 99% rename from apps/desktop/src/auth/login/login.component.ts rename to apps/desktop/src/auth/login/login-v1.component.ts index 1cde6414704..29586e5e7fe 100644 --- a/apps/desktop/src/auth/login/login.component.ts +++ b/apps/desktop/src/auth/login/login-v1.component.ts @@ -34,7 +34,7 @@ const BroadcasterSubscriptionId = "LoginComponent"; @Component({ selector: "app-login", - templateUrl: "login.component.html", + templateUrl: "login-v1.component.html", }) export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDestroy { @ViewChild("environment", { read: ViewContainerRef, static: true }) diff --git a/apps/desktop/src/auth/login/login.module.ts b/apps/desktop/src/auth/login/login.module.ts index 6a4affdfd2b..c0b330bf2dd 100644 --- a/apps/desktop/src/auth/login/login.module.ts +++ b/apps/desktop/src/auth/login/login.module.ts @@ -6,8 +6,8 @@ import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components import { SharedModule } from "../../app/shared/shared.module"; import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component"; +import { LoginComponentV1 } from "./login-v1.component"; import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component"; -import { LoginComponentV1 } from "./login.component"; @NgModule({ imports: [SharedModule, RouterModule], diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 86d07440a73..2651dedaddc 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -84,6 +84,9 @@ export class Main { // on ready stuff... }); + app.commandLine.appendSwitch("ignore-certificate-errors"); + app.commandLine.appendSwitch("allow-insecure-localhost", "true"); + if (appDataPath != null) { app.setPath("userData", appDataPath); } diff --git a/apps/web/src/app/auth/login/login.component.html b/apps/web/src/app/auth/login/login-v1.component.html similarity index 100% rename from apps/web/src/app/auth/login/login.component.html rename to apps/web/src/app/auth/login/login-v1.component.html diff --git a/apps/web/src/app/auth/login/login.component.ts b/apps/web/src/app/auth/login/login-v1.component.ts similarity index 99% rename from apps/web/src/app/auth/login/login.component.ts rename to apps/web/src/app/auth/login/login-v1.component.ts index 954fe5e9881..9cc4d36a723 100644 --- a/apps/web/src/app/auth/login/login.component.ts +++ b/apps/web/src/app/auth/login/login-v1.component.ts @@ -39,7 +39,7 @@ import { OrganizationInvite } from "../organization-invite/organization-invite"; @Component({ selector: "app-login", - templateUrl: "login.component.html", + templateUrl: "login-v1.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class LoginComponentV1 extends BaseLoginComponent implements OnInit { diff --git a/apps/web/src/app/auth/login/login.module.ts b/apps/web/src/app/auth/login/login.module.ts index d1374530339..53e921d7d2b 100644 --- a/apps/web/src/app/auth/login/login.module.ts +++ b/apps/web/src/app/auth/login/login.module.ts @@ -5,9 +5,9 @@ import { CheckboxModule } from "@bitwarden/components"; import { SharedModule } from "../../../app/shared"; import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component"; +import { LoginComponentV1 } from "./login-v1.component"; import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component"; import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component"; -import { LoginComponentV1 } from "./login.component"; @NgModule({ imports: [SharedModule, CheckboxModule], diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index d8d52ca3e7e..f54d190fc71 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -39,9 +39,9 @@ import { deepLinkGuard } from "./auth/guards/deep-link.guard"; import { HintComponent } from "./auth/hint.component"; import { LockComponent } from "./auth/lock.component"; import { LoginDecryptionOptionsComponent } from "./auth/login/login-decryption-options/login-decryption-options.component"; +import { LoginComponentV1 } from "./auth/login/login-v1.component"; import { LoginViaAuthRequestComponent } from "./auth/login/login-via-auth-request.component"; import { LoginViaWebAuthnComponent } from "./auth/login/login-via-webauthn/login-via-webauthn.component"; -import { LoginComponentV1 } from "./auth/login/login.component"; import { AcceptOrganizationComponent } from "./auth/organization-invite/accept-organization.component"; import { RecoverDeleteComponent } from "./auth/recover-delete.component"; import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component"; diff --git a/libs/common/src/platform/services/config/default-config.service.ts b/libs/common/src/platform/services/config/default-config.service.ts index e0603ed509b..b0a057acc93 100644 --- a/libs/common/src/platform/services/config/default-config.service.ts +++ b/libs/common/src/platform/services/config/default-config.service.ts @@ -123,6 +123,10 @@ export class DefaultConfigService implements ConfigService { serverConfig: ServerConfig | null, flag: Flag, ) { + if (flag == FeatureFlag.ExtensionRefresh) { + return true as FeatureFlagValueType; + } + if (serverConfig?.featureStates == null || serverConfig.featureStates[flag] == null) { return DefaultFeatureFlagValue[flag]; }