@42ailab/42plugin 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "活水插件",
   "type": "module",
   "main": "src/index.ts",

package/src/api.ts

@@ -288,20 +288,37 @@ class ApiClient {
       }),
     });
 
-    const data = await response.json();
+    // 处理 JSON 解析失败
+    let data: Record<string, unknown>;
+    try {
+      data = await response.json();
+    } catch {
+      return { error: 'invalid_response', errorDescription: 'Invalid response from server' };
+    }
+
+    // 处理空响应
+    if (!data) {
+      return { error: 'empty_response', errorDescription: 'Empty response from server' };
+    }
+
+    // 如果有错误，直接返回错误信息
+    if (data.error) {
+      return {
+        error: data.error as string,
+        errorDescription: data.error_description as string,
+      };
+    }
 
     return {
-      accessToken: data.access_token,
+      accessToken: data.access_token as string,
       user: data.user
         ? {
-            id: data.user.id,
-            name: data.user.name,
-            username: data.user.username,
-            email: data.user.email,
+            id: (data.user as Record<string, unknown>).id as string,
+            name: (data.user as Record<string, unknown>).name as string,
+            username: (data.user as Record<string, unknown>).username as string,
+            email: (data.user as Record<string, unknown>).email as string,
           }
         : undefined,
-      error: data.error,
-      errorDescription: data.error_description,
     };
   }
 

package/src/commands/auth.ts

@@ -66,7 +66,7 @@ async function login(): Promise<void> {
 
       const tokenResponse = await api.pollDeviceToken(deviceCode.deviceCode);
 
-      if (tokenResponse.accessToken && tokenResponse.user) {
+      if (tokenResponse.accessToken) {
         pollSpinner.succeed('授权成功！');
 
         // 保存 token
@@ -74,7 +74,12 @@ async function login(): Promise<void> {
         api.setSessionToken(tokenResponse.accessToken);
 
         console.log();
-        console.log(chalk.green(`欢迎，${tokenResponse.user.name || tokenResponse.user.username || tokenResponse.user.email}！`));
+        try {
+          const session = await api.getSession();
+          console.log(chalk.green(`欢迎，${session.user.name || session.user.username || session.user.email}！`));
+        } catch {
+          console.log(chalk.green('授权成功！'));
+        }
         return;
       }