A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: fix clear account data & reset password (#10352)
Abdullah Attabdc14cb15e1f
diff --git a/apps/web/src/views/recovery.tsx b/apps/web/src/views/recovery.tsxindex e2be98631..e552c71e9 100644--- a/apps/web/src/views/recovery.tsx+++ b/apps/web/src/views/recovery.tsx@@ -424,14 +424,19 @@ function NewPassword(props: BaseRecoveryComponentProps<"new">) {const user = await db.user.getUser();if (!user) throw new Error(strings.notLoggedIn());- if (!formData?.recoveryKey)- throw new Error("Recovery key is required to reset password.");-if (form.password !== form.confirmPassword)throw new Error("Passwords do not match.");- if (formData?.userResetRequired && !(await db.user.resetUser()))- throw new Error("Failed to reset user.");+ if (formData?.userResetRequired) {+ if (!(await db.user.resetPasswordWithoutRecoveryKey(form.password)))+ throw new Error("Could not reset account password.");++ navigate("final");+ return;+ }++ if (!formData?.recoveryKey)+ throw new Error("Recovery key is required to reset password.");if (!(await db.user.resetPassword({diff --git a/packages/core/src/api/user-manager.ts b/packages/core/src/api/user-manager.tsindex a63622b9c..9af6579e0 100644--- a/packages/core/src/api/user-manager.ts+++ b/packages/core/src/api/user-manager.ts@@ -374,7 +374,7 @@ class UserManager {}changePassword(oldPassword: string, newPassword: string) {- return this._updatePassword("change", {+ return this.updatePassword("change", {old_password: oldPassword,new_password: newPassword});@@ -398,12 +398,60 @@ class UserManager {newPassword: string;encryptionKey: SerializedKey;}) {- return this._updatePassword("reset", {+ return this.updatePassword("reset", {new_password: options.newPassword,encryptionKey: options.encryptionKey});}+ async resetPasswordWithoutRecoveryKey(newPassword: string) {+ if (!newPassword) throw new Error("New password is required.");++ const token = await this.tokenManager.getAccessToken();+ const user = await this.getUser();+ if (!token || !user) throw new Error("You are not logged in.");++ const updateUserPayload: Partial<User> = {};+ const newMasterKey = await this.db+ .storage()+ .generateCryptoKey(newPassword, user.salt);++ updateUserPayload.dataEncryptionKey = await this.keyManager.wrapKey(+ await this.db.crypto().generateRandomKey(),+ newMasterKey+ );++ if (!(await this.resetUser())) throw new Error("Failed to reset user.");++ await http.patch.json(+ `${constants.API_HOST}/users/password/reset`,+ {+ newPassword: await this.db+ .storage()+ .hash(newPassword, user.email.toLowerCase()),+ userKeys: updateUserPayload+ },+ token+ );++ await this.db.storage().deriveCryptoKey({+ password: newPassword,+ salt: user.salt+ });++ this.keyManager.clearCache();+ await this.setUser({+ ...user,+ ...updateUserPayload,+ attachmentsKey: undefined,+ monographPasswordsKey: undefined,+ inboxKeys: undefined,+ legacyDataEncryptionKey: undefined+ });++ return true;+ }+async getDataEncryptionKeys(): Promise<{ version: KeyVersion; key: SerializedKey }[] | undefined> {@@ -667,7 +715,7 @@ class UserManager {}}- async _updatePassword(+ private async updatePassword(type: "change" | "reset",data: {new_password: string;