From dcf6153a0e121725a34e1fa5324a6914322a92e9 Mon Sep 17 00:00:00 2001
From: an-lee <an.lee.work@gmail.com>
Date: Mon, 9 Sep 2024 05:28:49 +0800
Subject: [PATCH] Fix accessToken fetching

---
 enjoy/src/main/db/models/audio.ts                  | 14 ++++++++++----
 enjoy/src/main/db/models/note.ts                   |  8 ++++----
 .../src/main/db/models/pronunciation-assessment.ts |  4 ++--
 enjoy/src/main/db/models/recording.ts              | 13 +++++++++----
 enjoy/src/main/db/models/segment.ts                |  4 ++--
 enjoy/src/main/db/models/speech.ts                 |  4 ++--
 enjoy/src/main/db/models/transcription.ts          |  4 ++--
 enjoy/src/main/db/models/user-setting.ts           | 13 ++++++-------
 enjoy/src/main/db/models/video.ts                  | 14 ++++++++++----
 9 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/enjoy/src/main/db/models/audio.ts b/enjoy/src/main/db/models/audio.ts
index 3c769401..cbbf89c9 100644
--- a/enjoy/src/main/db/models/audio.ts
+++ b/enjoy/src/main/db/models/audio.ts
@@ -14,7 +14,13 @@ import {
   DataType,
   Unique,
 } from "sequelize-typescript";
-import { Recording, Speech, Transcription, Video } from "@main/db/models";
+import {
+  Recording,
+  Speech,
+  Transcription,
+  UserSetting,
+  Video,
+} from "@main/db/models";
 import settings from "@main/settings";
 import { AudioFormats, VideoFormats } from "@/constants";
 import { hashFile } from "@main/utils";
@@ -193,7 +199,7 @@ export class Audio extends Model<Audio> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger: log.scope("audio/sync"),
     });
 
@@ -257,7 +263,7 @@ export class Audio extends Model<Audio> {
   }
 
   @AfterDestroy
-  static cleanupFile(audio: Audio) {
+  static async cleanupFile(audio: Audio) {
     if (audio.filePath) {
       fs.remove(audio.filePath);
     }
@@ -276,7 +282,7 @@ export class Audio extends Model<Audio> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger: log.scope("audio/cleanupFile"),
     });
 
diff --git a/enjoy/src/main/db/models/note.ts b/enjoy/src/main/db/models/note.ts
index 7d7ed25c..71928205 100644
--- a/enjoy/src/main/db/models/note.ts
+++ b/enjoy/src/main/db/models/note.ts
@@ -16,7 +16,7 @@ import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
 import settings from "@main/settings";
