260321:1700 Correct Coresspondence / Doing RFA

frontend/lib/services/session.service.ts

@@ -1,7 +1,7 @@
 import apiClient from '@/lib/api/client';
 
 export interface Session {
-  id: string; // tokenId
+  id: number;
   userId: number;
   user: {
     username: string;
@@ -14,10 +14,33 @@ export interface Session {
   isCurrent: boolean;
 }
 
+const extractArrayData = <T,>(value: unknown): T[] => {
+  let current: unknown = value;
+
+  for (let i = 0; i < 5; i += 1) {
+    if (Array.isArray(current)) {
+      return current as T[];
+    }
+
+    if (!current || typeof current !== 'object' || !('data' in current)) {
+      return [];
+    }
+
+    current = (current as { data?: unknown }).data;
+  }
+
+  return Array.isArray(current) ? (current as T[]) : [];
+};
+
+const transformSession = (session: Session | (Omit<Session, 'id'> & { id: string | number })): Session => ({
+  ...session,
+  id: typeof session.id === 'number' ? session.id : Number(session.id),
+});
+
 export const sessionService = {
-  getActiveSessions: async () => {
-    const response = await apiClient.get<Session[] | { data: Session[] }>('/auth/sessions');
-    return (response.data as { data: Session[] }).data ?? response.data;
+  getActiveSessions: async (): Promise<Session[]> => {
+    const response = await apiClient.get<Session[] | { data: Session[] } | { data: { data: Session[] } }>('/auth/sessions');
+    return extractArrayData<Session | (Omit<Session, 'id'> & { id: string | number })>(response.data).map(transformSession);
   },
 
   revokeSession: async (sessionId: number) => {