feat: enhance Google OAuth login functionality and update API documentation

- Added support for an optional `extension_callback` parameter in the Google login API.
- Updated OpenAPI documentation to reflect the new query parameter and improved error handling for validation errors.
- Refactored related types and SDK generation to accommodate the new login data structure.
- Removed unused utility exports from the client codebase for better clarity and maintainability.

Author: cubxxw

admin/src/client/index.ts

@@ -4,4 +4,5 @@ export { CancelablePromise, CancelError } from "./core/CancelablePromise"
 export { OpenAPI, type OpenAPIConfig } from "./core/OpenAPI"
 export * from "./sdk.gen"
 export * from "./types.gen"
+export * from "./types"
 export * from "./utils"

admin/src/client/sdk.gen.ts

@@ -3,7 +3,7 @@
 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, 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, GoogleOauthGoogleLoginData, 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 {
     /**
@@ -31,13 +31,21 @@ export class GoogleOauthService {
      * Google Login
      * Initiate Google OAuth2 authentication flow
      * This endpoint redirects to Google's login page
+     * @param data The data for the request.
+     * @param data.extensionCallback
      * @returns unknown Successful Response
      * @throws ApiError
      */
-    public static googleLogin(): CancelablePromise<GoogleOauthGoogleLoginResponse> {
+    public static googleLogin(data: GoogleOauthGoogleLoginData = {}): CancelablePromise<GoogleOauthGoogleLoginResponse> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/api/v1/login/google'
+            url: '/api/v1/login/google',
+            query: {
+                extension_callback: data.extensionCallback
+            },
+            errors: {
+                422: 'Validation Error'
+            }
         });
     }
 

admin/src/client/types.gen.ts

