Skip to content

Commit d0b6203

Browse files
committed
Refactor code and update storage mechanism
1 parent f2ea8f9 commit d0b6203

File tree

4 files changed

+35
-11
lines changed

4 files changed

+35
-11
lines changed

src/config/settings.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ export default {
1818
tasks: "tasks.json",
1919
authcode: "auth_code.db",
2020
user_profile: "user_profile.json",
21+
},
22+
constants: {
23+
access_token: "access_token",
24+
tasks: "tasks",
25+
authcode: "auth_code",
26+
user_profile: "user_profile",
2127
}
2228
},
2329
api: {

src/helpers/StoreDb.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import {Store} from 'tauri-plugin-store-api';
2+
3+
4+
export default new Store('.settings.dat');

src/helpers/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ export function loadCode() {
3636

3737
export type GreetResponse = { message: string }
3838
export type SaveTokenResponse = { message: string; token: string; success: boolean }
39-
export type SaveAccessTokenResponse = { message: string; success: boolean; token: AccessToken }
39+
export type SaveAccessTokenResponse ={ message: string; success: boolean; token: AccessToken }
4040
export type AccessToken = { access_token: string; expires_in: number; refresh_token: string; scope: string; token_type: string; id_token: string }

src/helpers/invoker.ts

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
import { invoke } from '@tauri-apps/api/tauri';
22
import * as commands from './commands';
3-
import { AccessToken } from './commands';
3+
import { AccessToken, SaveAccessTokenResponse, SaveTokenResponse } from './commands';
4+
import StoreDb from './StoreDb';
5+
import settings from '../config/settings';
6+
7+
8+
const storeConstant = settings.storage.constants;
9+
10+
export async function save_auth_code(code: string) : Promise<SaveTokenResponse> {
11+
// return await commands.saveCode(code);
12+
await StoreDb.set(storeConstant.authcode, code);
13+
return { message: "Code saved", token: code, success: true };
14+
415

5-
export async function save_auth_code(code: string) {
6-
return await commands.saveCode(code);
716
}
817

9-
export async function get_auth_code() {
10-
return await commands.loadCode();
18+
export async function get_auth_code() : Promise<string> {
19+
// return await commands.loadCode();
20+
return await StoreDb.get<string>(storeConstant.authcode) ?? "";
21+
1122
}
1223

13-
export async function save_access_token(token: string|AccessToken) {
14-
const accessTokenText: string = typeof token === "string" ? token : JSON.stringify(token, null, 2);
15-
return await commands.saveAccessToken(accessTokenText);
24+
export async function save_access_token(token: string|AccessToken) : Promise<SaveAccessTokenResponse> {
25+
const accessTokenText: AccessToken = typeof token === "string" ? JSON.parse(token) : token;
26+
// return await commands.saveAccessToken(accessTokenText);
27+
await StoreDb.set(storeConstant.access_token, accessTokenText);
28+
return { message: "Token saved", success: true, token: token as AccessToken };
1629
}
1730

18-
export async function get_access_token() {
19-
return await commands.loadAccessToken();
31+
export async function get_access_token() : Promise<AccessToken> {
32+
// return await commands.loadAccessToken();
33+
return await StoreDb.get<AccessToken>(storeConstant.access_token) ?? {} as AccessToken;
2034
}
2135

2236
export async function test_command() {

0 commit comments

Comments
 (0)