chore: update client generation workflow and enhance admin dependencies

Author: cubxxw

.github/workflows/generate-client.yml

@@ -56,6 +56,10 @@ jobs:
       - name: Install Frontend Dependencies
         run: pnpm install
         working-directory: frontend
+        
+      - name: Install Admin Dependencies
+        run: pnpm install
+        working-directory: admin
 
       # 安装所有后端依赖项
       - name: Install Backend Dependencies
@@ -94,7 +98,9 @@ jobs:
 
       # 6. Stage Generated Files
       - name: Stage Generated Client Files
-        run: git add frontend/src/client # Adjust path if needed
+        run: |
+          git add frontend/app/openapi-client
+          git add admin/src/client
 
       # 7. Handle Changes for Same-Repo Events (Push/PR from same repo)
       - name: Commit and Push Changes (Same Repo)

admin/src/client/sdk.gen.ts

@@ -3,12 +3,13 @@
 import type { CancelablePromise } from './core/CancelablePromise';
 import { OpenAPI } from './core/OpenAPI';
 import { request as __request } from './core/request';
-import type { GoogleOauthGoogleCallbackApiData, GoogleOauthGoogleCallbackApiResponse, GoogleOauthGoogleLoginResponse, GoogleOauthGoogleCallbackData, GoogleOauthGoogleCallbackResponse, HealthGetHealthRootResponse, HealthGetHealthApiResponse, ItemsReadItemsData, ItemsReadItemsResponse, ItemsCreateItemData, ItemsCreateItemResponse, ItemsReadItemData, ItemsReadItemResponse, ItemsUpdateItemData, ItemsUpdateItemResponse, ItemsDeleteItemData, ItemsDeleteItemResponse, LoginLoginAccessTokenData, LoginLoginAccessTokenResponse, LoginTestTokenResponse, LoginLogoutResponse, LoginRecoverPasswordData, LoginRecoverPasswordResponse, LoginResetPasswordData, LoginResetPasswordResponse, LoginRecoverPasswordHtmlContentData, LoginRecoverPasswordHtmlContentResponse, PrivateCreateUserData, PrivateCreateUserResponse, UsersReadUsersData, UsersReadUsersResponse, UsersCreateUserData, UsersCreateUserResponse, UsersReadUserMeResponse, UsersDeleteUserMeResponse, UsersUpdateUserMeData, UsersUpdateUserMeResponse, UsersUpdatePasswordMeData, UsersUpdatePasswordMeResponse, UsersRegisterUserData, UsersRegisterUserResponse, UsersReadUserByIdData, UsersReadUserByIdResponse, UsersUpdateUserData, UsersUpdateUserResponse, UsersDeleteUserData, UsersDeleteUserResponse, UtilsTestEmailData, UtilsTestEmailResponse, UtilsHealthCheckResponse } from './types.gen';
+import type { GoogleOauthGoogleCallbackApiData, GoogleOauthGoogleCallbackApiResponse, GoogleOauthGoogleLoginResponse, GoogleOauthGoogleCallbackData, GoogleOauthGoogleCallbackResponse, HealthGetHealthApiResponse, ItemsReadItemsData, ItemsReadItemsResponse, ItemsCreateItemData, ItemsCreateItemResponse, ItemsReadItemData, ItemsReadItemResponse, ItemsUpdateItemData, ItemsUpdateItemResponse, ItemsDeleteItemData, ItemsDeleteItemResponse, LoginLoginAccessTokenData, LoginLoginAccessTokenResponse, LoginTestTokenResponse, LoginLogoutResponse, LoginRecoverPasswordData, LoginRecoverPasswordResponse, LoginResetPasswordData, LoginResetPasswordResponse, LoginRecoverPasswordHtmlContentData, LoginRecoverPasswordHtmlContentResponse, PrivateCreateUserData, PrivateCreateUserResponse, UsersReadUsersData, UsersReadUsersResponse, UsersCreateUserData, UsersCreateUserResponse, UsersReadUserMeResponse, UsersDeleteUserMeResponse, UsersUpdateUserMeData, UsersUpdateUserMeResponse, UsersUpdatePasswordMeData, UsersUpdatePasswordMeResponse, UsersRegisterUserData, UsersRegisterUserResponse, UsersReadUserByIdData, UsersReadUserByIdResponse, UsersUpdateUserData, UsersUpdateUserResponse, UsersDeleteUserData, UsersDeleteUserResponse, UtilsTestEmailData, UtilsTestEmailResponse, UtilsHealthCheckResponse } from './types.gen';
 
 export class GoogleOauthService {
     /**
      * Google Callback Api
      * Handle Google OAuth callback from frontend
+     * This is maintained for backward compatibility but not used in the new flow
      * @param data The data for the request.
      * @param data.requestBody
      * @returns unknown Successful Response
@@ -29,6 +30,7 @@ export class GoogleOauthService {
     /**
      * Google Login
      * Initiate Google OAuth2 authentication flow
+     * This endpoint redirects to Google's login page
      * @returns unknown Successful Response
      * @throws ApiError
      */
@@ -42,6 +44,7 @@ export class GoogleOauthService {
     /**
      * Google Callback
      * Handle the callback from Google OAuth
+     * This endpoint is called by Google after the user has logged in
      * @param data The data for the request.
      * @param data.code
      * @param data.state
@@ -67,22 +70,8 @@ export class GoogleOauthService {
 }
 
 export class HealthService {
-    /**
-     * Get Health Root
-     * 兼容前端的根级别健康检查路由
-     * @returns unknown Successful Response
-     * @throws ApiError
-     */
-    public static getHealthRoot(): CancelablePromise<HealthGetHealthRootResponse> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/health'
-        });
-    }
-    
     /**
      * Get Health Api
-     * 兼容前端的API级别健康检查路由
      * @returns unknown Successful Response
      * @throws ApiError
      */

