diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 6502234a0d..c7b95b1515 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -2249,7 +2249,7 @@ "message": "Request admin approval" }, "approveWithMasterPassword": { - "message": "Approve with master password" + "message": "Approve with master password" }, "eu": { "message": "EU", @@ -2267,5 +2267,8 @@ }, "display": { "message": "Display" + }, + "accountSuccessfullyCreated": { + "message": "Account successfully created!" } } diff --git a/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts index 3a303e7bf8..1533645197 100644 --- a/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts +++ b/apps/browser/src/auth/popup/login-decryption-options/login-decryption-options.component.ts @@ -13,6 +13,7 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service" import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; @@ -36,7 +37,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC protected apiService: ApiService, protected i18nService: I18nService, protected validationService: ValidationService, - protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction + protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, + protected platformUtilsService: PlatformUtilsService ) { super( formBuilder, @@ -53,7 +55,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC apiService, i18nService, validationService, - deviceTrustCryptoService + deviceTrustCryptoService, + platformUtilsService ); } } diff --git a/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.ts b/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.ts index 6d2aa11b16..3dc9b416f9 100644 --- a/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.ts +++ b/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.ts @@ -13,6 +13,7 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service" import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; @@ -36,7 +37,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC protected apiService: ApiService, protected i18nService: I18nService, protected validationService: ValidationService, - protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction + protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, + protected platformUtilsService: PlatformUtilsService ) { super( formBuilder, @@ -53,7 +55,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC apiService, i18nService, validationService, - deviceTrustCryptoService + deviceTrustCryptoService, + platformUtilsService ); } } diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index 3cc382404e..54122aa1f8 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -2268,7 +2268,7 @@ "message": "Request admin approval" }, "approveWithMasterPassword": { - "message": "Approve with master password" + "message": "Approve with master password" }, "region": { "message": "Region" @@ -2286,6 +2286,8 @@ }, "accessDenied": { "message": "Access denied. You do not have permission to view this page." + }, + "accountSuccessfullyCreated": { + "message": "Account successfully created!" } - } diff --git a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.ts b/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.ts index 2924493773..076bef38f7 100644 --- a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.ts +++ b/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.ts @@ -13,6 +13,7 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service" import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; @Component({ @@ -35,7 +36,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC protected apiService: ApiService, protected i18nService: I18nService, protected validationService: ValidationService, - protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction + protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, + protected platformUtilsService: PlatformUtilsService ) { super( formBuilder, @@ -52,7 +54,8 @@ export class LoginDecryptionOptionsComponent extends BaseLoginDecryptionOptionsC apiService, i18nService, validationService, - deviceTrustCryptoService + deviceTrustCryptoService, + platformUtilsService ); } } diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index f95cdb1b29..8e4b50423b 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -6993,5 +6993,8 @@ }, "selectedRegionFlag": { "message": "Selected region flag" + }, + "accountSuccessfullyCreated": { + "message": "Account successfully created!" } } diff --git a/libs/angular/src/auth/components/base-login-decryption-options.component.ts b/libs/angular/src/auth/components/base-login-decryption-options.component.ts index 0e3dfb4fb6..05dbcc2cfd 100644 --- a/libs/angular/src/auth/components/base-login-decryption-options.component.ts +++ b/libs/angular/src/auth/components/base-login-decryption-options.component.ts @@ -25,6 +25,7 @@ import { KeysRequest } from "@bitwarden/common/models/request/keys.request"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -86,7 +87,8 @@ export class BaseLoginDecryptionOptionsComponent implements OnInit, OnDestroy { protected apiService: ApiService, protected i18nService: I18nService, protected validationService: ValidationService, - protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction + protected deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, + protected platformUtilsService: PlatformUtilsService ) {} async ngOnInit() { @@ -106,6 +108,11 @@ export class BaseLoginDecryptionOptionsComponent implements OnInit, OnDestroy { // We are dealing with a new account if: // - User does not have admin approval (i.e. has not enrolled into admin reset) // - AND does not have a master password + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("accountSuccessfullyCreated") + ); this.loadNewUserData(); } else { this.loadUntrustedDeviceData(accountDecryptionOptions);