-import { Segment } from "@main/db/models";
+import { Segment, UserSetting } from "@main/db/models";
 
 const logger = log.scope("db/models/note");
 @Table({
@@ -61,7 +61,7 @@ export class Note extends Model<Note> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
 
@@ -118,10 +118,10 @@ export class Note extends Model<Note> {
   }
 
   @AfterDestroy
-  static destroyRemote(note: Note) {
+  static async destroyRemote(note: Note) {
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
 
diff --git a/enjoy/src/main/db/models/pronunciation-assessment.ts b/enjoy/src/main/db/models/pronunciation-assessment.ts
index 65140776..73bba781 100644
--- a/enjoy/src/main/db/models/pronunciation-assessment.ts
+++ b/enjoy/src/main/db/models/pronunciation-assessment.ts
@@ -14,7 +14,7 @@ import {
   AfterFind,
 } from "sequelize-typescript";
 import mainWindow from "@main/window";
-import { Recording } from "@main/db/models";
+import { Recording, UserSetting } from "@main/db/models";
 import { Client } from "@/api";
 import settings from "@main/settings";
 import log from "@main/logger";
@@ -102,7 +102,7 @@ export class PronunciationAssessment extends Model<PronunciationAssessment> {
   async sync() {
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger: log.scope("api/client"),
     });
 
diff --git a/enjoy/src/main/db/models/recording.ts b/enjoy/src/main/db/models/recording.ts
index 59d37a52..7df9e293 100644
--- a/enjoy/src/main/db/models/recording.ts
+++ b/enjoy/src/main/db/models/recording.ts
@@ -15,7 +15,12 @@ import {
   HasOne,
 } from "sequelize-typescript";
 import mainWindow from "@main/window";
-import { Audio, PronunciationAssessment, Video } from "@main/db/models";
+import {
+  Audio,
+  PronunciationAssessment,
+  UserSetting,
+  Video,
+} from "@main/db/models";
 import fs from "fs-extra";
 import path from "path";
 import settings from "@main/settings";
@@ -144,7 +149,7 @@ export class Recording extends Model<Recording> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
 
@@ -234,11 +239,11 @@ export class Recording extends Model<Recording> {
   }
 
   @AfterDestroy
-  static cleanupFile(recording: Recording) {
+  static async cleanupFile(recording: Recording) {
     fs.remove(recording.filePath);
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger: log.scope("recording/cleanupFile"),
     });
     webApi.deleteRecording(recording.id);
diff --git a/enjoy/src/main/db/models/segment.ts b/enjoy/src/main/db/models/segment.ts
index 5993102f..e4344d57 100644
--- a/enjoy/src/main/db/models/segment.ts
+++ b/enjoy/src/main/db/models/segment.ts
@@ -13,7 +13,7 @@ import {
   AllowNull,
   AfterFind,
 } from "sequelize-typescript";
-import { Audio, Transcription, Video } from "@main/db/models";
+import { Audio, Transcription, UserSetting, Video } from "@main/db/models";
 import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
@@ -110,7 +110,7 @@ export class Segment extends Model<Segment> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
     return webApi.syncSegment(this.toJSON()).then(() => {
diff --git a/enjoy/src/main/db/models/speech.ts b/enjoy/src/main/db/models/speech.ts
index 244c67fd..f99fcb91 100644
--- a/enjoy/src/main/db/models/speech.ts
+++ b/enjoy/src/main/db/models/speech.ts
@@ -21,7 +21,7 @@ import settings from "@main/settings";
 import OpenAI, { type ClientOptions } from "openai";
 import { t } from "i18next";
 import { hashFile } from "@main/utils";
-import { Audio, Message } from "@main/db/models";
+import { Audio, Message, UserSetting } from "@main/db/models";
 import log from "@main/logger";
 import proxyAgent from "@main/proxy-agent";
 
@@ -180,7 +180,7 @@ export class Speech extends Model<Speech> {
     let openaiConfig: ClientOptions = {};
     if (engine === "enjoyai") {
       openaiConfig = {
-        apiKey: settings.getSync("user.accessToken") as string,
+        apiKey: (await UserSetting.accessToken()) as string,
         baseURL: `${settings.apiUrl()}/api/ai`,
       };
     } else if (engine === "openai") {
diff --git a/enjoy/src/main/db/models/transcription.ts b/enjoy/src/main/db/models/transcription.ts
index 49a55f1d..2006b48b 100644
--- a/enjoy/src/main/db/models/transcription.ts
+++ b/enjoy/src/main/db/models/transcription.ts
@@ -11,7 +11,7 @@ import {
   DataType,
   Unique,
 } from "sequelize-typescript";
-import { Audio, Video } from "@main/db/models";
+import { Audio, UserSetting, Video } from "@main/db/models";
 import mainWindow from "@main/window";
 import log from "@main/logger";
 import { Client } from "@/api";
@@ -81,7 +81,7 @@ export class Transcription extends Model<Transcription> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
     return webApi.syncTranscription(this.toJSON()).then(() => {
diff --git a/enjoy/src/main/db/models/user-setting.ts b/enjoy/src/main/db/models/user-setting.ts
index 795485cc..98047aa0 100644
--- a/enjoy/src/main/db/models/user-setting.ts
+++ b/enjoy/src/main/db/models/user-setting.ts
@@ -33,9 +33,7 @@ export class UserSetting extends Model<UserSetting> {
   @Column(DataType.TEXT)
   value: string;
 
-  static async get(
-    key: UserSettingKeyEnum
-  ): Promise<string | Object | number | null> {
+  static async get(key: UserSettingKeyEnum): Promise<any> {
     const setting = await UserSetting.findOne({ where: { key } });
     if (!setting) return null;
 
@@ -46,10 +44,7 @@ export class UserSetting extends Model<UserSetting> {
     }
   }
 
-  static async set(
-    key: UserSettingKeyEnum,
-    value: object | string
-  ): Promise<void> {
+  static async set(key: UserSettingKeyEnum, value: any): Promise<void> {
     const setting = await UserSetting.findOne({ where: { key } });
 
     if (typeof value === "object") {
@@ -68,6 +63,10 @@ export class UserSetting extends Model<UserSetting> {
     }
   }
 
+  static async accessToken(): Promise<string | null> {
+    return (await UserSetting.get(UserSettingKeyEnum.PROFILE))?.accessToken;
+  }
+
   static async clear(): Promise<void> {
     await UserSetting.destroy({ where: {} });
   }
diff --git a/enjoy/src/main/db/models/video.ts b/enjoy/src/main/db/models/video.ts
index e4580538..58c52f97 100644
--- a/enjoy/src/main/db/models/video.ts
+++ b/enjoy/src/main/db/models/video.ts
@@ -14,7 +14,13 @@ import {
   DataType,
   Unique,
 } from "sequelize-typescript";
-import { Audio, Recording, Speech, Transcription } from "@main/db/models";
+import {
+  Audio,
+  Recording,
+  Speech,
+  Transcription,
+  UserSetting,
+} from "@main/db/models";
 import settings from "@main/settings";
 import { AudioFormats, VideoFormats, WEB_API_URL } from "@/constants";
 import { hashFile } from "@main/utils";
@@ -214,7 +220,7 @@ export class Video extends Model<Video> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger,
     });
 
@@ -279,7 +285,7 @@ export class Video extends Model<Video> {
   }
 
   @AfterDestroy
-  static cleanupFile(video: Video) {
+  static async cleanupFile(video: Video) {
     if (video.filePath) {
       fs.remove(video.filePath);
     }
@@ -292,7 +298,7 @@ export class Video extends Model<Video> {
 
     const webApi = new Client({
       baseUrl: settings.apiUrl(),
-      accessToken: settings.getSync("user.accessToken") as string,
+      accessToken: (await UserSetting.accessToken()) as string,
       logger: log.scope("video/cleanupFile"),
     });