Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: do not use auth access tokens as normal access tokens

Abdullah Atta714ac2deac0f
diff --git a/packages/core/src/api/token-manager.ts b/packages/core/src/api/token-manager.ts
index 599fcdc60..daf544359 100644
--- a/packages/core/src/api/token-manager.ts
+++ b/packages/core/src/api/token-manager.ts
@@ -82,7 +82,7 @@ class TokenManager {
async getAccessToken(forceRenew = false) {
return await getSafeToken(async () => {
const token = await this.getToken(true, forceRenew);
- if (!token) return;
+ if (!token || token.scope.includes("auth:grant_types")) return;
return token.access_token;
}, "Error getting access token:");
}
diff --git a/packages/core/src/api/user-manager.ts b/packages/core/src/api/user-manager.ts
index 125a7f4d1..dc93155b7 100644
--- a/packages/core/src/api/user-manager.ts
+++ b/packages/core/src/api/user-manager.ts
@@ -99,8 +99,9 @@ class UserManager {
async authenticateMultiFactorCode(code: string, method: string) {
if (!code || !method) throw new Error("code & method are required.");
- const token = await this.tokenManager.getAccessToken();
- if (!token) throw new Error("Unauthorized.");
+ const token = await this.tokenManager.getToken();
+ if (!token || token.scope !== "auth:grant_types:mfa")
+ throw new Error("No token found.");
await this.tokenManager.saveToken(
await http.post(
@@ -111,7 +112,7 @@ class UserManager {
"mfa:code": code,
"mfa:method": method
},
- token
+ token.access_token
)
);
return true;
@@ -126,7 +127,8 @@ class UserManager {
if (!email || !password) throw new Error("email & password are required.");
const token = await this.tokenManager.getToken();
- if (!token) throw new Error("No token found.");
+ if (!token || token.scope !== "auth:grant_types:mfa_password")
+ throw new Error("No token found.");
email = email.toLowerCase();
if (!hashedPassword) {