diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 61daf7c82cbd..6e1c4e569ef1 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -11,7 +11,8 @@ import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component"
import { AcceptOrganizationComponent } from "./accounts/accept-organization.component";
import { HintComponent } from "./accounts/hint.component";
import { LockComponent } from "./accounts/lock.component";
-import { LoginComponent } from "./accounts/login.component";
+import { LoginWithDeviceComponent } from "./accounts/login/login-with-device.component";
+import { LoginComponent } from "./accounts/login/login.component";
import { RecoverDeleteComponent } from "./accounts/recover-delete.component";
import { RecoverTwoFactorComponent } from "./accounts/recover-two-factor.component";
import { RegisterComponent } from "./accounts/register.component";
@@ -60,6 +61,11 @@ const routes: Routes = [
canActivate: [HomeGuard], // Redirects either to vault, login or lock page.
},
{ path: "login", component: LoginComponent, canActivate: [UnauthGuard] },
+ {
+ path: "login-with-device",
+ component: LoginWithDeviceComponent,
+ data: { titleId: "loginWithDevice" },
+ },
{ path: "2fa", component: TwoFactorComponent, canActivate: [UnauthGuard] },
{
path: "register",
diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts
index 0885d7d5d770..457200a0e9b8 100644
--- a/apps/web/src/app/oss.module.ts
+++ b/apps/web/src/app/oss.module.ts
@@ -1,5 +1,6 @@
import { NgModule } from "@angular/core";
+import { LoginModule } from "./accounts/login/login.module";
import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module";
import { OrganizationCreateModule } from "./organizations/create/organization-create.module";
import { OrganizationManageModule } from "./organizations/manage/organization-manage.module";
@@ -18,6 +19,7 @@ import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module";
OrganizationManageModule,
OrganizationUserModule,
OrganizationCreateModule,
+ LoginModule,
],
exports: [
SharedModule,
@@ -25,6 +27,7 @@ import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module";
TrialInitiationModule,
VaultFilterModule,
OrganizationBadgeModule,
+ LoginModule,
],
bootstrap: [],
})
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 59315f9253c9..c68741b5a2bb 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -6,7 +6,6 @@ import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component
import { AcceptOrganizationComponent } from "../accounts/accept-organization.component";
import { HintComponent } from "../accounts/hint.component";
import { LockComponent } from "../accounts/lock.component";
-import { LoginComponent } from "../accounts/login.component";
import { RecoverDeleteComponent } from "../accounts/recover-delete.component";
import { RecoverTwoFactorComponent } from "../accounts/recover-two-factor.component";
import { RegisterFormModule } from "../accounts/register-form/register-form.module";
@@ -210,7 +209,6 @@ import { SharedModule } from ".";
FrontendLayoutComponent,
HintComponent,
LockComponent,
- LoginComponent,
MasterPasswordPolicyComponent,
NavbarComponent,
NestedCheckboxComponent,
@@ -355,7 +353,6 @@ import { SharedModule } from ".";
FrontendLayoutComponent,
HintComponent,
LockComponent,
- LoginComponent,
MasterPasswordPolicyComponent,
NavbarComponent,
NestedCheckboxComponent,
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index 3ab3434cfb30..6a52acd58d77 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Toestemmings"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index 2b3457e9bde1..473e312b25e2 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index 1bd2459880a8..86ebc3a5878d 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "İcazələr"
},
+ "managerPermissions": {
+ "message": "Menecer icazələri"
+ },
+ "adminPermissions": {
+ "message": "Admin icazələri"
+ },
"accessEventLogs": {
"message": "Tədbir jurnalına müraciət"
},
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index a140a2254141..20a80249cc79 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -65,7 +65,7 @@
"message": "Код бяспекі (CVV)"
},
"identityName": {
- "message": "Імя"
+ "message": "Імя пасведчання"
},
"company": {
"message": "Кампанія"
@@ -233,7 +233,7 @@
"message": "Праверце, ці не скампраметаваны пароль."
},
"passwordExposed": {
- "message": "Гэты пароль быў скампраметаваны $VALUE$ раз(-ы/-оў). Вы павінны змяніць яго.",
+ "message": "Гэты пароль быў скампраметаваны наступную колькасць разоў: $VALUE$. Вы павінны змяніць яго.",
"placeholders": {
"value": {
"content": "$1",
@@ -398,27 +398,27 @@
}
},
"copyValue": {
- "message": "Капіяваць значэнне",
+ "message": "Скапіяваць значэнне",
"description": "Copy value to clipboard"
},
"copyPassword": {
- "message": "Капіяваць пароль",
+ "message": "Скапіяваць пароль",
"description": "Copy password to clipboard"
},
"copyUsername": {
- "message": "Капіяваць імя карыстальніка",
+ "message": "Скапіяваць імя карыстальніка",
"description": "Copy username to clipboard"
},
"copyNumber": {
- "message": "Капіяваць нумар",
+ "message": "Скапіяваць нумар",
"description": "Copy credit card number"
},
"copySecurityCode": {
- "message": "Капіяваць код бяспекі",
+ "message": "Скапіяваць код бяспекі",
"description": "Copy credit card security code (CVV)"
},
"copyUri": {
- "message": "Капіяваць URI",
+ "message": "Скапіяваць URI",
"description": "Copy URI to clipboard"
},
"me": {
@@ -648,7 +648,7 @@
"message": "Уліковы запіс паспяхова створаны."
},
"masterPassSent": {
- "message": "Мы адправілі вам на электронную пошту падказку для асноўнага пароля."
+ "message": "Мы адправілі вам на электронную пошту падказку да асноўнага пароля."
},
"unexpectedError": {
"message": "Адбылася нечаканая памылка."
@@ -663,7 +663,7 @@
"message": "Разблакіраваць"
},
"loggedInAsEmailOn": {
- "message": "Вы ўвайшлі як $HOSTNAME$ у $EMAIL$.",
+ "message": "Вы ўвайшлі як $EMAIL$ у $HOSTNAME$.",
"placeholders": {
"email": {
"content": "$1",
@@ -867,7 +867,7 @@
"message": "Праверачны код (TOTP)"
},
"copyVerificationCode": {
- "message": "Капіяваць праверачны код"
+ "message": "Скапіяваць праверачны код"
},
"warning": {
"message": "Папярэджанне"
@@ -2272,10 +2272,10 @@
"message": "Ваша арганізацыя была абноўлена."
},
"leave": {
- "message": "Пакінуць"
+ "message": "Выйсці"
},
"leaveOrganizationConfirmation": {
- "message": "Вы ўпэўнены, што хочаце пакінуць гэту арганізацыю?"
+ "message": "Вы ўпэўнены, што хочаце выйсці з гэтай арганізацыі?"
},
"leftOrganization": {
"message": "Вы пакінулі арганізацыю."
@@ -2284,7 +2284,7 @@
"message": "Прадвызначаная калекцыя"
},
"getHelp": {
- "message": "Атрымаць дапамогу"
+ "message": "Атрымаць даведку"
},
"getApps": {
"message": "Атрымаць праграмы"
@@ -3365,7 +3365,7 @@
"message": "У вашым сховішчы ёсць старыя далучаныя файлы, якія неабходна выправіць перад тым, як змяніць ключ шыфравання ўліковага запісу."
},
"yourAccountsFingerprint": {
- "message": "Фраза адбітку вашага ўліковага запісу",
+ "message": "Фраза адбітку пальца вашага ўліковага запісу",
"description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
},
"fingerprintEnsureIntegrityVerify": {
@@ -3454,7 +3454,7 @@
"message": "Адна або больш палітык арганізацыі ўплывае на налады генератара."
},
"masterPasswordPolicyInEffect": {
- "message": "Згодна з адной або некалькімі палітыкамі арганізацыі асноўны пароль павінен адпавядаць наступным патрабаванням:"
+ "message": "Адна або больш палітык арганізацыі патрабуе, каб ваш асноўны пароль адпавядаў наступным патрабаванням:"
},
"policyInEffectMinComplexity": {
"message": "Мінімальны ўзровень складанасці $SCORE$",
@@ -3534,7 +3534,7 @@
"message": "Назаўсёды выдаліць элементы"
},
"permanentlyDeleteItemConfirmation": {
- "message": "Вы ўпэўнены, што хочаце назаўсёды выдаліць гэтыя элементы?"
+ "message": "Вы ўпэўнены, што хочаце назаўсёды выдаліць гэты элемент?"
},
"permanentlyDeletedItem": {
"message": "Элемент выдалены назаўсёды"
@@ -3744,14 +3744,14 @@
"message": "Дата завяршэння"
},
"expirationDateDesc": {
- "message": "Калі зададзена, то доступ да гэтага Send міне ў азначаную дату і час.",
+ "message": "Калі прызначана, то доступ да гэтага Send міне ў азначаную дату і час.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"maxAccessCount": {
"message": "Максімальная колькасць доступаў"
},
"maxAccessCountDesc": {
- "message": "Калі зададзена, то карыстальнікі больш не змогуць атрымаць доступ да гэтага Send пасля таго, як будзе дасягнута максімальная колькасць зваротаў.",
+ "message": "Калі прызначана, то карыстальнікі больш не змогуць атрымаць доступ да гэтага Send пасля таго, як будзе дасягнута максімальная колькасць зваротаў.",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"currentAccessCount": {
@@ -3776,7 +3776,7 @@
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"copySendLink": {
- "message": "Капіяваць спасылку на Send",
+ "message": "Скапіяваць спасылку на Send",
"description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
},
"removePassword": {
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Дазволы"
},
+ "managerPermissions": {
+ "message": "Дазволы менеджара"
+ },
+ "adminPermissions": {
+ "message": "Дазволы адміністратара"
+ },
"accessEventLogs": {
"message": "Доступ да журналаў з падзеямі"
},
@@ -4310,7 +4316,7 @@
"message": "гэты карыстальнік"
},
"resetPasswordMasterPasswordPolicyInEffect": {
- "message": "Згодна з адной або некалькімі палітыкамі арганізацыі асноўны пароль павінен адпавядаць наступным патрабаванням:"
+ "message": "Адна або больш палітык арганізацыі патрабуе, каб асноўны пароль адпавядаў наступным патрабаванням:"
},
"resetPasswordSuccess": {
"message": "Пароль паспяхова скінуты!"
@@ -4885,7 +4891,7 @@
}
},
"leaveOrganization": {
- "message": "Пакінуць арганізацыю"
+ "message": "Выйсці з арганізацыі"
},
"removeMasterPassword": {
"message": "Выдаліць асноўны пароль"
@@ -5011,7 +5017,7 @@
"message": "Уласнае размяшчэнне"
},
"selfHostingEnterpriseOrganizationSectionCopy": {
- "message": "Для наладжвання арганізацыі на вашым уласным серверы, вам неабходна будзе загрузіць файл з ліцэнзіяй. Для падтрымкі тарыфных планаў Bitwarden Families і пашыраных магчымасцяў выстаўлення рахункаў для вашай арганізацыі, вам неабходна наладзіць плацежную сінхранізацыю."
+ "message": "Для наладжвання арганізацыі на вашым уласным серверы, вам неабходна будзе загрузіць файл з ліцэнзіяй. Для падтрымкі тарыфных планаў Bitwarden Families і пашыраных магчымасцей выстаўлення рахункаў для вашай арганізацыі, вам неабходна наладзіць плацежную сінхранізацыю."
},
"billingSyncApiKeyRotated": {
"message": "Токен зменены."
@@ -5160,7 +5166,7 @@
"description": "Username generator option that appends a random sub-address to the username. For example: address+subaddress@email.com"
},
"plusAddressedEmailDesc": {
- "message": "Выкарыстоўваць магчымасці пададрасацыі вашага пастаўшчыка паслуг электроннай пошты."
+ "message": "Выкарыстоўвайце магчымасці пададрасацыі вашага пастаўшчыка паслуг электроннай пошты."
},
"catchallEmail": {
"message": "Адрас для ўсёй пошты дамена"
@@ -5288,7 +5294,7 @@
"message": "Гэты ключ API мае доступ да кіравання карыстальнікаў у межах вашай арганізацыі. Яго неабходна захоўваць у надзейным месцы."
},
"copyScimKey": {
- "message": "Капіяваць ключ API для SCIM у буфер абмену",
+ "message": "Скапіяваць ключ API для SCIM у буфер абмену",
"description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
},
"rotateScimKey": {
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index 65134d43fc59..200a343abaf7 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Права"
},
+ "managerPermissions": {
+ "message": "Права на управителя"
+ },
+ "adminPermissions": {
+ "message": "Права на администратора"
+ },
"accessEventLogs": {
"message": "Достъп до журналите"
},
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index d3e7a5f6a1d9..837c9cf71905 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index fbc629ef7fe9..2f14bb380f0b 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index 08cc2b165f28..953e79fbf134 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permisos"
},
+ "managerPermissions": {
+ "message": "Permisos de l'administrador"
+ },
+ "adminPermissions": {
+ "message": "Permisos de l'administrador"
+ },
"accessEventLogs": {
"message": "Registres d'esdeveniments dels accessos"
},
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 2e18e2c59234..3bba318dd473 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Oprávnění"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Přístup k logům"
},
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index 9631152699d4..67fdbc44188e 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Tilladelser"
},
+ "managerPermissions": {
+ "message": "Håndtér rettigheder"
+ },
+ "adminPermissions": {
+ "message": "Admin-tilladelser"
+ },
"accessEventLogs": {
"message": "Tilgå begivenhedslogger"
},
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index d12b19e9a4ef..a00359ce98c2 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Berechtigungen"
},
+ "managerPermissions": {
+ "message": "Manager-Berechtigungen"
+ },
+ "adminPermissions": {
+ "message": "Administrator-Berechtigungen"
+ },
"accessEventLogs": {
"message": "Zugriff auf Ereignisprotokolle"
},
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index 54b778b228ba..b8ac7e6c3859 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Άδειες"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Αρχείο Καταγραφής Πρόσβασης"
},
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 5ca96affb7a2..3b8c2f772d7b 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -569,15 +569,27 @@
"loginOrCreateNewAccount": {
"message": "Log in or create a new account to access your secure vault."
},
+ "loginWithDevice" : {
+ "message": "Log in with device"
+ },
+ "loginWithDevciceEnabledInfo": {
+ "message": "Log in with device must be enabled in the settings of the Biwarden mobile app. Need another option?"
+ },
"createAccount": {
"message": "Create Account"
},
+ "newAroundHere": {
+ "message": "New around here?"
+ },
"startTrial": {
"message": "Start Trial"
},
"logIn": {
"message": "Log In"
},
+ "logInInitiated": {
+ "message": "Log in initiated"
+ },
"submit": {
"message": "Submit"
},
@@ -635,7 +647,7 @@
"confirmMasterPasswordRequired": {
"message": "Master password retype is required."
},
- "masterPasswordMinLength": {
+ "masterPasswordMinlength": {
"message": "Master password must be at least 8 characters long."
},
"masterPassDoesntMatch": {
@@ -705,6 +717,9 @@
"noOrganizationsList": {
"message": "You do not belong to any organizations. Organizations allow you to securely share items with other users."
},
+ "notificationSentDevice":{
+ "message": "A notification has been sent to your device."
+ },
"versionNumber": {
"message": "Version $VERSION_NUMBER$",
"placeholders": {
@@ -2532,6 +2547,9 @@
}
}
},
+ "viewAllLoginOptions": {
+ "message": "View all log in options"
+ },
"viewedItemId": {
"message": "Viewed item $ID$.",
"placeholders": {
@@ -3372,6 +3390,12 @@
"message": "To ensure the integrity of your encryption keys, please verify the user's fingerprint phrase before continuing.",
"description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
},
+ "fingerprintMatchInfo": {
+ "message": "Please make sure your vault is unlocked and Fingerprint phrase matches the other device."
+ },
+ "fingerprintPhraseHeader": {
+ "message": "Fingerprint phrase"
+ },
"dontAskFingerprintAgain": {
"message": "Never prompt to verify fingerprint phrases for invited users (Not recommended)",
"description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
@@ -4057,6 +4081,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
@@ -4366,6 +4396,9 @@
"reinviteSelected": {
"message": "Resend Invitations"
},
+ "resendNotification": {
+ "message": "Resend notification"
+ },
"noSelectedUsersApplicable": {
"message": "This action is not applicable to any of the selected users."
},
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index eac572498834..3f7beb72d168 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index 14a07c48e2d3..939d41b015d7 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index 327bc12f0864..960cb3250e7d 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permesoj"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Aliri Eventajn Registrojn"
},
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 686980e052cd..062e73263406 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permisos"
},
+ "managerPermissions": {
+ "message": "Permisos del Administrador"
+ },
+ "adminPermissions": {
+ "message": "Permisos del administrador"
+ },
"accessEventLogs": {
"message": "Acceder a los registros de eventos"
},
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 542914b221dc..f4242fe946db 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Õigused"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Ligipääs sündmuste logile"
},
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index c685a9ffb081..467f257db3de 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Baimenak"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Sarreren erregistroak"
},
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index 610868899195..5bd081806c61 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Käyttöoikeudet"
},
+ "managerPermissions": {
+ "message": "Valvojan oikeudet"
+ },
+ "adminPermissions": {
+ "message": "Ylläpitäjän oikeudet"
+ },
"accessEventLogs": {
"message": "Tapahtumalokien käyttö"
},
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index 37f65c83d49f..874faf9c5527 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index 51dd966dea1c..ce1b38ac01de 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Permissions du Gestionnaire"
+ },
+ "adminPermissions": {
+ "message": "Permissions de l'Administrateur"
+ },
"accessEventLogs": {
"message": "Accéder aux journaux d'événements"
},
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index fce1aa9d41e4..7097f7424616 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 63abb103a711..ebdb4cd0ac2c 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 0207bb4e5955..5ae0ed2b8a78 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Dozvole"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Pristup zapisnicima događaja"
},
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index c4c76ad60954..2d673d6e6542 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Jogosultságok"
},
+ "managerPermissions": {
+ "message": "Jogosultságok kezelése"
+ },
+ "adminPermissions": {
+ "message": "Adminisztrátori jogosultságok"
+ },
"accessEventLogs": {
"message": "Eseménynapló elérése"
},
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 46f191e077bf..07e2c67bdf00 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Izin"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Akses Log Peristiwa"
},
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index b9ba2942153f..f92c5c349e6a 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permessi"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Accedi ai log degli eventi"
},
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index dd3ab6b97a9b..e415d8375343 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "権限"
},
+ "managerPermissions": {
+ "message": "権限の管理"
+ },
+ "adminPermissions": {
+ "message": "管理者権限"
+ },
"accessEventLogs": {
"message": "イベントログにアクセス"
},
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index 5ca96affb7a2..80755183b9f4 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 5ca96affb7a2..80755183b9f4 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index e49c178c6bec..0f57d99a7391 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "ಅನುಮತಿಗಳು"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "ಈವೆಂಟ್ ಲಾಗ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"
},
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 5e9ec49e03a1..9ea99f044464 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -306,7 +306,7 @@
"message": "보안 메모"
},
"typeLoginPlural": {
- "message": "Logins"
+ "message": "로그인"
},
"typeCardPlural": {
"message": "카드"
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "권한"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "이벤트 로그 접근"
},
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 7409f55b9c04..8b5956c696cb 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Atļaujas"
},
+ "managerPermissions": {
+ "message": "Pārvaldnieka atļaujas"
+ },
+ "adminPermissions": {
+ "message": "Administratora atļaujas"
+ },
"accessEventLogs": {
"message": "Piekļūt notikumu žurnāla ierakstiem"
},
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 3daff3c64927..ea6689a9b80c 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "അനുമതികൾ"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index 3f8bec3fd68f..372bd618e022 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Rettigheter"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Få tilgang til hendelseslogger"
},
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index 456d2253c6cf..002abcd8852c 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Rechten"
},
+ "managerPermissions": {
+ "message": "Managersrechten"
+ },
+ "adminPermissions": {
+ "message": "Beheerdersrechten"
+ },
"accessEventLogs": {
"message": "Eventlogs"
},
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 1b27527fc3a9..fa3ea5e5272d 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index fc3f0ff1b838..ea9e0cba5330 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -645,7 +645,7 @@
"message": "Konto zostało utworzone! Teraz możesz się zalogować."
},
"trialAccountCreated": {
- "message": "Konto zostało pomyślnie utworzone."
+ "message": "Konto zostało utworzone."
},
"masterPassSent": {
"message": "Wysłaliśmy Tobie wiadomość e-mail z podpowiedzią do hasła głównego."
@@ -918,7 +918,7 @@
"message": "Utwórz hasło wygenerowane przez użytkownika, aby chronić eksport. Użyj tego, aby utworzyć eksport, który może być używany na innych kontach."
},
"fileTypeHeading": {
- "message": "Typ Pliku"
+ "message": "Rodzaj pliku"
},
"accountBackup": {
"message": "Kopia zapasowa konta"
@@ -1324,7 +1324,7 @@
"message": "Wyłącz"
},
"revokeAccess": {
- "message": "Odwołaj dostęp"
+ "message": "Unieważnij dostęp"
},
"twoStepLoginProviderEnabled": {
"message": "Ten dostawca logowania dwustopniowego jest już włączony na koncie."
@@ -1840,7 +1840,7 @@
"message": "rok"
},
"yr": {
- "message": "r."
+ "message": "rok"
},
"month": {
"message": "miesiąc"
@@ -2257,7 +2257,7 @@
"message": "Rocznie"
},
"annual": {
- "message": "Raz w roku"
+ "message": "Rocznie"
},
"basePrice": {
"message": "Cena netto"
@@ -2329,7 +2329,7 @@
"message": "Gdy członek zostanie usunięty, nie ma już dostępu do danych organizacji, a ta czynność jest nieodwracalna. Aby ponownie dodać członka do organizacji, należy go zaprosić i ponownie wprowadzić."
},
"revokeUserConfirmation": {
- "message": "Gdy członek zostanie odwołany, nie ma już dostępu do danych organizacji. Aby szybko przywrócić dostęp członków, przejdź do karty Odwołani."
+ "message": "Jeśli użytkownik zostanie unieważniony, nie będzie miał dostępu do danych organizacji. Aby przywrócić dostęp użytkownika, przejdź do karty Unieważnieni."
},
"removeUserConfirmationKeyConnector": {
"message": "Ostrzeżenie! Ten użytkownik wymaga serwera Key Connector do zarządzania szyfrowaniem. Usunięcie tego użytkownika z organizacji spowoduje trwałe wyłączenie jego konta. Nie możesz cofnąć tej akcji. Czy chcesz kontynuować?"
@@ -2686,7 +2686,7 @@
}
},
"revokedUserId": {
- "message": "Odwołano dostęp organizacji dla $ID$.",
+ "message": "Dostęp do organizacji dla użytkownika $ID$ został unieważniony.",
"placeholders": {
"id": {
"content": "$1",
@@ -2704,7 +2704,7 @@
}
},
"revokeUserId": {
- "message": "Odwołano dostęp $ID$",
+ "message": "Unieważnij dostęp dla użytkownika $ID$",
"placeholders": {
"id": {
"content": "$1",
@@ -3769,7 +3769,7 @@
"message": "Wyłączone"
},
"revoked": {
- "message": "Odwołani"
+ "message": "Unieważnieni"
},
"sendLink": {
"message": "Link wysyłki",
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Uprawnienia"
},
+ "managerPermissions": {
+ "message": "Menedżer uprawnień"
+ },
+ "adminPermissions": {
+ "message": "Administrator uprawnień"
+ },
"accessEventLogs": {
"message": "Dostęp do dziennika zdarzeń"
},
@@ -4376,7 +4382,7 @@
"message": "Kiedy członek (członkowie) zostaje usunięty, nie ma już dostępu do danych organizacji i działanie to jest nieodwracalne. Aby dodać członka z powrotem do organizacji, musi on zostać ponownie zaproszony i włączony do organizacji. Proces ten może trwać kilka sekund i nie może być przerwany ani anulowany."
},
"revokeUsersWarning": {
- "message": "Gdy członek (członkowie) zostanie odwołany, nie ma już dostępu do danych organizacji. Aby szybko przywrócić dostęp do danych członka, przejdź do zakładki Odwołano. Proces ten może potrwać kilka sekund i nie można go przerwać ani anulować."
+ "message": "Jeśli użytkownicy zostaną unieważnieni, nie będą mieli dostępu do danych organizacji. Aby przywrócić dostęp użytkownika, przejdź do karty Unieważnieni. Proces może potrwać kilka sekund i nie można go przerwać lub anulować."
},
"theme": {
"message": "Motyw"
@@ -4409,7 +4415,7 @@
"message": "Usunięto"
},
"bulkRevokedMessage": {
- "message": "Odwołano dostęp do organizacji"
+ "message": "Dostęp do organizacji został unieważniony"
},
"bulkRestoredMessage": {
"message": "Przywrócono dostęp do organizacji"
@@ -4424,7 +4430,7 @@
"message": "Usuń użytkowników"
},
"revokeUsers": {
- "message": "Odwołaj użytkowników"
+ "message": "Unieważnij użytkowników"
},
"restoreUsers": {
"message": "Przywróć użytkowników"
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index 6944ffec979f..fcb778e6d9b9 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissões"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Acessar Registro de Eventos"
},
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index bdf34e78aecf..38025cfcab36 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissões"
},
+ "managerPermissions": {
+ "message": "Gestão de permissões"
+ },
+ "adminPermissions": {
+ "message": "Permissões de Administrador"
+ },
"accessEventLogs": {
"message": "Aceder ao Registro de Eventos"
},
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index ac5b652a525a..79ec219b22e3 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permisiuni"
},
+ "managerPermissions": {
+ "message": "Permisiuni manager"
+ },
+ "adminPermissions": {
+ "message": "Permisiuni Admin"
+ },
"accessEventLogs": {
"message": "Acces la jurnalele de evenimente"
},
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 9039b0e70c84..e6a40602e3b3 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Разрешения"
},
+ "managerPermissions": {
+ "message": "Права менеджера"
+ },
+ "adminPermissions": {
+ "message": "Права администратора"
+ },
"accessEventLogs": {
"message": "Доступ к журналам событий"
},
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index ae91788759df..26e5893ffcef 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index a90a35f09739..0a76deafa2c5 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -1523,14 +1523,14 @@
"message": "Reporty"
},
"reportsDesc": {
- "message": "Identify and close security gaps in your online accounts by clicking the reports below.",
+ "message": "Identifikujte a opravte bezpečnostné nedostatky kliknutím na reporty nižšie.",
"description": "Vault Health Reports can be used to evaluate the security of your Bitwarden Personal or Organization Vault."
},
"unsecuredWebsitesReport": {
"message": "Nezabezpečené stránky"
},
"unsecuredWebsitesReportDesc": {
- "message": "URLs that start with http:// don’t use the best available encryption. Change the Login URIs for these accounts to https:// for safer browsing."
+ "message": "URL, ktoré začínajú s http:// nepoužívajú najlepšie dostupné šifrovanie. Upravte URL prihlásenia pre tieto kontá na https:// pre bezpečnejšie surfovanie na internete."
},
"unsecuredWebsitesFound": {
"message": "Našli sa nezabezpečené stránky"
@@ -1575,7 +1575,7 @@
"message": "Uniknuté heslá"
},
"exposedPasswordsReportDesc": {
- "message": "Passwords exposed in a data breach are easy targets for attackers. Change these passwords to prevent potential break-ins."
+ "message": "Heslá odhalené pri úniku dát sú pre útočníkov jednoduchým cieľom. Zmeňte tieto heslá aby ste sa vyhli možnému vlámaniu."
},
"exposedPasswordsFound": {
"message": "Našli sme uniknuté heslá"
@@ -1608,7 +1608,7 @@
"message": "Slabé heslá"
},
"weakPasswordsReportDesc": {
- "message": "Weak passwords can be easily guessed by attackers. Change these passwords to strong ones using the Password Generator."
+ "message": "Jednoduché heslá môže útočník ľahko uhádnuť. Vymeňte tieto heslá za silné s použitím Generátora Hesiel."
},
"weakPasswordsFound": {
"message": "Našli sa slabé heslá"
@@ -1629,7 +1629,7 @@
"message": "Viacnásobne použité heslá"
},
"reusedPasswordsReportDesc": {
- "message": "Reusing passwords makes it easier for attackers to break into multiple accounts. Change these passwords so that each is unique."
+ "message": "Opakované používanie hesiel uľahčuje útočníkom vlámať sa do viacerých účtov. Zmeňte si tieto heslá tak aby bolo každé unikátne."
},
"reusedPasswordsFound": {
"message": "Našli sa viacnásobne použité heslá"
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Povolenia"
},
+ "managerPermissions": {
+ "message": "Oprávnenia manažéra"
+ },
+ "adminPermissions": {
+ "message": "Oprávnenia správcu"
+ },
"accessEventLogs": {
"message": "Prístup k protokolom udalostí"
},
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index b98db470a0cc..2290771cdf47 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index 53726c7c596f..77530eb13401 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Дозволе"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Приступе извештаја догађаја"
},
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index ad332f42106c..73b53363e46e 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 9b9f40897cc4..2812a6047f9d 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Behörigheter"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Åtkomst till händelseloggar"
},
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index e186527ed53c..e40011655b05 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -2428,7 +2428,7 @@
"message": "Kuruluşunuzda atanmış koleksiyonlara erişimi olan normal bir kullanıcı."
},
"manager": {
- "message": "Yönetici"
+ "message": "Yetkili"
},
"managerDesc": {
"message": "Yetkililer kuruluşunuzdaki kendilerine atanmış koleksiyonlara erişebilir ve onları yönetebilir."
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "İzinler"
},
+ "managerPermissions": {
+ "message": "Yetkili İzinleri"
+ },
+ "adminPermissions": {
+ "message": "Yönetici İzinleri"
+ },
"accessEventLogs": {
"message": "Olay günlüklerine erişme"
},
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index d866fc6512ba..b774c28e2987 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Дозволи"
},
+ "managerPermissions": {
+ "message": "Дозволи менеджера"
+ },
+ "adminPermissions": {
+ "message": "Дозволи адміністратора"
+ },
"accessEventLogs": {
"message": "Доступ до журналів подій"
},
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 7842e65b5fe2..dfad84612e82 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "Permissions"
},
+ "managerPermissions": {
+ "message": "Manager Permissions"
+ },
+ "adminPermissions": {
+ "message": "Admin Permissions"
+ },
"accessEventLogs": {
"message": "Access Event Logs"
},
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index 2fec98de3fb0..3e7d64fa465d 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "权限"
},
+ "managerPermissions": {
+ "message": "经理权限"
+ },
+ "adminPermissions": {
+ "message": "管理员权限"
+ },
"accessEventLogs": {
"message": "访问事件日志"
},
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index b9ba520df1ed..a125fe17477a 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -4057,6 +4057,12 @@
"permissions": {
"message": "權限"
},
+ "managerPermissions": {
+ "message": "權限管理"
+ },
+ "adminPermissions": {
+ "message": "管理員權限"
+ },
"accessEventLogs": {
"message": "存取事件紀錄"
},
diff --git a/apps/web/src/utils/flags.ts b/apps/web/src/utils/flags.ts
index 5cc3b930bb43..195bc8e5f540 100644
--- a/apps/web/src/utils/flags.ts
+++ b/apps/web/src/utils/flags.ts
@@ -10,6 +10,7 @@ import {
/* eslint-disable-next-line @typescript-eslint/ban-types */
export type Flags = {
showTrial?: boolean;
+ showPasswordless?: boolean;
} & SharedFlags;
// required to avoid linting errors when there are no flags
diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts
index 1c7a8c2332d0..1bc2e8ed8715 100644
--- a/libs/angular/src/components/login.component.ts
+++ b/libs/angular/src/components/login.component.ts
@@ -1,10 +1,15 @@
-import { Directive, Input, NgZone, OnInit } from "@angular/core";
+import { Directive, NgZone, OnInit } from "@angular/core";
+import { FormBuilder, Validators } from "@angular/forms";
import { Router } from "@angular/router";
import { take } from "rxjs/operators";
import { AuthService } from "@bitwarden/common/abstractions/auth.service";
import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
+import {
+ AllValidationErrors,
+ FormValidationErrorsService,
+} from "@bitwarden/common/abstractions/formValidationErrors.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/abstractions/log.service";
import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
@@ -18,16 +23,19 @@ import { CaptchaProtectedComponent } from "./captchaProtected.component";
@Directive()
export class LoginComponent extends CaptchaProtectedComponent implements OnInit {
- @Input() email = "";
- @Input() rememberEmail = true;
-
- masterPassword = "";
showPassword = false;
formPromise: Promise
;
onSuccessfulLogin: () => Promise;
onSuccessfulLoginNavigate: () => Promise;
onSuccessfulLoginTwoFactorNavigate: () => Promise;
onSuccessfulLoginForceResetNavigate: () => Promise;
+ selfHosted = false;
+
+ formGroup = this.formBuilder.group({
+ email: ["", [Validators.required, Validators.email]],
+ masterPassword: ["", [Validators.required, Validators.minLength(8)]],
+ rememberEmail: [true],
+ });
protected twoFactorRoute = "2fa";
protected successRoute = "vault";
@@ -44,9 +52,12 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
protected passwordGenerationService: PasswordGenerationService,
protected cryptoFunctionService: CryptoFunctionService,
protected logService: LogService,
- protected ngZone: NgZone
+ protected ngZone: NgZone,
+ protected formBuilder: FormBuilder,
+ protected formValidationErrorService: FormValidationErrorsService
) {
super(environmentService, i18nService, platformUtilsService);
+ this.selfHosted = platformUtilsService.isSelfHost();
}
get selfHostedDomain() {
@@ -54,59 +65,53 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
}
async ngOnInit() {
- if (this.email == null || this.email === "") {
- this.email = await this.stateService.getRememberedEmail();
- if (this.email == null) {
- this.email = "";
+ let email = this.formGroup.get("email")?.value;
+ if (email == null || email === "") {
+ email = await this.stateService.getRememberedEmail();
+ this.formGroup.get("email")?.setValue(email);
+
+ if (email == null) {
+ this.formGroup.get("email")?.setValue("");
}
}
if (!this.alwaysRememberEmail) {
- this.rememberEmail = (await this.stateService.getRememberedEmail()) != null;
- }
- if (Utils.isBrowser && !Utils.isNode) {
- this.focusInput();
+ const rememberEmail = (await this.stateService.getRememberedEmail()) != null;
+ this.formGroup.get("rememberEmail")?.setValue(rememberEmail);
}
}
- async submit() {
+ async submit(showToast = true) {
+ const email = this.formGroup.get("email")?.value;
+ const masterPassword = this.formGroup.get("masterPassword")?.value;
+ const rememberEmail = this.formGroup.get("rememberEmail")?.value;
+
await this.setupCaptcha();
- if (this.email == null || this.email === "") {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("emailRequired")
- );
- return;
- }
- if (this.email.indexOf("@") === -1) {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("invalidEmail")
- );
+ this.formGroup.markAllAsTouched();
+
+ //web
+ if (this.formGroup.invalid && !showToast) {
return;
}
- if (this.masterPassword == null || this.masterPassword === "") {
- this.platformUtilsService.showToast(
- "error",
- this.i18nService.t("errorOccurred"),
- this.i18nService.t("masterPasswordRequired")
- );
+
+ //desktop, browser; This should be removed once all clients use reactive forms
+ if (this.formGroup.invalid && showToast) {
+ const errorText = this.getErrorToastMessage();
+ this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), errorText);
return;
}
try {
const credentials = new PasswordLogInCredentials(
- this.email,
- this.masterPassword,
+ email,
+ masterPassword,
this.captchaToken,
null
);
this.formPromise = this.authService.logIn(credentials);
const response = await this.formPromise;
- if (this.rememberEmail || this.alwaysRememberEmail) {
- await this.stateService.setRememberedEmail(this.email);
+ if (rememberEmail || this.alwaysRememberEmail) {
+ await this.stateService.setRememberedEmail(email);
} else {
await this.stateService.setRememberedEmail(null);
}
@@ -188,9 +193,30 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
);
}
+ private getErrorToastMessage() {
+ const error: AllValidationErrors = this.formValidationErrorService
+ .getFormValidationErrors(this.formGroup.controls)
+ .shift();
+
+ if (error) {
+ switch (error.errorName) {
+ case "email":
+ return this.i18nService.t("invalidEmail");
+ default:
+ return this.i18nService.t(this.errorTag(error));
+ }
+ }
+
+ return;
+ }
+
+ private errorTag(error: AllValidationErrors): string {
+ const name = error.errorName.charAt(0).toUpperCase() + error.errorName.slice(1);
+ return `${error.controlName}${name}`;
+ }
+
protected focusInput() {
- document
- .getElementById(this.email == null || this.email === "" ? "email" : "masterPassword")
- .focus();
+ const email = this.formGroup.get("email")?.value;
+ document.getElementById(email == null || email === "" ? "email" : "masterPassword").focus();
}
}
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index b76ad9a5903b..b53aac0866a8 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -5,6 +5,7 @@ import { AbstractThemingService } from "@bitwarden/angular/services/theming/them
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/abstractions/account/account-api.service.abstraction";
import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/abstractions/account/account.service.abstraction";
+import { AnonymousHubService as AnonymousHubServiceAbstraction } from "@bitwarden/common/abstractions/anonymousHub.service";
import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service";
import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
@@ -62,6 +63,7 @@ import { Account } from "@bitwarden/common/models/domain/account";
import { GlobalState } from "@bitwarden/common/models/domain/globalState";
import { AccountApiService } from "@bitwarden/common/services/account/account-api.service";
import { AccountService } from "@bitwarden/common/services/account/account.service";
+import { AnonymousHubService } from "@bitwarden/common/services/anonymousHub.service";
import { ApiService } from "@bitwarden/common/services/api.service";
import { AppIdService } from "@bitwarden/common/services/appId.service";
import { AuditService } from "@bitwarden/common/services/audit.service";
@@ -544,6 +546,11 @@ import { ValidationService } from "./validation.service";
useClass: ConfigApiService,
deps: [ApiServiceAbstraction],
},
+ {
+ provide: AnonymousHubServiceAbstraction,
+ useClass: AnonymousHubService,
+ deps: [EnvironmentServiceAbstraction, AuthServiceAbstraction, LogService],
+ },
],
})
export class JslibServicesModule {}
diff --git a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts
index 820f8db38cc8..67e03d030c55 100644
--- a/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts
+++ b/libs/common/spec/importers/bitwardenPasswordProtectedImporter.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute";
+import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
diff --git a/libs/common/spec/misc/utils.spec.ts b/libs/common/spec/misc/utils.spec.ts
index d4dbac958a86..3978f9cfed8f 100644
--- a/libs/common/spec/misc/utils.spec.ts
+++ b/libs/common/spec/misc/utils.spec.ts
@@ -70,4 +70,10 @@ describe("Utils Service", () => {
expect(Utils.newGuid()).toMatch(validGuid);
});
});
+
+ describe("fromByteStringToArray", () => {
+ it("should handle null", () => {
+ expect(Utils.fromByteStringToArray(null)).toEqual(null);
+ });
+ });
});
diff --git a/libs/common/spec/models/domain/cipher.spec.ts b/libs/common/spec/models/domain/cipher.spec.ts
index c7c0d36714fd..0158945d8ce8 100644
--- a/libs/common/spec/models/domain/cipher.spec.ts
+++ b/libs/common/spec/models/domain/cipher.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg } from "@fluffy-spoon/substitute";
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType";
import { CipherType } from "@bitwarden/common/enums/cipherType";
diff --git a/libs/common/spec/models/domain/encString.spec.ts b/libs/common/spec/models/domain/encString.spec.ts
index adcfaf0706e9..413d091d68bc 100644
--- a/libs/common/spec/models/domain/encString.spec.ts
+++ b/libs/common/spec/models/domain/encString.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg } from "@fluffy-spoon/substitute";
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { mock, MockProxy } from "jest-mock-extended";
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
diff --git a/libs/common/spec/models/domain/login.spec.ts b/libs/common/spec/models/domain/login.spec.ts
index 6021a4b2908d..b2235e758313 100644
--- a/libs/common/spec/models/domain/login.spec.ts
+++ b/libs/common/spec/models/domain/login.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg } from "@fluffy-spoon/substitute";
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
import { LoginData } from "@bitwarden/common/models/data/loginData";
diff --git a/libs/common/spec/models/domain/send.spec.ts b/libs/common/spec/models/domain/send.spec.ts
index 575821abc961..903043f86c83 100644
--- a/libs/common/spec/models/domain/send.spec.ts
+++ b/libs/common/spec/models/domain/send.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg, SubstituteOf } from "@fluffy-spoon/substitute";
+import { Substitute, Arg, SubstituteOf } from "@fluffy-spoon/substitute";
import { AbstractEncryptService } from "@bitwarden/common/abstractions/abstractEncrypt.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
diff --git a/libs/common/spec/models/domain/sendAccess.spec.ts b/libs/common/spec/models/domain/sendAccess.spec.ts
index 7772fe428ac8..32b01d13fd40 100644
--- a/libs/common/spec/models/domain/sendAccess.spec.ts
+++ b/libs/common/spec/models/domain/sendAccess.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg } from "@fluffy-spoon/substitute";
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { SendType } from "@bitwarden/common/enums/sendType";
import { SendAccess } from "@bitwarden/common/models/domain/sendAccess";
diff --git a/libs/common/spec/services/import.service.spec.ts b/libs/common/spec/services/import.service.spec.ts
index 654c1b6124fd..2b47518bc5dc 100644
--- a/libs/common/spec/services/import.service.spec.ts
+++ b/libs/common/spec/services/import.service.spec.ts
@@ -1,4 +1,4 @@
-import Substitute, { SubstituteOf } from "@fluffy-spoon/substitute";
+import { Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
diff --git a/libs/common/spec/services/state.service.spec.ts b/libs/common/spec/services/state.service.spec.ts
deleted file mode 100644
index a6f76ab4fc07..000000000000
--- a/libs/common/spec/services/state.service.spec.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
-
-import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { Account } from "@bitwarden/common/models/domain/account";
-import { GlobalState } from "@bitwarden/common/models/domain/globalState";
-import { State } from "@bitwarden/common/models/domain/state";
-import { StorageOptions } from "@bitwarden/common/models/domain/storageOptions";
-import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
-import { StateService } from "@bitwarden/common/services/state.service";
-import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
-
-describe("Browser State Service backed by chrome.storage api", () => {
- let secureStorageService: SubstituteOf;
- let diskStorageService: SubstituteOf;
- let memoryStorageService: SubstituteOf;
- let logService: SubstituteOf;
- let stateMigrationService: SubstituteOf;
- let stateFactory: SubstituteOf>;
- let useAccountCache: boolean;
-
- let state: State;
- const userId = "userId";
-
- let sut: StateService;
-
- beforeEach(() => {
- secureStorageService = Substitute.for();
- diskStorageService = Substitute.for();
- memoryStorageService = Substitute.for();
- logService = Substitute.for();
- stateMigrationService = Substitute.for();
- stateFactory = Substitute.for();
- useAccountCache = true;
-
- state = new State(new GlobalState());
- const stateGetter = (key: string) => Promise.resolve(JSON.parse(JSON.stringify(state)));
- memoryStorageService.get("state").mimicks(stateGetter);
- memoryStorageService
- .save("state", Arg.any(), Arg.any())
- .mimicks((key: string, obj: any, options: StorageOptions) => {
- return new Promise(() => {
- state = obj;
- });
- });
-
- sut = new StateService(
- diskStorageService,
- secureStorageService,
- memoryStorageService,
- logService,
- stateMigrationService,
- stateFactory,
- useAccountCache
- );
- });
-
- describe("account state getters", () => {
- beforeEach(() => {
- state.accounts[userId] = createAccount(userId);
- state.activeUserId = userId;
- });
-
- describe("getCryptoMasterKey", () => {
- it("should return the stored SymmetricCryptoKey", async () => {
- const key = new SymmetricCryptoKey(new Uint8Array(32).buffer);
- state.accounts[userId].keys.cryptoMasterKey = key;
-
- const actual = await sut.getCryptoMasterKey();
- expect(actual).toBeInstanceOf(SymmetricCryptoKey);
- expect(actual).toMatchObject(key);
- });
- });
- });
-
- function createAccount(userId: string): Account {
- return new Account({
- profile: { userId: userId },
- });
- }
-});
diff --git a/libs/common/spec/services/stateMigration.service.spec.ts b/libs/common/spec/services/stateMigration.service.spec.ts
index e306e64e29b2..b0188abacce9 100644
--- a/libs/common/spec/services/stateMigration.service.spec.ts
+++ b/libs/common/spec/services/stateMigration.service.spec.ts
@@ -116,8 +116,8 @@ describe("State Migration Service", () => {
key: "orgThreeEncKey",
},
},
- },
- },
+ } as any,
+ } as any,
});
const migratedAccount = await (stateMigrationService as any).migrateAccountFrom4To5(
diff --git a/libs/common/spec/utils.ts b/libs/common/spec/utils.ts
index 0ea16b4d725d..4f9dc4076f19 100644
--- a/libs/common/spec/utils.ts
+++ b/libs/common/spec/utils.ts
@@ -1,4 +1,4 @@
-import Substitute, { Arg } from "@fluffy-spoon/substitute";
+import { Substitute, Arg } from "@fluffy-spoon/substitute";
import { EncString } from "@bitwarden/common/models/domain/encString";
diff --git a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts
index 964364a1fafe..ce131472d4ba 100644
--- a/libs/common/spec/web/services/webCryptoFunction.service.spec.ts
+++ b/libs/common/spec/web/services/webCryptoFunction.service.spec.ts
@@ -1,4 +1,4 @@
-import Substitute from "@fluffy-spoon/substitute";
+import { Substitute } from "@fluffy-spoon/substitute";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { Utils } from "@bitwarden/common/misc/utils";
diff --git a/libs/common/src/abstractions/anonymousHub.service.ts b/libs/common/src/abstractions/anonymousHub.service.ts
new file mode 100644
index 000000000000..43bdabd512c9
--- /dev/null
+++ b/libs/common/src/abstractions/anonymousHub.service.ts
@@ -0,0 +1,4 @@
+export abstract class AnonymousHubService {
+ createHubConnection: (token: string) => void;
+ stopHubConnection: () => void;
+}
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index f08e5c34af82..06d3f5b4eba5 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -46,6 +46,7 @@ import { OrganizationUserUpdateGroupsRequest } from "../models/request/organizat
import { OrganizationUserUpdateRequest } from "../models/request/organizationUserUpdateRequest";
import { PasswordHintRequest } from "../models/request/passwordHintRequest";
import { PasswordRequest } from "../models/request/passwordRequest";
+import { PasswordlessCreateAuthRequest } from "../models/request/passwordlessCreateAuthRequest";
import { PaymentRequest } from "../models/request/paymentRequest";
import { PreloginRequest } from "../models/request/preloginRequest";
import { ProviderAddOrganizationRequest } from "../models/request/provider/providerAddOrganizationRequest";
@@ -84,6 +85,7 @@ import { VerifyEmailRequest } from "../models/request/verifyEmailRequest";
import { ApiKeyResponse } from "../models/response/apiKeyResponse";
import { AttachmentResponse } from "../models/response/attachmentResponse";
import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse";
+import { AuthRequestResponse } from "../models/response/authRequestResponse";
import { RegisterResponse } from "../models/response/authentication/registerResponse";
import { BillingHistoryResponse } from "../models/response/billingHistoryResponse";
import { BillingPaymentResponse } from "../models/response/billingPaymentResponse";
@@ -210,6 +212,9 @@ export abstract class ApiService {
postUserRotateApiKey: (id: string, request: SecretVerificationRequest) => Promise;
putUpdateTempPassword: (request: UpdateTempPasswordRequest) => Promise;
postConvertToKeyConnector: () => Promise;
+ //passwordless
+ postAuthRequest: (request: PasswordlessCreateAuthRequest) => Promise;
+ getAuthResponse: (id: string, accessCode: string) => Promise;
getUserBillingHistory: () => Promise;
getUserBillingPayment: () => Promise;
diff --git a/libs/common/src/abstractions/auth.service.ts b/libs/common/src/abstractions/auth.service.ts
index 4947f21708bc..bbe1c01bf29d 100644
--- a/libs/common/src/abstractions/auth.service.ts
+++ b/libs/common/src/abstractions/auth.service.ts
@@ -1,18 +1,26 @@
+import { Observable } from "rxjs";
+
import { AuthenticationStatus } from "../enums/authenticationStatus";
import { AuthResult } from "../models/domain/authResult";
import {
ApiLogInCredentials,
PasswordLogInCredentials,
SsoLogInCredentials,
+ PasswordlessLogInCredentials,
} from "../models/domain/logInCredentials";
import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor";
+import { AuthRequestPushNotification } from "../models/response/notificationResponse";
export abstract class AuthService {
masterPasswordHash: string;
email: string;
logIn: (
- credentials: ApiLogInCredentials | PasswordLogInCredentials | SsoLogInCredentials
+ credentials:
+ | ApiLogInCredentials
+ | PasswordLogInCredentials
+ | SsoLogInCredentials
+ | PasswordlessLogInCredentials
) => Promise;
logInTwoFactor: (
twoFactor: TokenRequestTwoFactor,
@@ -24,4 +32,7 @@ export abstract class AuthService {
authingWithSso: () => boolean;
authingWithPassword: () => boolean;
getAuthStatus: (userId?: string) => Promise;
+ authResponsePushNotifiction: (notification: AuthRequestPushNotification) => Promise;
+
+ getPushNotifcationObs$: () => Observable;
}
diff --git a/libs/common/src/abstractions/state.service.ts b/libs/common/src/abstractions/state.service.ts
index b7e5aa7c2454..58e342238d19 100644
--- a/libs/common/src/abstractions/state.service.ts
+++ b/libs/common/src/abstractions/state.service.ts
@@ -78,8 +78,6 @@ export abstract class StateService {
getCryptoMasterKeyBiometric: (options?: StorageOptions) => Promise;
hasCryptoMasterKeyBiometric: (options?: StorageOptions) => Promise;
setCryptoMasterKeyBiometric: (value: string, options?: StorageOptions) => Promise;
- getDecodedToken: (options?: StorageOptions) => Promise;
- setDecodedToken: (value: any, options?: StorageOptions) => Promise;
getDecryptedCiphers: (options?: StorageOptions) => Promise;
setDecryptedCiphers: (value: CipherView[], options?: StorageOptions) => Promise;
getDecryptedCollections: (options?: StorageOptions) => Promise;
@@ -147,6 +145,8 @@ export abstract class StateService {
setDontShowCardsCurrentTab: (value: boolean, options?: StorageOptions) => Promise;
getDontShowIdentitiesCurrentTab: (options?: StorageOptions) => Promise;
setDontShowIdentitiesCurrentTab: (value: boolean, options?: StorageOptions) => Promise;
+ getDuckDuckGoSharedKey: (options?: StorageOptions) => Promise;
+ setDuckDuckGoSharedKey: (value: string, options?: StorageOptions) => Promise;
getEmail: (options?: StorageOptions) => Promise;
setEmail: (value: string, options?: StorageOptions) => Promise;
getEmailVerified: (options?: StorageOptions) => Promise;
@@ -166,6 +166,11 @@ export abstract class StateService {
) => Promise;
getEnableCloseToTray: (options?: StorageOptions) => Promise;
setEnableCloseToTray: (value: boolean, options?: StorageOptions) => Promise;
+ getEnableDuckDuckGoBrowserIntegration: (options?: StorageOptions) => Promise;
+ setEnableDuckDuckGoBrowserIntegration: (
+ value: boolean,
+ options?: StorageOptions
+ ) => Promise;
getEnableFullWidth: (options?: StorageOptions) => Promise;
setEnableFullWidth: (value: boolean, options?: StorageOptions) => Promise;
getEnableGravitars: (options?: StorageOptions) => Promise;
diff --git a/libs/common/src/abstractions/storage.service.ts b/libs/common/src/abstractions/storage.service.ts
index 5cff9fdac60b..31506f4302bd 100644
--- a/libs/common/src/abstractions/storage.service.ts
+++ b/libs/common/src/abstractions/storage.service.ts
@@ -1,4 +1,4 @@
-import { StorageOptions } from "../models/domain/storageOptions";
+import { MemoryStorageOptions, StorageOptions } from "../models/domain/storageOptions";
export abstract class AbstractStorageService {
abstract get(key: string, options?: StorageOptions): Promise;
@@ -8,5 +8,9 @@ export abstract class AbstractStorageService {
}
export abstract class AbstractCachedStorageService extends AbstractStorageService {
- abstract getBypassCache(key: string, options?: StorageOptions): Promise;
+ abstract getBypassCache(key: string, options?: MemoryStorageOptions): Promise;
+}
+
+export interface MemoryStorageServiceInterface {
+ get(key: string, options?: MemoryStorageOptions): Promise;
}
diff --git a/libs/common/src/enums/authRequestType.ts b/libs/common/src/enums/authRequestType.ts
new file mode 100644
index 000000000000..4edfa5b8889e
--- /dev/null
+++ b/libs/common/src/enums/authRequestType.ts
@@ -0,0 +1,4 @@
+export enum AuthRequestType {
+ AuthenticateAndUnlock = 0,
+ Unlock = 1,
+}
diff --git a/libs/common/src/enums/authenticationType.ts b/libs/common/src/enums/authenticationType.ts
index ed7375c8085f..5133c4f648ea 100644
--- a/libs/common/src/enums/authenticationType.ts
+++ b/libs/common/src/enums/authenticationType.ts
@@ -2,4 +2,5 @@ export enum AuthenticationType {
Password = 0,
Sso = 1,
Api = 2,
+ Passwordless = 3,
}
diff --git a/libs/common/src/enums/nativeMessagingVersion.ts b/libs/common/src/enums/nativeMessagingVersion.ts
new file mode 100644
index 000000000000..f7cf411a40a8
--- /dev/null
+++ b/libs/common/src/enums/nativeMessagingVersion.ts
@@ -0,0 +1,4 @@
+export enum NativeMessagingVersion {
+ One = 1, // Original implementation
+ Latest = One,
+}
diff --git a/libs/common/src/enums/notificationType.ts b/libs/common/src/enums/notificationType.ts
index 77ebde01fc57..457ad174cad7 100644
--- a/libs/common/src/enums/notificationType.ts
+++ b/libs/common/src/enums/notificationType.ts
@@ -17,4 +17,7 @@ export enum NotificationType {
SyncSendCreate = 12,
SyncSendUpdate = 13,
SyncSendDelete = 14,
+
+ AuthRequest = 15,
+ AuthRequestResponse = 16,
}
diff --git a/libs/common/src/misc/logInStrategies/logIn.strategy.ts b/libs/common/src/misc/logInStrategies/logIn.strategy.ts
index 8615700681b8..577130156f7a 100644
--- a/libs/common/src/misc/logInStrategies/logIn.strategy.ts
+++ b/libs/common/src/misc/logInStrategies/logIn.strategy.ts
@@ -14,6 +14,7 @@ import {
ApiLogInCredentials,
PasswordLogInCredentials,
SsoLogInCredentials,
+ PasswordlessLogInCredentials,
} from "../../models/domain/logInCredentials";
import { DeviceRequest } from "../../models/request/deviceRequest";
import { ApiTokenRequest } from "../../models/request/identityToken/apiTokenRequest";
@@ -42,7 +43,11 @@ export abstract class LogInStrategy {
) {}
abstract logIn(
- credentials: ApiLogInCredentials | PasswordLogInCredentials | SsoLogInCredentials
+ credentials:
+ | ApiLogInCredentials
+ | PasswordLogInCredentials
+ | SsoLogInCredentials
+ | PasswordlessLogInCredentials
): Promise;
async logInTwoFactor(
diff --git a/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts
new file mode 100644
index 000000000000..0acc4a49f00c
--- /dev/null
+++ b/libs/common/src/misc/logInStrategies/passwordlessLogin.strategy.ts
@@ -0,0 +1,86 @@
+import { ApiService } from "../../abstractions/api.service";
+import { AppIdService } from "../../abstractions/appId.service";
+import { AuthService } from "../../abstractions/auth.service";
+import { CryptoService } from "../../abstractions/crypto.service";
+import { LogService } from "../../abstractions/log.service";
+import { MessagingService } from "../../abstractions/messaging.service";
+import { PlatformUtilsService } from "../../abstractions/platformUtils.service";
+import { StateService } from "../../abstractions/state.service";
+import { TokenService } from "../../abstractions/token.service";
+import { TwoFactorService } from "../../abstractions/twoFactor.service";
+import { AuthResult } from "../../models/domain/authResult";
+import { PasswordlessLogInCredentials } from "../../models/domain/logInCredentials";
+import { SymmetricCryptoKey } from "../../models/domain/symmetricCryptoKey";
+import { PasswordTokenRequest } from "../../models/request/identityToken/passwordTokenRequest";
+import { TokenRequestTwoFactor } from "../../models/request/identityToken/tokenRequestTwoFactor";
+
+import { LogInStrategy } from "./logIn.strategy";
+
+export class PasswordlessLogInStrategy extends LogInStrategy {
+ get email() {
+ return this.tokenRequest.email;
+ }
+
+ get masterPasswordHash() {
+ return this.tokenRequest.masterPasswordHash;
+ }
+
+ tokenRequest: PasswordTokenRequest;
+
+ private localHashedPassword: string;
+ private key: SymmetricCryptoKey;
+
+ constructor(
+ cryptoService: CryptoService,
+ apiService: ApiService,
+ tokenService: TokenService,
+ appIdService: AppIdService,
+ platformUtilsService: PlatformUtilsService,
+ messagingService: MessagingService,
+ logService: LogService,
+ stateService: StateService,
+ twoFactorService: TwoFactorService,
+ private authService: AuthService
+ ) {
+ super(
+ cryptoService,
+ apiService,
+ tokenService,
+ appIdService,
+ platformUtilsService,
+ messagingService,
+ logService,
+ stateService,
+ twoFactorService
+ );
+ }
+
+ async onSuccessfulLogin() {
+ await this.cryptoService.setKey(this.key);
+ await this.cryptoService.setKeyHash(this.localHashedPassword);
+ }
+
+ async logInTwoFactor(
+ twoFactor: TokenRequestTwoFactor,
+ captchaResponse: string
+ ): Promise {
+ this.tokenRequest.captchaResponse = captchaResponse ?? this.captchaBypassToken;
+ return super.logInTwoFactor(twoFactor);
+ }
+
+ async logIn(credentials: PasswordlessLogInCredentials) {
+ this.localHashedPassword = credentials.localPasswordHash;
+ this.key = credentials.decKey;
+
+ this.tokenRequest = new PasswordTokenRequest(
+ credentials.email,
+ credentials.accessCode,
+ null,
+ await this.buildTwoFactor(credentials.twoFactor),
+ await this.buildDeviceRequest()
+ );
+
+ this.tokenRequest.setPasswordlessAccessCode(credentials.authRequestId);
+ return this.startLogIn();
+ }
+}
diff --git a/libs/common/src/misc/utils.ts b/libs/common/src/misc/utils.ts
index f66124bc47e7..454def365517 100644
--- a/libs/common/src/misc/utils.ts
+++ b/libs/common/src/misc/utils.ts
@@ -99,6 +99,9 @@ export class Utils {
}
static fromByteStringToArray(str: string): Uint8Array {
+ if (str == null) {
+ return null;
+ }
const arr = new Uint8Array(str.length);
for (let i = 0; i < str.length; i++) {
arr[i] = str.charCodeAt(i);
diff --git a/libs/common/src/models/data/server-config.data.spec.ts b/libs/common/src/models/data/server-config.data.spec.ts
new file mode 100644
index 000000000000..1c4e890ab806
--- /dev/null
+++ b/libs/common/src/models/data/server-config.data.spec.ts
@@ -0,0 +1,55 @@
+import {
+ EnvironmentServerConfigData,
+ ServerConfigData,
+ ThirdPartyServerConfigData,
+} from "./server-config.data";
+
+describe("ServerConfigData", () => {
+ describe("fromJSON", () => {
+ it("should create a ServerConfigData from a JSON object", () => {
+ const serverConfigData = ServerConfigData.fromJSON({
+ version: "1.0.0",
+ gitHash: "1234567890",
+ server: {
+ name: "test",
+ url: "https://test.com",
+ },
+ environment: {
+ vault: "https://vault.com",
+ api: "https://api.com",
+ identity: "https://identity.com",
+ notifications: "https://notifications.com",
+ sso: "https://sso.com",
+ },
+ utcDate: "2020-01-01T00:00:00.000Z",
+ });
+
+ expect(serverConfigData.version).toEqual("1.0.0");
+ expect(serverConfigData.gitHash).toEqual("1234567890");
+ expect(serverConfigData.server.name).toEqual("test");
+ expect(serverConfigData.server.url).toEqual("https://test.com");
+ expect(serverConfigData.environment.vault).toEqual("https://vault.com");
+ expect(serverConfigData.environment.api).toEqual("https://api.com");
+ expect(serverConfigData.environment.identity).toEqual("https://identity.com");
+ expect(serverConfigData.environment.notifications).toEqual("https://notifications.com");
+ expect(serverConfigData.environment.sso).toEqual("https://sso.com");
+ expect(serverConfigData.utcDate).toEqual("2020-01-01T00:00:00.000Z");
+ });
+
+ it("should be an instance of ServerConfigData", () => {
+ const serverConfigData = ServerConfigData.fromJSON({} as any);
+
+ expect(serverConfigData).toBeInstanceOf(ServerConfigData);
+ });
+
+ it("should deserialize sub objects", () => {
+ const serverConfigData = ServerConfigData.fromJSON({
+ server: {},
+ environment: {},
+ } as any);
+
+ expect(serverConfigData.server).toBeInstanceOf(ThirdPartyServerConfigData);
+ expect(serverConfigData.environment).toBeInstanceOf(EnvironmentServerConfigData);
+ });
+ });
+});
diff --git a/libs/common/src/models/data/server-config.data.ts b/libs/common/src/models/data/server-config.data.ts
index 62744ecb621a..30043a0b0280 100644
--- a/libs/common/src/models/data/server-config.data.ts
+++ b/libs/common/src/models/data/server-config.data.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
import {
ServerConfigResponse,
ThirdPartyServerConfigResponse,
@@ -11,27 +13,38 @@ export class ServerConfigData {
environment?: EnvironmentServerConfigData;
utcDate: string;
- constructor(serverConfigReponse: ServerConfigResponse) {
- this.version = serverConfigReponse?.version;
- this.gitHash = serverConfigReponse?.gitHash;
- this.server = serverConfigReponse?.server
- ? new ThirdPartyServerConfigData(serverConfigReponse.server)
+ constructor(serverConfigResponse: Partial) {
+ this.version = serverConfigResponse?.version;
+ this.gitHash = serverConfigResponse?.gitHash;
+ this.server = serverConfigResponse?.server
+ ? new ThirdPartyServerConfigData(serverConfigResponse.server)
: null;
this.utcDate = new Date().toISOString();
- this.environment = serverConfigReponse?.environment
- ? new EnvironmentServerConfigData(serverConfigReponse.environment)
+ this.environment = serverConfigResponse?.environment
+ ? new EnvironmentServerConfigData(serverConfigResponse.environment)
: null;
}
+
+ static fromJSON(obj: Jsonify): ServerConfigData {
+ return Object.assign(new ServerConfigData({}), obj, {
+ server: obj?.server ? ThirdPartyServerConfigData.fromJSON(obj.server) : null,
+ environment: obj?.environment ? EnvironmentServerConfigData.fromJSON(obj.environment) : null,
+ });
+ }
}
export class ThirdPartyServerConfigData {
name: string;
url: string;
- constructor(response: ThirdPartyServerConfigResponse) {
+ constructor(response: Partial) {
this.name = response.name;
this.url = response.url;
}
+
+ static fromJSON(obj: Jsonify): ThirdPartyServerConfigData {
+ return Object.assign(new ThirdPartyServerConfigData({}), obj);
+ }
}
export class EnvironmentServerConfigData {
@@ -41,11 +54,15 @@ export class EnvironmentServerConfigData {
notifications: string;
sso: string;
- constructor(response: EnvironmentServerConfigResponse) {
+ constructor(response: Partial) {
this.vault = response.vault;
this.api = response.api;
this.identity = response.identity;
this.notifications = response.notifications;
this.sso = response.sso;
}
+
+ static fromJSON(obj: Jsonify): EnvironmentServerConfigData {
+ return Object.assign(new EnvironmentServerConfigData({}), obj);
+ }
}
diff --git a/libs/common/src/models/domain/account-keys.spec.ts b/libs/common/src/models/domain/account-keys.spec.ts
new file mode 100644
index 000000000000..bf8348e15a27
--- /dev/null
+++ b/libs/common/src/models/domain/account-keys.spec.ts
@@ -0,0 +1,62 @@
+import { Utils } from "@bitwarden/common/misc/utils";
+
+import { makeStaticByteArray } from "../../../spec/utils";
+
+import { AccountKeys, EncryptionPair } from "./account";
+import { SymmetricCryptoKey } from "./symmetricCryptoKey";
+
+describe("AccountKeys", () => {
+ describe("toJSON", () => {
+ it("should serialize itself", () => {
+ const keys = new AccountKeys();
+ const buffer = makeStaticByteArray(64).buffer;
+ keys.publicKey = buffer;
+
+ const bufferSpy = jest.spyOn(Utils, "fromBufferToByteString");
+ keys.toJSON();
+ expect(bufferSpy).toHaveBeenCalledWith(buffer);
+ });
+
+ it("should serialize public key as a string", () => {
+ const keys = new AccountKeys();
+ keys.publicKey = Utils.fromByteStringToArray("hello").buffer;
+ const json = JSON.stringify(keys);
+ expect(json).toContain('"publicKey":"hello"');
+ });
+ });
+
+ describe("fromJSON", () => {
+ it("should deserialize public key to a buffer", () => {
+ const keys = AccountKeys.fromJSON({
+ publicKey: "hello",
+ });
+ expect(keys.publicKey).toEqual(Utils.fromByteStringToArray("hello").buffer);
+ });
+
+ it("should deserialize cryptoMasterKey", () => {
+ const spy = jest.spyOn(SymmetricCryptoKey, "fromJSON");
+ AccountKeys.fromJSON({} as any);
+ expect(spy).toHaveBeenCalled();
+ });
+
+ it("should deserialize organizationKeys", () => {
+ const spy = jest.spyOn(SymmetricCryptoKey, "fromJSON");
+ AccountKeys.fromJSON({ organizationKeys: [{ orgId: "keyJSON" }] } as any);
+ expect(spy).toHaveBeenCalled();
+ });
+
+ it("should deserialize providerKeys", () => {
+ const spy = jest.spyOn(SymmetricCryptoKey, "fromJSON");
+ AccountKeys.fromJSON({ providerKeys: [{ providerId: "keyJSON" }] } as any);
+ expect(spy).toHaveBeenCalled();
+ });
+
+ it("should deserialize privateKey", () => {
+ const spy = jest.spyOn(EncryptionPair, "fromJSON");
+ AccountKeys.fromJSON({
+ privateKey: { encrypted: "encrypted", decrypted: "decrypted" },
+ } as any);
+ expect(spy).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/account-profile.spec.ts b/libs/common/src/models/domain/account-profile.spec.ts
new file mode 100644
index 000000000000..7c6deda34eb2
--- /dev/null
+++ b/libs/common/src/models/domain/account-profile.spec.ts
@@ -0,0 +1,9 @@
+import { AccountProfile } from "./account";
+
+describe("AccountProfile", () => {
+ describe("fromJSON", () => {
+ it("should deserialize to an instance of itself", () => {
+ expect(AccountProfile.fromJSON({})).toBeInstanceOf(AccountProfile);
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/account-settings.spec.ts b/libs/common/src/models/domain/account-settings.spec.ts
new file mode 100644
index 000000000000..544d591b3236
--- /dev/null
+++ b/libs/common/src/models/domain/account-settings.spec.ts
@@ -0,0 +1,24 @@
+import { AccountSettings, EncryptionPair } from "./account";
+import { EncString } from "./encString";
+
+describe("AccountSettings", () => {
+ describe("fromJSON", () => {
+ it("should deserialize to an instance of itself", () => {
+ expect(AccountSettings.fromJSON(JSON.parse("{}"))).toBeInstanceOf(AccountSettings);
+ });
+
+ it("should deserialize pinProtected", () => {
+ const accountSettings = new AccountSettings();
+ accountSettings.pinProtected = EncryptionPair.fromJSON({
+ encrypted: "encrypted",
+ decrypted: "3.data",
+ });
+ const jsonObj = JSON.parse(JSON.stringify(accountSettings));
+ const actual = AccountSettings.fromJSON(jsonObj);
+
+ expect(actual.pinProtected).toBeInstanceOf(EncryptionPair);
+ expect(actual.pinProtected.encrypted).toEqual("encrypted");
+ expect(actual.pinProtected.decrypted.encryptedString).toEqual("3.data");
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/account-tokens.spec.ts b/libs/common/src/models/domain/account-tokens.spec.ts
new file mode 100644
index 000000000000..733b3908e9a7
--- /dev/null
+++ b/libs/common/src/models/domain/account-tokens.spec.ts
@@ -0,0 +1,9 @@
+import { AccountTokens } from "./account";
+
+describe("AccountTokens", () => {
+ describe("fromJSON", () => {
+ it("should deserialize to an instance of itself", () => {
+ expect(AccountTokens.fromJSON({})).toBeInstanceOf(AccountTokens);
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/account.spec.ts b/libs/common/src/models/domain/account.spec.ts
new file mode 100644
index 000000000000..0c76c16cc2d2
--- /dev/null
+++ b/libs/common/src/models/domain/account.spec.ts
@@ -0,0 +1,23 @@
+import { Account, AccountKeys, AccountProfile, AccountSettings, AccountTokens } from "./account";
+
+describe("Account", () => {
+ describe("fromJSON", () => {
+ it("should deserialize to an instance of itself", () => {
+ expect(Account.fromJSON({})).toBeInstanceOf(Account);
+ });
+
+ it("should call all the sub-fromJSONs", () => {
+ const keysSpy = jest.spyOn(AccountKeys, "fromJSON");
+ const profileSpy = jest.spyOn(AccountProfile, "fromJSON");
+ const settingsSpy = jest.spyOn(AccountSettings, "fromJSON");
+ const tokensSpy = jest.spyOn(AccountTokens, "fromJSON");
+
+ Account.fromJSON({});
+
+ expect(keysSpy).toHaveBeenCalled();
+ expect(profileSpy).toHaveBeenCalled();
+ expect(settingsSpy).toHaveBeenCalled();
+ expect(tokensSpy).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts
index b7bbcb431c9b..5822af35c031 100644
--- a/libs/common/src/models/domain/account.ts
+++ b/libs/common/src/models/domain/account.ts
@@ -1,3 +1,8 @@
+import { Except, Jsonify } from "type-fest";
+
+import { Utils } from "@bitwarden/common/misc/utils";
+import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
+
import { AuthenticationStatus } from "../../enums/authenticationStatus";
import { KdfType } from "../../enums/kdfType";
import { UriMatchType } from "../../enums/uriMatchType";
@@ -24,7 +29,39 @@ import { SymmetricCryptoKey } from "./symmetricCryptoKey";
export class EncryptionPair {
encrypted?: TEncrypted;
decrypted?: TDecrypted;
- decryptedSerialized?: string;
+
+ toJSON() {
+ return {
+ encrypted: this.encrypted,
+ decrypted:
+ this.decrypted instanceof ArrayBuffer
+ ? Utils.fromBufferToByteString(this.decrypted)
+ : this.decrypted,
+ };
+ }
+
+ static fromJSON(
+ obj: Jsonify, Jsonify>>,
+ decryptedFromJson?: (decObj: Jsonify | string) => TDecrypted,
+ encryptedFromJson?: (encObj: Jsonify) => TEncrypted
+ ) {
+ if (obj == null) {
+ return null;
+ }
+
+ const pair = new EncryptionPair();
+ if (obj?.encrypted != null) {
+ pair.encrypted = encryptedFromJson
+ ? encryptedFromJson(obj.encrypted)
+ : (obj.encrypted as TEncrypted);
+ }
+ if (obj?.decrypted != null) {
+ pair.decrypted = decryptedFromJson
+ ? decryptedFromJson(obj.decrypted)
+ : (obj.decrypted as TDecrypted);
+ }
+ return pair;
+ }
}
export class DataEncryptionPair {
@@ -73,19 +110,66 @@ export class AccountKeys {
>();
organizationKeys?: EncryptionPair<
{ [orgId: string]: EncryptedOrganizationKeyData },
- Map
+ Record
> = new EncryptionPair<
{ [orgId: string]: EncryptedOrganizationKeyData },
- Map
+ Record
>();
- providerKeys?: EncryptionPair> = new EncryptionPair<
+ providerKeys?: EncryptionPair> = new EncryptionPair<
any,
- Map
+ Record
>();
privateKey?: EncryptionPair = new EncryptionPair();
publicKey?: ArrayBuffer;
- publicKeySerialized?: string;
apiKeyClientSecret?: string;
+
+ toJSON() {
+ return Object.assign(this as Except, {
+ publicKey: Utils.fromBufferToByteString(this.publicKey),
+ });
+ }
+
+ static fromJSON(obj: DeepJsonify): AccountKeys {
+ if (obj == null) {
+ return null;
+ }
+
+ return Object.assign(
+ new AccountKeys(),
+ { cryptoMasterKey: SymmetricCryptoKey.fromJSON(obj?.cryptoMasterKey) },
+ {
+ cryptoSymmetricKey: EncryptionPair.fromJSON(
+ obj?.cryptoSymmetricKey,
+ SymmetricCryptoKey.fromJSON
+ ),
+ },
+ { organizationKeys: AccountKeys.initRecordEncryptionPairsFromJSON(obj?.organizationKeys) },
+ { providerKeys: AccountKeys.initRecordEncryptionPairsFromJSON(obj?.providerKeys) },
+ {
+ privateKey: EncryptionPair.fromJSON(
+ obj?.privateKey,
+ (decObj: string) => Utils.fromByteStringToArray(decObj).buffer
+ ),
+ },
+ {
+ publicKey: Utils.fromByteStringToArray(obj?.publicKey)?.buffer,
+ }
+ );
+ }
+
+ static initRecordEncryptionPairsFromJSON(obj: any) {
+ return EncryptionPair.fromJSON(obj, (decObj: any) => {
+ if (obj == null) {
+ return null;
+ }
+
+ const record: Record = {};
+ for (const id in decObj) {
+ record[id] = SymmetricCryptoKey.fromJSON(decObj[id]);
+ }
+ return record;
+ });
+ }
}
export class AccountProfile {
@@ -106,6 +190,14 @@ export class AccountProfile {
keyHash?: string;
kdfIterations?: number;
kdfType?: KdfType;
+
+ static fromJSON(obj: Jsonify): AccountProfile {
+ if (obj == null) {
+ return null;
+ }
+
+ return Object.assign(new AccountProfile(), obj);
+ }
}
export class AccountSettings {
@@ -142,6 +234,21 @@ export class AccountSettings {
vaultTimeout?: number;
vaultTimeoutAction?: string = "lock";
serverConfig?: ServerConfigData;
+
+ static fromJSON(obj: Jsonify): AccountSettings {
+ if (obj == null) {
+ return null;
+ }
+
+ return Object.assign(new AccountSettings(), obj, {
+ environmentUrls: EnvironmentUrls.fromJSON(obj?.environmentUrls),
+ pinProtected: EncryptionPair.fromJSON(
+ obj?.pinProtected,
+ EncString.fromJSON
+ ),
+ serverConfig: ServerConfigData.fromJSON(obj?.serverConfig),
+ });
+ }
}
export type AccountSettingsSettings = {
@@ -150,9 +257,16 @@ export type AccountSettingsSettings = {
export class AccountTokens {
accessToken?: string;
- decodedToken?: any;
refreshToken?: string;
securityStamp?: string;
+
+ static fromJSON(obj: Jsonify): AccountTokens {
+ if (obj == null) {
+ return null;
+ }
+
+ return Object.assign(new AccountTokens(), obj);
+ }
}
export class Account {
@@ -186,4 +300,17 @@ export class Account {
},
});
}
+
+ static fromJSON(json: Jsonify): Account {
+ if (json == null) {
+ return null;
+ }
+
+ return Object.assign(new Account({}), json, {
+ keys: AccountKeys.fromJSON(json?.keys),
+ profile: AccountProfile.fromJSON(json?.profile),
+ settings: AccountSettings.fromJSON(json?.settings),
+ tokens: AccountTokens.fromJSON(json?.tokens),
+ });
+ }
}
diff --git a/libs/common/src/models/domain/encryption-pair.spec.ts b/libs/common/src/models/domain/encryption-pair.spec.ts
new file mode 100644
index 000000000000..55fad76db035
--- /dev/null
+++ b/libs/common/src/models/domain/encryption-pair.spec.ts
@@ -0,0 +1,34 @@
+import { Utils } from "@bitwarden/common/misc/utils";
+
+import { EncryptionPair } from "./account";
+
+describe("EncryptionPair", () => {
+ describe("toJSON", () => {
+ it("should populate decryptedSerialized for buffer arrays", () => {
+ const pair = new EncryptionPair();
+ pair.decrypted = Utils.fromByteStringToArray("hello").buffer;
+ const json = pair.toJSON();
+ expect(json.decrypted).toEqual("hello");
+ });
+
+ it("should serialize encrypted and decrypted", () => {
+ const pair = new EncryptionPair();
+ pair.encrypted = "hello";
+ pair.decrypted = "world";
+ const json = pair.toJSON();
+ expect(json.encrypted).toEqual("hello");
+ expect(json.decrypted).toEqual("world");
+ });
+ });
+
+ describe("fromJSON", () => {
+ it("should deserialize encrypted and decrypted", () => {
+ const pair = EncryptionPair.fromJSON({
+ encrypted: "hello",
+ decrypted: "world",
+ });
+ expect(pair.encrypted).toEqual("hello");
+ expect(pair.decrypted).toEqual("world");
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/environmentUrls.ts b/libs/common/src/models/domain/environmentUrls.ts
index d4fd173c83ae..c78768bdc295 100644
--- a/libs/common/src/models/domain/environmentUrls.ts
+++ b/libs/common/src/models/domain/environmentUrls.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
export class EnvironmentUrls {
base: string = null;
api: string = null;
@@ -7,4 +9,8 @@ export class EnvironmentUrls {
events: string = null;
webVault: string = null;
keyConnector: string = null;
+
+ static fromJSON(obj: Jsonify): EnvironmentUrls {
+ return Object.assign(new EnvironmentUrls(), obj);
+ }
}
diff --git a/libs/common/src/models/domain/globalState.ts b/libs/common/src/models/domain/globalState.ts
index 422293fceda1..c907d3ecb5c4 100644
--- a/libs/common/src/models/domain/globalState.ts
+++ b/libs/common/src/models/domain/globalState.ts
@@ -37,4 +37,5 @@ export class GlobalState {
alwaysShowDock?: boolean;
enableBrowserIntegration?: boolean;
enableBrowserIntegrationFingerprint?: boolean;
+ enableDuckDuckGoBrowserIntegration?: boolean;
}
diff --git a/libs/common/src/models/domain/logInCredentials.ts b/libs/common/src/models/domain/logInCredentials.ts
index c1e23610e475..5f2035fd1566 100644
--- a/libs/common/src/models/domain/logInCredentials.ts
+++ b/libs/common/src/models/domain/logInCredentials.ts
@@ -1,3 +1,5 @@
+import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
+
import { AuthenticationType } from "../../enums/authenticationType";
import { TokenRequestTwoFactor } from "../request/identityToken/tokenRequestTwoFactor";
@@ -29,3 +31,16 @@ export class ApiLogInCredentials {
constructor(public clientId: string, public clientSecret: string) {}
}
+
+export class PasswordlessLogInCredentials {
+ readonly type = AuthenticationType.Passwordless;
+
+ constructor(
+ public email: string,
+ public accessCode: string,
+ public authRequestId: string,
+ public decKey: SymmetricCryptoKey,
+ public localPasswordHash: string,
+ public twoFactor?: TokenRequestTwoFactor
+ ) {}
+}
diff --git a/libs/common/src/models/domain/state.spec.ts b/libs/common/src/models/domain/state.spec.ts
new file mode 100644
index 000000000000..64e71d7cb2cd
--- /dev/null
+++ b/libs/common/src/models/domain/state.spec.ts
@@ -0,0 +1,28 @@
+import { Account } from "./account";
+import { State } from "./state";
+
+describe("state", () => {
+ describe("fromJSON", () => {
+ it("should deserialize to an instance of itself", () => {
+ expect(State.fromJSON({})).toBeInstanceOf(State);
+ });
+
+ it("should always assign an object to accounts", () => {
+ const state = State.fromJSON({});
+ expect(state.accounts).not.toBeNull();
+ expect(state.accounts).toEqual({});
+ });
+
+ it("should build an account map", () => {
+ const accountsSpy = jest.spyOn(Account, "fromJSON");
+ const state = State.fromJSON({
+ accounts: {
+ userId: {},
+ },
+ });
+
+ expect(state.accounts["userId"]).toBeInstanceOf(Account);
+ expect(accountsSpy).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/libs/common/src/models/domain/state.ts b/libs/common/src/models/domain/state.ts
index f5a2c046b54d..5450325d25c5 100644
--- a/libs/common/src/models/domain/state.ts
+++ b/libs/common/src/models/domain/state.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
import { Account } from "./account";
import { GlobalState } from "./globalState";
@@ -14,4 +16,30 @@ export class State<
constructor(globals: TGlobalState) {
this.globals = globals;
}
+
+ // TODO, make Jsonify work. It currently doesn't because Globals doesn't implement Jsonify.
+ static fromJSON(
+ obj: any
+ ): State {
+ if (obj == null) {
+ return null;
+ }
+
+ return Object.assign(new State(null), obj, {
+ accounts: State.buildAccountMapFromJSON(obj?.accounts),
+ });
+ }
+
+ private static buildAccountMapFromJSON(
+ jsonAccounts: Jsonify<{ [userId: string]: Jsonify }>
+ ) {
+ if (!jsonAccounts) {
+ return {};
+ }
+ const accounts: { [userId: string]: Account } = {};
+ for (const userId in jsonAccounts) {
+ accounts[userId] = Account.fromJSON(jsonAccounts[userId]);
+ }
+ return accounts;
+ }
}
diff --git a/libs/common/src/models/domain/storageOptions.ts b/libs/common/src/models/domain/storageOptions.ts
index 2db7e0ccf581..7e21b1943323 100644
--- a/libs/common/src/models/domain/storageOptions.ts
+++ b/libs/common/src/models/domain/storageOptions.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
import { HtmlStorageLocation } from "../../enums/htmlStorageLocation";
import { StorageLocation } from "../../enums/storageLocation";
@@ -8,3 +10,5 @@ export type StorageOptions = {
htmlStorageLocation?: HtmlStorageLocation;
keySuffix?: string;
};
+
+export type MemoryStorageOptions = StorageOptions & { deserializer?: (obj: Jsonify) => T };
diff --git a/libs/common/src/models/request/identityToken/tokenRequest.ts b/libs/common/src/models/request/identityToken/tokenRequest.ts
index 82a4a394c5dd..5e38d2069b07 100644
--- a/libs/common/src/models/request/identityToken/tokenRequest.ts
+++ b/libs/common/src/models/request/identityToken/tokenRequest.ts
@@ -4,6 +4,7 @@ import { TokenRequestTwoFactor } from "./tokenRequestTwoFactor";
export abstract class TokenRequest {
protected device?: DeviceRequest;
+ protected passwordlessAuthRequest: string;
constructor(protected twoFactor: TokenRequestTwoFactor, device?: DeviceRequest) {
this.device = device != null ? device : null;
@@ -18,6 +19,10 @@ export abstract class TokenRequest {
this.twoFactor = twoFactor;
}
+ setPasswordlessAccessCode(accessCode: string) {
+ this.passwordlessAuthRequest = accessCode;
+ }
+
protected toIdentityToken(clientId: string) {
const obj: any = {
scope: "api offline_access",
@@ -32,6 +37,11 @@ export abstract class TokenRequest {
// obj.devicePushToken = this.device.pushToken;
}
+ //passswordless login
+ if (this.passwordlessAuthRequest) {
+ obj.authRequest = this.passwordlessAuthRequest;
+ }
+
if (this.twoFactor.token && this.twoFactor.provider != null) {
obj.twoFactorToken = this.twoFactor.token;
obj.twoFactorProvider = this.twoFactor.provider;
diff --git a/libs/common/src/models/request/passwordlessCreateAuthRequest.ts b/libs/common/src/models/request/passwordlessCreateAuthRequest.ts
new file mode 100644
index 000000000000..df83c547775d
--- /dev/null
+++ b/libs/common/src/models/request/passwordlessCreateAuthRequest.ts
@@ -0,0 +1,12 @@
+import { AuthRequestType } from "../../enums/authRequestType";
+
+export class PasswordlessCreateAuthRequest {
+ constructor(
+ readonly email: string,
+ readonly deviceIdentifier: string,
+ readonly publicKey: string,
+ readonly type: AuthRequestType,
+ readonly accessCode: string,
+ readonly fingerprintPhrase: string
+ ) {}
+}
diff --git a/libs/common/src/models/response/authRequestResponse.ts b/libs/common/src/models/response/authRequestResponse.ts
new file mode 100644
index 000000000000..1a29a3da8568
--- /dev/null
+++ b/libs/common/src/models/response/authRequestResponse.ts
@@ -0,0 +1,26 @@
+import { DeviceType } from "@bitwarden/common/enums/deviceType";
+
+import { BaseResponse } from "./baseResponse";
+
+export class AuthRequestResponse extends BaseResponse {
+ id: string;
+ publicKey: string;
+ requestDeviceType: DeviceType;
+ requestIpAddress: string;
+ key: string;
+ masterPasswordHash: string;
+ creationDate: string;
+ requestApproved: boolean;
+
+ constructor(response: any) {
+ super(response);
+ this.id = this.getResponseProperty("Id");
+ this.publicKey = this.getResponseProperty("PublicKey");
+ this.requestDeviceType = this.getResponseProperty("RequestDeviceType");
+ this.requestIpAddress = this.getResponseProperty("RequestIpAddress");
+ this.key = this.getResponseProperty("Key");
+ this.masterPasswordHash = this.getResponseProperty("MasterPasswordHash");
+ this.creationDate = this.getResponseProperty("CreationDate");
+ this.requestApproved = this.getResponseProperty("RequestApproved");
+ }
+}
diff --git a/libs/common/src/models/response/notificationResponse.ts b/libs/common/src/models/response/notificationResponse.ts
index f23de8fe8be1..1e2a50450635 100644
--- a/libs/common/src/models/response/notificationResponse.ts
+++ b/libs/common/src/models/response/notificationResponse.ts
@@ -37,6 +37,10 @@ export class NotificationResponse extends BaseResponse {
case NotificationType.SyncSendDelete:
this.payload = new SyncSendNotification(payload);
break;
+ case NotificationType.AuthRequest:
+ case NotificationType.AuthRequestResponse:
+ this.payload = new AuthRequestPushNotification(payload);
+ break;
default:
break;
}
@@ -96,3 +100,14 @@ export class SyncSendNotification extends BaseResponse {
this.revisionDate = new Date(this.getResponseProperty("RevisionDate"));
}
}
+
+export class AuthRequestPushNotification extends BaseResponse {
+ id: string;
+ userId: string;
+
+ constructor(response: any) {
+ super(response);
+ this.id = this.getResponseProperty("Id");
+ this.userId = this.getResponseProperty("UserId");
+ }
+}
diff --git a/libs/common/src/services/anonymousHub.service.ts b/libs/common/src/services/anonymousHub.service.ts
new file mode 100644
index 000000000000..13b5898b18b2
--- /dev/null
+++ b/libs/common/src/services/anonymousHub.service.ts
@@ -0,0 +1,60 @@
+import { Injectable } from "@angular/core";
+import {
+ HttpTransportType,
+ HubConnection,
+ HubConnectionBuilder,
+ IHubProtocol,
+} from "@microsoft/signalr";
+import { MessagePackHubProtocol } from "@microsoft/signalr-protocol-msgpack";
+
+import { AnonymousHubService as AnonymousHubServiceAbstraction } from "../abstractions/anonymousHub.service";
+import { AuthService } from "../abstractions/auth.service";
+import { EnvironmentService } from "../abstractions/environment.service";
+import { LogService } from "../abstractions/log.service";
+
+import {
+ AuthRequestPushNotification,
+ NotificationResponse,
+} from "./../models/response/notificationResponse";
+
+@Injectable()
+export class AnonymousHubService implements AnonymousHubServiceAbstraction {
+ private anonHubConnection: HubConnection;
+ private url: string;
+
+ constructor(
+ private environmentService: EnvironmentService,
+ private authService: AuthService,
+ private logService: LogService
+ ) {}
+
+ async createHubConnection(token: string) {
+ this.url = this.environmentService.getNotificationsUrl();
+
+ this.anonHubConnection = new HubConnectionBuilder()
+ .withUrl(this.url + "/anonymousHub?Token=" + token, {
+ skipNegotiation: true,
+ transport: HttpTransportType.WebSockets,
+ })
+ .withHubProtocol(new MessagePackHubProtocol() as IHubProtocol)
+ .build();
+
+ this.anonHubConnection.start().catch((error) => this.logService.error(error));
+
+ this.anonHubConnection.on("AuthRequestResponseRecieved", (data: any) => {
+ this.ProcessNotification(new NotificationResponse(data));
+ });
+ }
+
+ stopHubConnection() {
+ if (this.anonHubConnection) {
+ this.anonHubConnection.stop();
+ }
+ }
+
+ private async ProcessNotification(notification: NotificationResponse) {
+ await this.authService.authResponsePushNotifiction(
+ notification.payload as AuthRequestPushNotification
+ );
+ }
+}
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 0b96a11831c0..a4648e25045c 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -54,6 +54,7 @@ import { OrganizationUserUpdateGroupsRequest } from "../models/request/organizat
import { OrganizationUserUpdateRequest } from "../models/request/organizationUserUpdateRequest";
import { PasswordHintRequest } from "../models/request/passwordHintRequest";
import { PasswordRequest } from "../models/request/passwordRequest";
+import { PasswordlessCreateAuthRequest } from "../models/request/passwordlessCreateAuthRequest";
import { PaymentRequest } from "../models/request/paymentRequest";
import { PreloginRequest } from "../models/request/preloginRequest";
import { ProviderAddOrganizationRequest } from "../models/request/provider/providerAddOrganizationRequest";
@@ -92,6 +93,7 @@ import { VerifyEmailRequest } from "../models/request/verifyEmailRequest";
import { ApiKeyResponse } from "../models/response/apiKeyResponse";
import { AttachmentResponse } from "../models/response/attachmentResponse";
import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse";
+import { AuthRequestResponse } from "../models/response/authRequestResponse";
import { RegisterResponse } from "../models/response/authentication/registerResponse";
import { BillingHistoryResponse } from "../models/response/billingHistoryResponse";
import { BillingPaymentResponse } from "../models/response/billingPaymentResponse";
@@ -265,6 +267,17 @@ export class ApiService implements ApiServiceAbstraction {
}
}
+ async postAuthRequest(request: PasswordlessCreateAuthRequest): Promise {
+ const r = await this.send("POST", "/auth-requests/", request, false, true);
+ return new AuthRequestResponse(r);
+ }
+
+ async getAuthResponse(id: string, accessCode: string): Promise {
+ const path = `/auth-requests/${id}/response?code=${accessCode}`;
+ const r = await this.send("GET", path, null, false, true);
+ return new AuthRequestResponse(r);
+ }
+
// Account APIs
async getProfile(): Promise {
diff --git a/libs/common/src/services/auth.service.ts b/libs/common/src/services/auth.service.ts
index 6f77bca20b34..3807eee3d69b 100644
--- a/libs/common/src/services/auth.service.ts
+++ b/libs/common/src/services/auth.service.ts
@@ -1,3 +1,5 @@
+import { Observable, Subject } from "rxjs";
+
import { ApiService } from "../abstractions/api.service";
import { AppIdService } from "../abstractions/appId.service";
import { AuthService as AuthServiceAbstraction } from "../abstractions/auth.service";
@@ -17,17 +19,20 @@ import { KdfType } from "../enums/kdfType";
import { KeySuffixOptions } from "../enums/keySuffixOptions";
import { ApiLogInStrategy } from "../misc/logInStrategies/apiLogin.strategy";
import { PasswordLogInStrategy } from "../misc/logInStrategies/passwordLogin.strategy";
+import { PasswordlessLogInStrategy } from "../misc/logInStrategies/passwordlessLogin.strategy";
import { SsoLogInStrategy } from "../misc/logInStrategies/ssoLogin.strategy";
import { AuthResult } from "../models/domain/authResult";
import {
ApiLogInCredentials,
PasswordLogInCredentials,
SsoLogInCredentials,
+ PasswordlessLogInCredentials,
} from "../models/domain/logInCredentials";
import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
import { TokenRequestTwoFactor } from "../models/request/identityToken/tokenRequestTwoFactor";
import { PreloginRequest } from "../models/request/preloginRequest";
import { ErrorResponse } from "../models/response/errorResponse";
+import { AuthRequestPushNotification } from "../models/response/notificationResponse";
const sessionTimeoutLength = 2 * 60 * 1000; // 2 minutes
@@ -42,9 +47,15 @@ export class AuthService implements AuthServiceAbstraction {
: null;
}
- private logInStrategy: ApiLogInStrategy | PasswordLogInStrategy | SsoLogInStrategy;
+ private logInStrategy:
+ | ApiLogInStrategy
+ | PasswordLogInStrategy
+ | SsoLogInStrategy
+ | PasswordlessLogInStrategy;
private sessionTimeout: any;
+ private pushNotificationSubject = new Subject();
+
constructor(
protected cryptoService: CryptoService,
protected apiService: ApiService,
@@ -61,52 +72,78 @@ export class AuthService implements AuthServiceAbstraction {
) {}
async logIn(
- credentials: ApiLogInCredentials | PasswordLogInCredentials | SsoLogInCredentials
+ credentials:
+ | ApiLogInCredentials
+ | PasswordLogInCredentials
+ | SsoLogInCredentials
+ | PasswordlessLogInCredentials
): Promise {
this.clearState();
- let strategy: ApiLogInStrategy | PasswordLogInStrategy | SsoLogInStrategy;
-
- if (credentials.type === AuthenticationType.Password) {
- strategy = new PasswordLogInStrategy(
- this.cryptoService,
- this.apiService,
- this.tokenService,
- this.appIdService,
- this.platformUtilsService,
- this.messagingService,
- this.logService,
- this.stateService,
- this.twoFactorService,
- this
- );
- } else if (credentials.type === AuthenticationType.Sso) {
- strategy = new SsoLogInStrategy(
- this.cryptoService,
- this.apiService,
- this.tokenService,
- this.appIdService,
- this.platformUtilsService,
- this.messagingService,
- this.logService,
- this.stateService,
- this.twoFactorService,
- this.keyConnectorService
- );
- } else if (credentials.type === AuthenticationType.Api) {
- strategy = new ApiLogInStrategy(
- this.cryptoService,
- this.apiService,
- this.tokenService,
- this.appIdService,
- this.platformUtilsService,
- this.messagingService,
- this.logService,
- this.stateService,
- this.twoFactorService,
- this.environmentService,
- this.keyConnectorService
- );
+ let strategy:
+ | ApiLogInStrategy
+ | PasswordLogInStrategy
+ | SsoLogInStrategy
+ | PasswordlessLogInStrategy;
+
+ switch (credentials.type) {
+ case AuthenticationType.Password:
+ strategy = new PasswordLogInStrategy(
+ this.cryptoService,
+ this.apiService,
+ this.tokenService,
+ this.appIdService,
+ this.platformUtilsService,
+ this.messagingService,
+ this.logService,
+ this.stateService,
+ this.twoFactorService,
+ this
+ );
+ break;
+ case AuthenticationType.Sso:
+ strategy = new SsoLogInStrategy(
+ this.cryptoService,
+ this.apiService,
+ this.tokenService,
+ this.appIdService,
+ this.platformUtilsService,
+ this.messagingService,
+ this.logService,
+ this.stateService,
+ this.twoFactorService,
+ this.keyConnectorService
+ );
+ break;
+ case AuthenticationType.Api:
+ strategy = new ApiLogInStrategy(
+ this.cryptoService,
+ this.apiService,
+ this.tokenService,
+ this.appIdService,
+ this.platformUtilsService,
+ this.messagingService,
+ this.logService,
+ this.stateService,
+ this.twoFactorService,
+ this.environmentService,
+ this.keyConnectorService
+ );
+ break;
+ case AuthenticationType.Passwordless:
+ strategy = new PasswordlessLogInStrategy(
+ this.cryptoService,
+ this.apiService,
+ this.tokenService,
+ this.appIdService,
+ this.platformUtilsService,
+ this.messagingService,
+ this.logService,
+ this.stateService,
+ this.twoFactorService,
+ this
+ );
+ break;
}
const result = await strategy.logIn(credentials as any);
@@ -202,7 +239,21 @@ export class AuthService implements AuthServiceAbstraction {
return this.cryptoService.makeKey(masterPassword, email, kdf, kdfIterations);
}
- private saveState(strategy: ApiLogInStrategy | PasswordLogInStrategy | SsoLogInStrategy) {
+ async authResponsePushNotifiction(notification: AuthRequestPushNotification): Promise {
+ this.pushNotificationSubject.next(notification.id);
+ }
+
+ getPushNotifcationObs$(): Observable {
+ return this.pushNotificationSubject.asObservable();
+ }
+
+ private saveState(
+ strategy:
+ | ApiLogInStrategy
+ | PasswordLogInStrategy
+ | SsoLogInStrategy
+ | PasswordlessLogInStrategy
+ ) {
this.logInStrategy = strategy;
this.startSessionTimeout();
}
diff --git a/libs/common/src/services/cipher.service.ts b/libs/common/src/services/cipher.service.ts
index 40440ea8bf70..62d849d41769 100644
--- a/libs/common/src/services/cipher.service.ts
+++ b/libs/common/src/services/cipher.service.ts
@@ -393,7 +393,7 @@ export class CipherService implements CipherServiceAbstraction {
: firstValueFrom(this.settingsService.settings$).then(
(settings: AccountSettingsSettings) => {
let matches: any[] = [];
- settings.equivalentDomains.forEach((eqDomain: any) => {
+ settings.equivalentDomains?.forEach((eqDomain: any) => {
if (eqDomain.length && eqDomain.indexOf(domain) >= 0) {
matches = matches.concat(eqDomain);
}
diff --git a/libs/common/src/services/encrypt.service.ts b/libs/common/src/services/encrypt.service.ts
index 0b3f9731ca74..fef33a3f9c3e 100644
--- a/libs/common/src/services/encrypt.service.ts
+++ b/libs/common/src/services/encrypt.service.ts
@@ -98,7 +98,7 @@ export class EncryptService implements AbstractEncryptService {
}
}
- return this.cryptoFunctionService.aesDecryptFast(fastParams);
+ return await this.cryptoFunctionService.aesDecryptFast(fastParams);
}
async decryptToBytes(encThing: IEncrypted, key: SymmetricCryptoKey): Promise {
diff --git a/libs/common/src/services/memoryStorage.service.ts b/libs/common/src/services/memoryStorage.service.ts
index d1616c6029f7..1634b67b051a 100644
--- a/libs/common/src/services/memoryStorage.service.ts
+++ b/libs/common/src/services/memoryStorage.service.ts
@@ -1,6 +1,12 @@
-import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
+import {
+ AbstractStorageService,
+ MemoryStorageServiceInterface,
+} from "@bitwarden/common/abstractions/storage.service";
-export class MemoryStorageService implements AbstractStorageService {
+export class MemoryStorageService
+ extends AbstractStorageService
+ implements MemoryStorageServiceInterface
+{
private store = new Map();
get(key: string): Promise {
diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts
index d5aabb3490ac..1f52a27ad672 100644
--- a/libs/common/src/services/state.service.ts
+++ b/libs/common/src/services/state.service.ts
@@ -3,14 +3,16 @@ import { BehaviorSubject, concatMap } from "rxjs";
import { LogService } from "../abstractions/log.service";
import { StateService as StateServiceAbstraction } from "../abstractions/state.service";
import { StateMigrationService } from "../abstractions/stateMigration.service";
-import { AbstractStorageService } from "../abstractions/storage.service";
+import {
+ MemoryStorageServiceInterface,
+ AbstractStorageService,
+} from "../abstractions/storage.service";
import { HtmlStorageLocation } from "../enums/htmlStorageLocation";
import { KdfType } from "../enums/kdfType";
import { StorageLocation } from "../enums/storageLocation";
import { ThemeType } from "../enums/themeType";
import { UriMatchType } from "../enums/uriMatchType";
import { StateFactory } from "../factories/stateFactory";
-import { Utils } from "../misc/utils";
import { CipherData } from "../models/data/cipherData";
import { CollectionData } from "../models/data/collectionData";
import { EncryptedOrganizationKeyData } from "../models/data/encryptedOrganizationKeyData";
@@ -56,6 +58,8 @@ const partialKeys = {
masterKey: "_masterkey",
};
+const DDG_SHARED_KEY = "DuckDuckGoSharedKey";
+
export class StateService<
TGlobalState extends GlobalState = GlobalState,
TAccount extends Account = Account
@@ -76,7 +80,7 @@ export class StateService<
constructor(
protected storageService: AbstractStorageService,
protected secureStorageService: AbstractStorageService,
- protected memoryStorageService: AbstractStorageService,
+ protected memoryStorageService: AbstractStorageService & MemoryStorageServiceInterface,
protected logService: LogService,
protected stateMigrationService: StateMigrationService,
protected stateFactory: StateFactory,
@@ -150,6 +154,9 @@ export class StateService<
return;
}
await this.updateState(async (state) => {
+ if (state.accounts == null) {
+ state.accounts = {};
+ }
state.accounts[userId] = this.createAccount();
const diskAccount = await this.getAccountFromDisk({ userId: userId });
state.accounts[userId].profile = diskAccount.profile;
@@ -494,11 +501,11 @@ export class StateService<
);
}
- @withPrototype(SymmetricCryptoKey, SymmetricCryptoKey.fromJSON)
async getCryptoMasterKey(options?: StorageOptions): Promise {
- return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.keys?.cryptoMasterKey;
+ const account = await this.getAccount(
+ this.reconcileOptions(options, await this.defaultInMemoryOptions())
+ );
+ return account?.keys?.cryptoMasterKey;
}
async setCryptoMasterKey(value: SymmetricCryptoKey, options?: StorageOptions): Promise {
@@ -604,23 +611,6 @@ export class StateService<
await this.saveSecureStorageKey(partialKeys.biometricKey, value, options);
}
- async getDecodedToken(options?: StorageOptions): Promise {
- return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.tokens?.decodedToken;
- }
-
- async setDecodedToken(value: any, options?: StorageOptions): Promise {
- const account = await this.getAccount(
- this.reconcileOptions(options, await this.defaultInMemoryOptions())
- );
- account.tokens.decodedToken = value;
- await this.saveAccount(
- account,
- this.reconcileOptions(options, await this.defaultInMemoryOptions())
- );
- }
-
@withPrototypeForArrayMembers(CipherView, CipherView.fromJSON)
async getDecryptedCiphers(options?: StorageOptions): Promise {
return (
@@ -657,11 +647,11 @@ export class StateService<
);
}
- @withPrototype(SymmetricCryptoKey, SymmetricCryptoKey.fromJSON)
async getDecryptedCryptoSymmetricKey(options?: StorageOptions): Promise {
- return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.keys?.cryptoSymmetricKey?.decrypted;
+ const account = await this.getAccount(
+ this.reconcileOptions(options, await this.defaultInMemoryOptions())
+ );
+ return account?.keys?.cryptoSymmetricKey?.decrypted;
}
async setDecryptedCryptoSymmetricKey(
@@ -678,14 +668,13 @@ export class StateService<
);
}
- @withPrototypeForMap(SymmetricCryptoKey, SymmetricCryptoKey.fromJSON)
async getDecryptedOrganizationKeys(
options?: StorageOptions
): Promise> {
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
- return account?.keys?.organizationKeys?.decrypted;
+ return this.recordToMap(account?.keys?.organizationKeys?.decrypted);
}
async setDecryptedOrganizationKeys(
@@ -695,7 +684,7 @@ export class StateService<
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
- account.keys.organizationKeys.decrypted = value;
+ account.keys.organizationKeys.decrypted = this.mapToRecord(value);
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultInMemoryOptions())
@@ -725,7 +714,6 @@ export class StateService<
);
}
- @withPrototype(EncString)
async getDecryptedPinProtected(options?: StorageOptions): Promise {
return (
await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
@@ -762,14 +750,9 @@ export class StateService<
}
async getDecryptedPrivateKey(options?: StorageOptions): Promise {
- const privateKey = (
+ return (
await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.keys?.privateKey;
- let result = privateKey?.decrypted;
- if (result == null && privateKey?.decryptedSerialized != null) {
- result = Utils.fromByteStringToArray(privateKey.decryptedSerialized);
- }
- return result;
+ )?.keys?.privateKey.decrypted;
}
async setDecryptedPrivateKey(value: ArrayBuffer, options?: StorageOptions): Promise {
@@ -777,21 +760,19 @@ export class StateService<
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
account.keys.privateKey.decrypted = value;
- account.keys.privateKey.decryptedSerialized =
- value == null ? null : Utils.fromBufferToByteString(value);
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
}
- @withPrototypeForMap(SymmetricCryptoKey, SymmetricCryptoKey.fromJSON)
async getDecryptedProviderKeys(
options?: StorageOptions
): Promise> {
- return (
- await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
- )?.keys?.providerKeys?.decrypted;
+ const account = await this.getAccount(
+ this.reconcileOptions(options, await this.defaultInMemoryOptions())
+ );
+ return this.recordToMap(account?.keys?.providerKeys?.decrypted);
}
async setDecryptedProviderKeys(
@@ -801,7 +782,7 @@ export class StateService<
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
- account.keys.providerKeys.decrypted = value;
+ account.keys.providerKeys.decrypted = this.mapToRecord(value);
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultInMemoryOptions())
@@ -1029,6 +1010,24 @@ export class StateService<
);
}
+ async getDuckDuckGoSharedKey(options?: StorageOptions): Promise {
+ options = this.reconcileOptions(options, await this.defaultSecureStorageOptions());
+ if (options?.userId == null) {
+ return null;
+ }
+ return await this.secureStorageService.get(DDG_SHARED_KEY, options);
+ }
+
+ async setDuckDuckGoSharedKey(value: string, options?: StorageOptions): Promise {
+ options = this.reconcileOptions(options, await this.defaultSecureStorageOptions());
+ if (options?.userId == null) {
+ return;
+ }
+ value == null
+ ? await this.secureStorageService.remove(DDG_SHARED_KEY, options)
+ : await this.secureStorageService.save(DDG_SHARED_KEY, value, options);
+ }
+
async getEmail(options?: StorageOptions): Promise {
return (
await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
@@ -1187,6 +1186,27 @@ export class StateService<
);
}
+ async getEnableDuckDuckGoBrowserIntegration(options?: StorageOptions): Promise {
+ return (
+ (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskOptions())))
+ ?.enableDuckDuckGoBrowserIntegration ?? false
+ );
+ }
+
+ async setEnableDuckDuckGoBrowserIntegration(
+ value: boolean,
+ options?: StorageOptions
+ ): Promise {
+ const globals = await this.getGlobals(
+ this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ );
+ globals.enableDuckDuckGoBrowserIntegration = value;
+ await this.saveGlobals(
+ globals,
+ this.reconcileOptions(options, await this.defaultOnDiskOptions())
+ );
+ }
+
async getEnableFullWidth(options?: StorageOptions): Promise {
return (
(
@@ -1538,7 +1558,6 @@ export class StateService<
);
}
- @withPrototype(EnvironmentUrls)
async getEnvironmentUrls(options?: StorageOptions): Promise {
if ((await this.state())?.activeUserId == null) {
return await this.getGlobalEnvironmentUrls(options);
@@ -2021,11 +2040,7 @@ export class StateService<
const keys = (
await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
)?.keys;
- let result = keys?.publicKey;
- if (result == null && keys?.publicKeySerialized != null) {
- result = Utils.fromByteStringToArray(keys.publicKeySerialized);
- }
- return result;
+ return keys?.publicKey;
}
async setPublicKey(value: ArrayBuffer, options?: StorageOptions): Promise {
@@ -2033,7 +2048,6 @@ export class StateService<
this.reconcileOptions(options, await this.defaultInMemoryOptions())
);
account.keys.publicKey = value;
- account.keys.publicKeySerialized = value == null ? null : Utils.fromBufferToByteString(value);
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultInMemoryOptions())
@@ -2741,8 +2755,11 @@ export class StateService<
: await this.secureStorageService.save(`${options.userId}${key}`, value, options);
}
- protected state(): Promise> {
- return this.memoryStorageService.get>(keys.state);
+ protected async state(): Promise> {
+ const state = await this.memoryStorageService.get>(keys.state, {
+ deserializer: (s) => State.fromJSON(s),
+ });
+ return state;
}
private async setState(state: State): Promise {
@@ -2761,6 +2778,14 @@ export class StateService<
await this.setState(updatedState);
});
}
+
+ private mapToRecord(map: Map): Record {
+ return map == null ? null : Object.fromEntries(map);
+ }
+
+ private recordToMap(record: Record): Map {
+ return record == null ? null : new Map(Object.entries(record));
+ }
}
export function withPrototype(
@@ -2893,52 +2918,3 @@ function withPrototypeForObjectValues(
};
};
}
-
-function withPrototypeForMap(
- valuesConstructor: new (...args: any[]) => T,
- valuesConverter: (input: any) => T = (i) => i
-): (
- target: any,
- propertyKey: string | symbol,
- descriptor: PropertyDescriptor
-) => { value: (...args: any[]) => Promise> } {
- return (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
- const originalMethod = descriptor.value;
-
- return {
- value: function (...args: any[]) {
- const originalResult: Promise = originalMethod.apply(this, args);
-
- if (!(originalResult instanceof Promise)) {
- throw new Error(
- `Error applying prototype to stored value -- result is not a promise for method ${String(
- propertyKey
- )}`
- );
- }
-
- return originalResult.then((result) => {
- if (result == null) {
- return null;
- } else if (result instanceof Map) {
- return result;
- } else {
- for (const key in Object.keys(result)) {
- result[key] =
- result[key] == null ||
- result[key].constructor.name === valuesConstructor.prototype.constructor.name
- ? valuesConverter(result[key])
- : valuesConverter(
- Object.create(
- valuesConstructor.prototype,
- Object.getOwnPropertyDescriptors(result[key])
- )
- );
- }
- return new Map(Object.entries(result));
- }
- });
- },
- };
- };
-}
diff --git a/libs/common/src/services/stateMigration.service.ts b/libs/common/src/services/stateMigration.service.ts
index 359b4acec469..e936860657a5 100644
--- a/libs/common/src/services/stateMigration.service.ts
+++ b/libs/common/src/services/stateMigration.service.ts
@@ -12,7 +12,13 @@ import { OrganizationData } from "../models/data/organizationData";
import { PolicyData } from "../models/data/policyData";
import { ProviderData } from "../models/data/providerData";
import { SendData } from "../models/data/sendData";
-import { Account, AccountSettings, AccountSettingsSettings } from "../models/domain/account";
+import {
+ Account,
+ AccountSettings,
+ AccountSettingsSettings,
+ EncryptionPair,
+} from "../models/domain/account";
+import { EncString } from "../models/domain/encString";
import { EnvironmentUrls } from "../models/domain/environmentUrls";
import { GeneratedPasswordHistory } from "../models/domain/generatedPasswordHistory";
import { GlobalState } from "../models/domain/globalState";
@@ -314,10 +320,10 @@ export class StateMigrationService<
passwordGenerationOptions:
(await this.get(v1Keys.passwordGenerationOptions)) ??
defaultAccount.settings.passwordGenerationOptions,
- pinProtected: {
+ pinProtected: Object.assign(new EncryptionPair(), {
decrypted: null,
encrypted: await this.get(v1Keys.pinProtected),
- },
+ }),
protectedPin: await this.get(v1Keys.protectedPin),
settings:
userId == null
diff --git a/libs/common/src/services/token.service.ts b/libs/common/src/services/token.service.ts
index 0922fa87518e..5b6ffe6d889c 100644
--- a/libs/common/src/services/token.service.ts
+++ b/libs/common/src/services/token.service.ts
@@ -93,11 +93,6 @@ export class TokenService implements TokenServiceAbstraction {
// ref https://github.com/auth0/angular-jwt/blob/master/src/angularJwt/services/jwt.js
async decodeToken(token?: string): Promise {
- const storedToken = await this.stateService.getDecodedToken();
- if (token === null && storedToken != null) {
- return storedToken;
- }
-
token = token ?? (await this.stateService.getAccessToken());
if (token == null) {
diff --git a/libs/common/src/types/deep-jsonify.ts b/libs/common/src/types/deep-jsonify.ts
new file mode 100644
index 000000000000..a83b8e4549f2
--- /dev/null
+++ b/libs/common/src/types/deep-jsonify.ts
@@ -0,0 +1,44 @@
+import {
+ PositiveInfinity,
+ NegativeInfinity,
+ JsonPrimitive,
+ TypedArray,
+ JsonValue,
+} from "type-fest";
+import { NotJsonable } from "type-fest/source/jsonify";
+
+/**
+ * Extracted from type-fest and extended with Jsonification of objects returned from `toJSON` methods.
+ */
+export type DeepJsonify