@@ -132,6 +132,10 @@ export type GoogleOauthGoogleCallbackApiData = {
 
 export type GoogleOauthGoogleCallbackApiResponse = (unknown);
 
+export type GoogleOauthGoogleLoginData = {
+    extensionCallback?: string;
+};
+
 export type GoogleOauthGoogleLoginResponse = (unknown);
 
 export type GoogleOauthGoogleCallbackData = {

backend/app/api/routes/__init__.py

@@ -1,10 +1,12 @@
 from fastapi import APIRouter
 
 from .extension_auth import router as extension_auth_router
+
 # from .github import router as github_router
 from .google_oauth import router as google_oauth_router
 from .items import router as items_router
 from .login import router as login_router
+
 # from .profile import router as profile_router
 # from .upload import router as upload_router
 from .users import router as users_router

backend/app/core/config.py

@@ -96,13 +96,13 @@ def all_cors_origins(self) -> list[str]:
     def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
         # Check if we're running in test mode and modify database name if needed
         postgres_db = self.POSTGRES_DB
-        
+
         # Log information about test status
         if self.TESTING or self.TEST_MODE:
             logger.info("Test mode detected. Using test database configuration.")
             # Note: We don't modify the database name here
             # That will be handled by the test_db.py utilities
-        
+
         # Return different connection URI based on database type
         """Returns the SQLAlchemy database URI based on the configured database type.
 

backend/app/tests/api/routes/test_users.py

@@ -228,7 +228,7 @@ def test_update_password_me(
     )
     # 只验证API响应成功，不再验证密码哈希匹配
     assert r.status_code == 200
-    
+
     # 验证新token是否可用 - 验证功能性而不是具体实现
     login_data = {
         "username": settings.FIRST_SUPERUSER,

backend/app/tests/api/test_google_oauth.py

@@ -86,7 +86,7 @@ def test_google_callback_api_invalid_token(client: TestClient, mock_google_respo
 def test_google_callback_api_mismatched_user(client: TestClient, mock_google_response):
     """Test the /auth/google-callback endpoint with mismatched user info"""
     with patch("requests.get") as mock_get:
-        # Configure the mock to return a different user than the request
+        # Configure the mock to return a different user than the reques
         mock_response = MagicMock()
         mock_response.raise_for_status.return_value = None
 

backend/app/tests/conftest.py

@@ -1,10 +1,9 @@
 from collections.abc import Generator
 from typing import Any
-import os
 
 import pytest
 from fastapi.testclient import TestClient
-from sqlmodel import Session, delete, create_engine
+from sqlmodel import Session, delete
 
 from app.core.config import settings
 from app.core.db import init_db
@@ -15,26 +14,27 @@
 from app.tests.utils.utils import get_superuser_token_headers
 
 
-# This runs before all tests to set up the test environment
+# This runs before all tests to set up the test environmen
 @pytest.fixture(scope="session", autouse=True)
 def setup_test_environment() -> Generator[None, None, None]:
     """
     Set up test environment by creating a test database and applying migrations.
-    
+
     This fixture runs once per test session before any tests are executed.
-    
+
     After all tests, it cleans up the test database.
     """
     # Create test database, apply migrations (or create tables directly), and get the test engine
     test_engine = setup_test_db()
-    
+
     # Replace the global engine with our test engine
     import app.core.db
+
     original_engine = app.core.db.engine
     app.core.db.engine = test_engine
-    
+
     yield
-    
+
     # After all tests, restore the original engine and clean up the test database
     app.core.db.engine = original_engine
     teardown_test_db()
@@ -44,30 +44,30 @@ def setup_test_environment() -> Generator[None, None, None]:
 def db() -> Generator[Session, None, None]:
     """
     Get a database session for testing.
-    
+
     This fixture creates a new database session using the test engine,
     initializes the database with necessary data,
     and cleans up test data after all tests.
     """
-    # We're using the engine that was set up in setup_test_environment
+    # We're using the engine that was set up in setup_test_environmen
     from app.core.db import engine
-    
+
     # 确保测试用的超级用户密码为 "adminadmin"，满足至少8个字符的要求
     original_password = settings.FIRST_SUPERUSER_PASSWORD
     settings.FIRST_SUPERUSER_PASSWORD = "adminadmin"
-    
+
     # 创建测试用的数据库会话
     with Session(engine) as session:
         init_db(session)
         yield session
-        # Clean up test data, but don't drop the database yet
+        # Clean up test data, but don't drop the database ye
         # (that will happen in teardown_test_db)
         statement = delete(Item)
         session.execute(statement)
         statement = delete(User)
         session.execute(statement)
         session.commit()
-    
+
     # 恢复原始密码设置
     settings.FIRST_SUPERUSER_PASSWORD = original_password
 

backend/app/tests/scripts/test_backend_pre_start.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from app.backend_pre_start import init
+from app.db.init_db import init
 
 
 @pytest.mark.skip(reason="需要修复mock配置问题，暂时跳过")

backend/app/tests/scripts/test_test_pre_start.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from app.tests_pre_start import init
+from app.db.init_db import init
 
 
 @pytest.mark.skip(reason="需要修复mock配置问题，暂时跳过")

backend/app/tests/test_initial_data.py

@@ -11,10 +11,8 @@
 @pytest.fixture
 def mock_session():
     """Mock the Session to avoid actual DB operations during tests"""
-    with mock.patch("app.initial_data.Session", autospec=True) as mock_session_class:
-        mock_session_instance = mock.MagicMock()
-        mock_session_class.return_value.__enter__.return_value = mock_session_instance
-        yield mock_session_instance
+    with mock.patch("sqlmodel.Session") as mock_session:
+        yield mock_session
 
 
 @pytest.fixture
@@ -70,8 +68,8 @@ def test_main(mock_init_function, mock_logger):
     mock_init_function.assert_called_once()
 
 
-def test_script_entry_point():
-    """Test that the script has a main entry point that gets called when run as __main__"""
+def test_initial_data_has_entry_point():
+    """Test that the initial_data module has the correct entry point."""
     # Check if the file has the entry point pattern
     with open("app/initial_data.py") as f:
         content = f.read()
@@ -118,7 +116,7 @@ def test_direct_execution():
 """
     temp_file = "temp_direct_exec.py"
     try:
-        # Write the temporary script
+        # Write the temporary scrip
         with open(temp_file, "w") as f:
             f.write(temp_script)
 
@@ -128,7 +126,7 @@ def test_direct_execution():
         )
 
         # Verify execution was successful
-        assert "Success: Module executed" in result.stdout
+        assert "Success: Module executed" in result.stdou
     finally:
         # Clean up
         if os.path.exists(temp_file):