admin/src/client/types.gen.ts

@@ -142,8 +142,6 @@ export type GoogleOauthGoogleCallbackData = {
 
 export type GoogleOauthGoogleCallbackResponse = (unknown);
 
-export type HealthGetHealthRootResponse = (unknown);
-
 export type HealthGetHealthApiResponse = (unknown);
 
 export type ItemsReadItemsData = {

frontend/Dockerfile

@@ -12,12 +12,18 @@ COPY package*.json ./
 # Install dependencies as root (or myappuser, depending on your structure)
 RUN pnpm install
 
-## Switch to the non-root user
-USER node
-
 # Copy the rest of your application code
 COPY . .
 
+# Make start.sh executable
+RUN chmod +x start.sh
+
+# Ensure watcher.js is executable
+RUN chmod +x watcher.js
+
+# Use non-root user for security
+USER node
+
 EXPOSE 3000
 
 # Start the application

frontend/app/openapi-client/sdk.gen.ts

@@ -7,8 +7,6 @@ import {
   urlSearchParamsBodySerializer,
 } from "@hey-api/client-axios";
 import type {
-  HealthGetHealthRootError,
-  HealthGetHealthRootResponse,
   HealthGetHealthApiError,
   HealthGetHealthApiResponse,
   LoginLoginAccessTokenData,
@@ -90,26 +88,8 @@ import type {
 
 export const client = createClient(createConfig());
 
-/**
- * Get Health Root
- * 兼容前端的根级别健康检查路由
- */
-export const healthGetHealthRoot = <ThrowOnError extends boolean = false>(
-  options?: OptionsLegacyParser<unknown, ThrowOnError>,
-) => {
-  return (options?.client ?? client).get<
-    HealthGetHealthRootResponse,
-    HealthGetHealthRootError,
-    ThrowOnError
-  >({
-    ...options,
-    url: "/health",
-  });
-};
-
 /**
  * Get Health Api
- * 兼容前端的API级别健康检查路由
  */
 export const healthGetHealthApi = <ThrowOnError extends boolean = false>(
   options?: OptionsLegacyParser<unknown, ThrowOnError>,
@@ -530,6 +510,7 @@ export const itemsDeleteItem = <ThrowOnError extends boolean = false>(
 /**
  * Google Callback Api
  * Handle Google OAuth callback from frontend
+ * This is maintained for backward compatibility but not used in the new flow
  */
 export const googleOauthGoogleCallbackApi = <
   ThrowOnError extends boolean = false,
@@ -549,6 +530,7 @@ export const googleOauthGoogleCallbackApi = <
 /**
  * Google Login
  * Initiate Google OAuth2 authentication flow
+ * This endpoint redirects to Google's login page
  */
 export const googleOauthGoogleLogin = <ThrowOnError extends boolean = false>(
   options?: OptionsLegacyParser<unknown, ThrowOnError>,
@@ -566,6 +548,7 @@ export const googleOauthGoogleLogin = <ThrowOnError extends boolean = false>(
 /**
  * Google Callback
  * Handle the callback from Google OAuth
+ * This endpoint is called by Google after the user has logged in
  */
 export const googleOauthGoogleCallback = <ThrowOnError extends boolean = false>(
   options?: OptionsLegacyParser<GoogleOauthGoogleCallbackData, ThrowOnError>,

frontend/app/openapi-client/types.gen.ts

@@ -126,10 +126,6 @@ export type ValidationError = {
   type: string;
 };
 
-export type HealthGetHealthRootResponse = unknown;
-
-export type HealthGetHealthRootError = unknown;
-
 export type HealthGetHealthApiResponse = unknown;
 
 export type HealthGetHealthApiError = unknown;

frontend/openapi.json

@@ -1,7 +1,23 @@
 #!/bin/bash
 
+# 确保脚本具有可执行权限
+if [ ! -x "$0" ]; then
+  echo "Setting executable permission on script"
+  chmod +x "$0"
+fi
+
+# 确保watcher脚本有可执行权限
+if [ -f "./watcher.js" ] && [ ! -x "./watcher.js" ]; then
+  echo "Setting executable permission on watcher.js"
+  chmod +x "./watcher.js"
+fi
+
+# 启动Next.js应用
+echo "Starting Next.js application..."
 pnpm run dev &
 
+# 启动watcher脚本监视OpenAPI文件变化
+echo "Starting watcher..."
 node watcher.js
 
 wait

frontend/start.sh

@@ -31,7 +31,22 @@ fi
 
 cd admin
 echo "Generating TypeScript client from schema"
-pnpm run generate-client
+
+# 检查node_modules目录是否存在，如果不存在则安装依赖
+if [ ! -d "node_modules" ]; then
+  echo "⚠️ node_modules directory not found in admin directory"
+  echo "📦 Installing dependencies..."
+  pnpm install || {
+    echo "❌ Failed to install dependencies with pnpm"
+    exit 1
+  }
+  echo "✅ Dependencies installed successfully"
+fi
+
+pnpm run generate-client || {
+  echo "❌ Failed to generate client"
+  exit 1
+}
 
 echo "🧹 Formatting generated client code..."
 pnpm exec biome format --write ./src/client || {