Merge pull request #71 from solutionchallenge/fix/#70/fix-chat-flow

Fix/#70/fix-chat-flow

Author: zziglet

src/api/auth/login.ts

@@ -6,6 +6,10 @@ interface OAuthResponse {
   refresh_token: string;
 }
 
+interface RefreshReponse {
+  access_token: string;
+}
+
 export const startGoogleLogin = (redirectUri: string) => {
   return `${import.meta.env.VITE_API_BASE_URL}/oauth/google/start?redirect=${encodeURIComponent(redirectUri)}`;
 };
@@ -18,11 +22,11 @@ export const exchangeGoogleCode = async (code: string, redirectUri: string) => {
   return response.response;
 };
 
-export const refreshToken = async (refresh_token: string) => {
-  const response = await http.post<OAuthResponse>("/auth/refresh", {
+export const refreshToken = async (refresh_token: string): Promise<string> => {
+  const response = await http.post<RefreshReponse>("/auth/refresh", {
     refresh_token,
   });
-  return response.response;
+  return response.response.access_token;
 };
 
 export const getUserInfo = async (): Promise<User> => {

src/api/chat/index.ts

@@ -1,17 +1,5 @@
 import { http } from "../fetch";
-
-export interface ChatEmotion {
-  emotion: string;
-  rate: number;
-}
-
-export interface ChatSummary {
-  emotions: ChatEmotion[];
-  keywords: string[];
-  recommendations: string[];
-  text: string;
-  title: string;
-}
+import { EmotionTypes } from "../onboarding/addition";
 
 export interface Chat {
   chat_duration: string;
@@ -25,6 +13,28 @@ export interface Chat {
   user_timezone: string;
 }
 
+export interface ChatSummary {
+  emotions: {
+    emotion: EmotionTypes;
+    rate: 0;
+  }[];
+  keywords: string[];
+  recommendations: string[];
+  text: string;
+  title: string;
+  main_topic: {
+    begin_message_id: string;
+    end_message_id: string;
+  };
+  topic_messages: History[];
+}
+
+export interface ChatSummaryReponse {
+  success: boolean;
+  created: boolean;
+  returning: ChatSummary;
+}
+
 export interface ListChatsResponse {
   chats: Chat[];
 }
@@ -34,11 +44,17 @@ export const listChats = async () => {
   return response;
 };
 
-export const getChatSummary = async (
+export const putChatSummary = async (
   session_id: string
 ): Promise<ChatSummary> => {
-  const { response } = await http.get<Chat>(`/chats/${session_id}`);
-  return response.summary;
+  const { response } = await http.put<ChatSummaryReponse>(
+    `/chats/${session_id}/summary`
+  );
+  if (response.success) {
+    return response.returning;
+  } else {
+    throw new Error("Failed to fetch chat summary.");
+  }
 };
 
 export const archiveChat = async (session_id: string): Promise<void> => {

src/api/fetch.ts

@@ -1,6 +1,12 @@
+import { refreshToken } from "./auth/login";
+
 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
 
-const baseFetch = async (url: RequestInfo, init?: RequestInit) => {
+const baseFetch = async (
+  url: RequestInfo,
+  init?: RequestInit,
+  retry: boolean = true
+) => {
   const accessToken = localStorage.getItem("access_token");
 
   const res = await fetch(`${API_BASE_URL}${url}`, {
@@ -12,9 +18,30 @@ const baseFetch = async (url: RequestInfo, init?: RequestInit) => {
       "Content-Type": "application/json",
     },
   });
+
   if (!res.ok) {
+    if (res.status === 401 && retry) {
+      try {
+        const refresh_token = localStorage.getItem("refresh_token");
+        if (refresh_token) {
+          const newAccessToken = await refreshToken(refresh_token);
+          if (newAccessToken) {
+            localStorage.setItem("access_token", newAccessToken);
+            return baseFetch(url, init, false);
+          }
+        }
+      } catch (e) {
+        console.error("Refresh token failed", e);
+      }
+
+      localStorage.removeItem("access_token");
+      localStorage.removeItem("refresh_token");
+      window.location.href = "/login";
+      return Promise.reject(new Error("Unauthorized, redirected to login"));
+    }
     throw new Error(`HTTP error! status: ${res.status}`);
   }
+
   const json = await res.json();
   return { response: json };
 };

src/api/report/chats.ts

@@ -26,7 +26,6 @@ export interface ChatResponse {
   started_date: string;
   summary: SummaryResponse;
 }
-[];
 
 type History = {
   content: string;

src/api/test/diagnosis.ts

@@ -61,8 +61,8 @@ interface DiagnosisResultRequest {
 
 export const postDiagnosisResult = async (
   result: DiagnosisResultRequest
-): Promise<{ id: number; success: boolean }> => {
-  const { response } = await http.post<{ id: number; success: boolean }>(
+): Promise<{ id: string; success: boolean }> => {
+  const { response } = await http.post<{ id: string; success: boolean }>(
     "/diagnoses",
     result
   );
@@ -79,10 +79,10 @@ interface DiagnosisResultResponse {
 }
 
 export const getDiagnosisResult = async (
-  diagnosis_id: number
+  diagnosis_id: string
 ): Promise<DiagnosisResultResponse> => {
   const { response } = await http.get<DiagnosisResultResponse>(
-    `/diagnosis-papers/${diagnosis_id}`
+    `/diagnoses/${diagnosis_id}`
   );
   return response;
 };