mirror of
https://github.com/bitwarden/browser.git
synced 2025-03-11 13:30:39 +01:00
Rename login.component to login-v1.component except browser.
This commit is contained in:
parent
2e6e5a5c08
commit
035e62e72b
@ -32,8 +32,8 @@ import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
|
|||||||
import { HintComponent } from "../auth/hint.component";
|
import { HintComponent } from "../auth/hint.component";
|
||||||
import { LockComponent } from "../auth/lock.component";
|
import { LockComponent } from "../auth/lock.component";
|
||||||
import { LoginDecryptionOptionsComponent } from "../auth/login/login-decryption-options/login-decryption-options.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 { LoginViaAuthRequestComponent } from "../auth/login/login-via-auth-request.component";
|
||||||
import { LoginComponentV1 } from "../auth/login/login.component";
|
|
||||||
import { RegisterComponent } from "../auth/register.component";
|
import { RegisterComponent } from "../auth/register.component";
|
||||||
import { RemovePasswordComponent } from "../auth/remove-password.component";
|
import { RemovePasswordComponent } from "../auth/remove-password.component";
|
||||||
import { SetPasswordComponent } from "../auth/set-password.component";
|
import { SetPasswordComponent } from "../auth/set-password.component";
|
||||||
|
@ -34,7 +34,7 @@ const BroadcasterSubscriptionId = "LoginComponent";
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-login",
|
selector: "app-login",
|
||||||
templateUrl: "login.component.html",
|
templateUrl: "login-v1.component.html",
|
||||||
})
|
})
|
||||||
export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDestroy {
|
export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDestroy {
|
||||||
@ViewChild("environment", { read: ViewContainerRef, static: true })
|
@ViewChild("environment", { read: ViewContainerRef, static: true })
|
@ -6,8 +6,8 @@ import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components
|
|||||||
import { SharedModule } from "../../app/shared/shared.module";
|
import { SharedModule } from "../../app/shared/shared.module";
|
||||||
|
|
||||||
import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component";
|
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 { LoginViaAuthRequestComponent } from "./login-via-auth-request.component";
|
||||||
import { LoginComponentV1 } from "./login.component";
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [SharedModule, RouterModule],
|
imports: [SharedModule, RouterModule],
|
||||||
|
@ -84,6 +84,9 @@ export class Main {
|
|||||||
// on ready stuff...
|
// on ready stuff...
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.commandLine.appendSwitch("ignore-certificate-errors");
|
||||||
|
app.commandLine.appendSwitch("allow-insecure-localhost", "true");
|
||||||
|
|
||||||
if (appDataPath != null) {
|
if (appDataPath != null) {
|
||||||
app.setPath("userData", appDataPath);
|
app.setPath("userData", appDataPath);
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ import { OrganizationInvite } from "../organization-invite/organization-invite";
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: "app-login",
|
selector: "app-login",
|
||||||
templateUrl: "login.component.html",
|
templateUrl: "login-v1.component.html",
|
||||||
})
|
})
|
||||||
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
||||||
export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
|
export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
|
@ -5,9 +5,9 @@ import { CheckboxModule } from "@bitwarden/components";
|
|||||||
import { SharedModule } from "../../../app/shared";
|
import { SharedModule } from "../../../app/shared";
|
||||||
|
|
||||||
import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component";
|
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 { LoginViaAuthRequestComponent } from "./login-via-auth-request.component";
|
||||||
import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component";
|
import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component";
|
||||||
import { LoginComponentV1 } from "./login.component";
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [SharedModule, CheckboxModule],
|
imports: [SharedModule, CheckboxModule],
|
||||||
|
@ -39,9 +39,9 @@ import { deepLinkGuard } from "./auth/guards/deep-link.guard";
|
|||||||
import { HintComponent } from "./auth/hint.component";
|
import { HintComponent } from "./auth/hint.component";
|
||||||
import { LockComponent } from "./auth/lock.component";
|
import { LockComponent } from "./auth/lock.component";
|
||||||
import { LoginDecryptionOptionsComponent } from "./auth/login/login-decryption-options/login-decryption-options.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 { LoginViaAuthRequestComponent } from "./auth/login/login-via-auth-request.component";
|
||||||
import { LoginViaWebAuthnComponent } from "./auth/login/login-via-webauthn/login-via-webauthn.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 { AcceptOrganizationComponent } from "./auth/organization-invite/accept-organization.component";
|
||||||
import { RecoverDeleteComponent } from "./auth/recover-delete.component";
|
import { RecoverDeleteComponent } from "./auth/recover-delete.component";
|
||||||
import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component";
|
import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component";
|
||||||
|
@ -123,6 +123,10 @@ export class DefaultConfigService implements ConfigService {
|
|||||||
serverConfig: ServerConfig | null,
|
serverConfig: ServerConfig | null,
|
||||||
flag: Flag,
|
flag: Flag,
|
||||||
) {
|
) {
|
||||||
|
if (flag == FeatureFlag.ExtensionRefresh) {
|
||||||
|
return true as FeatureFlagValueType<Flag>;
|
||||||
|
}
|
||||||
|
|
||||||
if (serverConfig?.featureStates == null || serverConfig.featureStates[flag] == null) {
|
if (serverConfig?.featureStates == null || serverConfig.featureStates[flag] == null) {
|
||||||
return DefaultFeatureFlagValue[flag];
|
return DefaultFeatureFlagValue[flag];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user