fix token assignment
Seto Elkahfi committed
Aug 1, 2024 at 13:59 UTC
824cb280567b00115fc1f95dc4d4dc86122188c2
3 files changed
+4
-5
frontend/splitfire-desktop/app/login/page.tsx
+2
-3
@@ -38,13 +38,13 @@ export default function Page() {
38
return;
39
}
40
// Sanity check
41
- if (response.user === null || response.accessToken === null) {
41
+ if (response.user === null || response.access_token === null) {
42
console.error("Login failed", response);
43
return;
44
}
45
46
let currentUser: CurrentUser = {
47
- accessToken: response.accessToken,
47
+ accessToken: response.access_token,
48
type: CurrentUserType.MAIN,
49
user: response.user,
50
mode: Mode.Vocal
@@ -53,7 +53,6 @@ export default function Page() {
53
// Update UserContext
54
update(currentUser);
55
56
- setState(State.LOADED);
56
router.push("/");
57
};
58
frontend/splitfire-desktop/models/account.ts
+1
-1
@@ -4,6 +4,6 @@ import User from "@/app/_src/models/user";
4
export interface AccountLoginResponse {
5
status: TauriResponse,
6
message: string,
7
- accessToken: string | null,
7
+ access_token: string | null,
8
user: User | null
9
}
frontend/splitfire-desktop/src-tauri/src/rest/account.rs
+1
-1
@@ -58,6 +58,7 @@ pub async fn account_login(username: String, password: String) -> AccountLoginRe
58
};
59
}
60
};
61
+ debug!("Token: {:?}", token);
62
let res: LoginResponse = match response.json().await {
63
Ok(json) => json,
64
Err(e) => {
@@ -70,7 +71,6 @@ pub async fn account_login(username: String, password: String) -> AccountLoginRe
71
};
72
}
73
};
73
-
74
debug!("Login response: {:?}", res);
75
AccountLoginResponse {
76
status: TauriResponse::Success,