fix: redirect url bug when google login callback

Author: winverse

apps/server/src/app.mts

@@ -2,7 +2,7 @@ import Fastify from 'fastify'
 import formbody from '@fastify/formbody'
 import cookie from '@fastify/cookie'
 import { ENV } from '@env'
-import routes from '@routes/index.js'
+import routes from '@routes/index.mjs'
 import multer from 'fastify-multer'
 import validatorCompilerPlugin from '@plugins/global/validatorCompilerPlugin.mjs'
 import authPlugin from '@plugins/global/authPlugin.mjs'

apps/server/src/lib/utils/UtilsService.ts

@@ -5,6 +5,7 @@ import { fileURLToPath } from 'url'
 import { z } from 'zod'
 import { customAlphabet } from 'nanoid'
 import nanoidDictionary from 'nanoid-dictionary'
+import { UtilsService as Utils } from '@packages/library/utils'
 
 interface Service {
   resolveDir(dir: string): string
@@ -28,7 +29,7 @@ interface Service {
 
 @injectable()
 @singleton()
-export class UtilsService implements Service {
+export class UtilsService extends Utils implements Service {
   public resolveDir(dir: string): string {
     const __filename = fileURLToPath(import.meta.url)
     const splited = dirname(__filename).split('/src')

apps/server/src/routes/auth/index.ts renamed to apps/server/src/routes/auth/index.mts

@@ -1,4 +1,4 @@
-import v3 from './v3/index.js'
+import v3 from './v3/index.mjs'
 
 import { FastifyPluginCallback } from 'fastify'
 

apps/server/src/routes/auth/v3/index.ts renamed to apps/server/src/routes/auth/v3/index.mts

@@ -1,4 +1,4 @@
-import socialRoute from '@routes/auth/v3/social/index.js'
+import socialRoute from '@routes/auth/v3/social/index.mjs'
 import { FastifyPluginCallback } from 'fastify'
 
 const v3: FastifyPluginCallback = (fastify, opts, done) => {

apps/server/src/routes/auth/v3/social/SocialController.ts renamed to apps/server/src/routes/auth/v3/social/SocialController.mts

@@ -20,6 +20,7 @@ import { UnauthorizedError } from '@errors/UnauthorizedError.js'
 import { ConfilctError } from '@errors/ConfilctError.js'
 import { BadRequestError } from '@errors/BadRequestErrors.js'
 import { NotFoundError } from '@errors/NotfoundError.js'
+import { UtilsService } from '@lib/utils/UtilsService.js'
 
 interface Controller {
   googleCallback(request: FastifyRequest<{ Querystring: { code: string } }>): Promise<void>
@@ -46,6 +47,7 @@ export class SocialController implements Controller {
     private readonly cookie: CookieService,
     private readonly file: FileService,
     private readonly b2Manager: B2ManagerService,
+    private readonly utils: UtilsService,
     private readonly externalInterationService: ExternalIntegrationService,
   ) {}
   private get redirectUri(): string {
@@ -138,7 +140,7 @@ export class SocialController implements Controller {
           maxAge: Time.ONE_DAY_IN_S * 30,
         })
 
-        const redirectUrl = ENV.clientV3Host
+        const redirectHost = ENV.clientV3Host
         const state = queryState
           ? (JSON.parse(queryState) as { next: string; integrateState?: string })
           : null
@@ -154,7 +156,10 @@ export class SocialController implements Controller {
           }
         }
 
-        reply.redirect(decodeURI(redirectUrl.concat(next)))
+        const redirectUri = this.utils
+          .removeKoreanChars(decodeURI(redirectHost.concat(next)))
+          .trim()
+        reply.redirect(redirectUri)
         return
       }
     }

apps/server/src/routes/auth/v3/social/index.ts renamed to apps/server/src/routes/auth/v3/social/index.mts

@@ -1,4 +1,4 @@
-import { SocialController } from '@routes/auth/v3/social/SocialController.js'
+import { SocialController } from '@routes/auth/v3/social/SocialController.mjs'
 import { SocialProvider } from '@services/SocialService/SocialServiceInterface.js'
 import { FastifyPluginCallback, FastifyReply, FastifyRequest } from 'fastify'
 import { container } from 'tsyringe'

apps/server/src/routes/files/index.ts renamed to apps/server/src/routes/files/index.mts

@@ -1,5 +1,5 @@
 import { FastifyPluginCallback } from 'fastify'
-import v3 from './v3/index.js'
+import v3 from './v3/index.mjs'
 
 const filesRoute: FastifyPluginCallback = (fastify, opts, done) => {
   fastify.register(v3, { prefix: '/v3' })

apps/server/src/routes/files/v3/filesController.ts renamed to apps/server/src/routes/files/v3/filesController.mts

@@ -1,6 +1,6 @@
 import { injectable, singleton } from 'tsyringe'
 import { AwsService } from '@lib/aws/AwsService.js'
-import { CreateUrlBody, UploadBody } from './schema.js'
+import { CreateUrlBody, UploadBody } from './schema.mjs'
 import { UnauthorizedError } from '@errors/UnauthorizedError.js'
 import { UserService } from '@services/UserService/index.js'
 import { DbService } from '@lib/db/DbService.js'

apps/server/src/routes/files/v3/index.ts renamed to apps/server/src/routes/files/v3/index.mts

@@ -1,8 +1,8 @@
 import { FastifyPluginCallback } from 'fastify'
 import { container } from 'tsyringe'
 import multer from 'fastify-multer'
-import { CreateUrlBody, UploadBody, createUrlBodySchema } from './schema.js'
-import { FilesController } from './filesController.js'
+import { CreateUrlBody, UploadBody, createUrlBodySchema } from './schema.mjs'
+import { FilesController } from './filesController.mjs'
 import authGuardPlugin from '@plugins/encapsulated/authGuardPlugin.js'
 
 const v3: FastifyPluginCallback = (fastify, opts, done) => {

apps/server/src/routes/files/v3/schema.ts renamed to apps/server/src/routes/files/v3/schema.mts

@@ -1,6 +1,6 @@
-import authRoute from '@routes/auth/index.js'
-import postsRoute from '@routes/posts/index.js'
-import filesRoute from '@routes/files/index.js'
+import authRoute from '@routes/auth/index.mjs'
+import postsRoute from '@routes/posts/index.mjs'
+import filesRoute from '@routes/files/index.mjs'
 import { format } from 'date-fns'
 import type { FastifyPluginCallback } from 'fastify'
 

apps/server/src/routes/index.ts renamed to apps/server/src/routes/index.mts

@@ -1,4 +1,4 @@
-import v3 from './v3/index.js'
+import v3 from './v3/index.mjs'
 
 import { FastifyPluginCallback } from 'fastify'
 

apps/server/src/routes/posts/index.ts renamed to apps/server/src/routes/posts/index.mts

@@ -1,6 +1,6 @@
 import { HttpStatus } from '@constants/HttpStatusConstants.js'
 import { HttpStatusMessage } from '@constants/HttpStatusMesageConstants.js'
-import { postScoreParamsSchema } from '@routes/posts/v3/schame.js'
+import { postScoreParamsSchema } from '@routes/posts/v3/schame.mjs'
 import { PostService } from '@services/PostService/index.js'
 import { FastifyPluginCallback } from 'fastify'
 import { FromSchema } from 'json-schema-to-ts'

apps/server/src/routes/posts/v3/index.ts renamed to apps/server/src/routes/posts/v3/index.mts

@@ -4,7 +4,8 @@ import nanoidDictionary from 'nanoid-dictionary'
 interface Service {
   escapeForUrl(text: string): string
   randomString(): string
-  sleep(ms: number): Promise<any>
+  sleep(ms: number): Promise<void>
+  removeKoreanChars(str: string): string
 }
 
 export class UtilsService implements Service {
@@ -23,7 +24,10 @@ export class UtilsService implements Service {
     const generateCode = customAlphabet(nanoidDictionary.alphanumeric, size)
     return generateCode()
   }
-  public sleep(ms: number) {
+  public sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms))
   }
+  public removeKoreanChars(str: string): string {
+    return str.replace(/[\uAC00-\uD7A3\u3131-\u3163]/g, '')
+  }
 }