Merge pull request #153 from import-ai/fix/auth

refactor(auth): organize auth providers into subdirectories

Author: LucienShui

src/auth/auth.module.ts

@@ -15,10 +15,10 @@ import { InternalAuthController } from 'omniboxd/auth/internal.auth.controller';
 import { NamespacesModule } from 'omniboxd/namespaces/namespaces.module';
 import { GroupsModule } from 'omniboxd/groups/groups.module';
 import { PermissionsModule } from 'omniboxd/permissions/permissions.module';
-import { WechatService } from 'omniboxd/auth/wechat.service';
-import { WechatController } from 'omniboxd/auth/wechat.controller';
-import { GoogleService } from 'omniboxd/auth/google.service';
-import { GoogleController } from 'omniboxd/auth/google.controller';
+import { WechatService } from 'omniboxd/auth/wechat/wechat.service';
+import { WechatController } from 'omniboxd/auth/wechat/wechat.controller';
+import { GoogleService } from 'omniboxd/auth/google/google.service';
+import { GoogleController } from 'omniboxd/auth/google/google.controller';
 import { APIKeyModule } from 'omniboxd/api-key/api-key.module';
 import { APIKeyAuthGuard } from 'omniboxd/auth/api-key/api-key-auth.guard';
 import { CookieAuthGuard } from 'omniboxd/auth/cookie/cookie-auth.guard';

src/auth/google.controller.ts renamed to src/auth/google/google.controller.ts

@@ -1,6 +1,6 @@
 import { Request } from 'express';
 import { AuthService } from 'omniboxd/auth/auth.service';
-import { GoogleService } from 'omniboxd/auth/google.service';
+import { GoogleService } from 'omniboxd/auth/google/google.service';
 import { Req, Get, Body, Controller, Post } from '@nestjs/common';
 import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 import { SocialController } from 'omniboxd/auth/social.controller';

src/auth/google.service.ts renamed to src/auth/google/google.service.ts

@@ -5,9 +5,9 @@ import { SocialService } from 'omniboxd/auth/social.service';
 import { UserService } from 'omniboxd/user/user.service';
 import { NamespacesService } from 'omniboxd/namespaces/namespaces.service';
 import {
-  Logger,
-  Injectable,
   BadRequestException,
+  Injectable,
+  Logger,
   UnauthorizedException,
 } from '@nestjs/common';
 
@@ -39,6 +39,7 @@ export class GoogleService extends SocialService {
   private readonly clientId: string;
   private readonly clientSecret: string;
   private readonly redirectUri: string;
+  private readonly googleOAuthAPIUrl: string;
 
   constructor(
     private readonly configService: ConfigService,
@@ -57,6 +58,10 @@ export class GoogleService extends SocialService {
       'OBB_GOOGLE_REDIRECT_URI',
       '',
     );
+    this.googleOAuthAPIUrl = this.configService.get<string>(
+      'OBB_GOOGLE_OAUTH_API_URL',
+      'https://oauth2.googleapis.com',
+    );
   }
 
   getGoogleAuthUrl(): string {
@@ -83,7 +88,7 @@ export class GoogleService extends SocialService {
       throw new UnauthorizedException('Invalid state identifier');
     }
 
-    const tokenResponse = await fetch('https://oauth2.googleapis.com/token', {
+    const tokenResponse = await fetch(`${this.googleOAuthAPIUrl}/token`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',

src/auth/wechat.controller.ts renamed to src/auth/wechat/wechat.controller.ts

@@ -1,7 +1,7 @@
 import { Request } from 'express';
 import { Get, Post, Query, Controller, Req } from '@nestjs/common';
 import { AuthService } from 'omniboxd/auth/auth.service';
-import { WechatService } from 'omniboxd/auth/wechat.service';
+import { WechatService } from 'omniboxd/auth/wechat/wechat.service';
 import { SocialController } from 'omniboxd/auth/social.controller';
 import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 import { UserId } from 'omniboxd/decorators/user-id.decorator';

src/auth/wechat.service.ts renamed to src/auth/wechat/wechat.service.ts

@@ -27,7 +27,7 @@ export class UpdateAttachmentUrls1755499552000 implements MigrationInterface {
         // Replace /api/v1/attachments/images/{id} and
         // /api/v1/attachments/media/{id} with attachments/{id}
         const updatedContent = originalContent.replace(
-          /\/api\/v1\/attachments\/(images|media)\/([a-zA-Z0-9\._-]+)/g,
+          /\/api\/v1\/attachments\/(images|media)\/([a-zA-Z0-9._-]+)/g,
           'attachments/$2',
         );
 

src/migrations/1755499552000-update-attachment-urls.ts

@@ -28,7 +28,7 @@ export class ScanResourceAttachments1755504936756
 
         // Find all attachment references in the format: attachments/{id}
         const attachmentMatches = content.match(
-          /attachments\/([a-zA-Z0-9\._-]+)/g,
+          /attachments\/([a-zA-Z0-9._-]+)/g,
         );
 
         for (const match of attachmentMatches || []) {