feat: Always return token in auth callback, do callback redirect to FE

medusajs · Sep 4, 2024 · 15c12bf · 15c12bf
1 parent b57add0
commit 15c12bf
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 31 deletions.
diff --git a/packages/core/types/src/auth/common/provider.ts b/packages/core/types/src/auth/common/provider.ts
@@ -33,15 +33,6 @@ export type AuthenticationResponse = {
    * specified location.
    */
   location?: string
-
-  /**
-   * Some authentication providers support redirecting to a specified URL on
-   * success. In those cases, the URL to redirect to is set in this field.
-   *
-   * So, if `success` is true, there's no `location` set, and this field
-   * is set, you can redirect to this URL.
-   */
-  successRedirectUrl?: string
 }
 
 /**

diff --git a/packages/core/types/src/auth/providers/github.ts b/packages/core/types/src/auth/providers/github.ts
@@ -2,5 +2,4 @@ export interface GithubAuthProviderOptions {
   clientId: string
   clientSecret: string
   callbackUrl: string
-  successRedirectUrl?: string
 }
diff --git a/packages/core/types/src/auth/providers/google.ts b/packages/core/types/src/auth/providers/google.ts
@@ -2,5 +2,4 @@ export interface GoogleAuthProviderOptions {
   clientId: string
   clientSecret: string
   callbackUrl: string
-  successRedirectUrl?: string
 }
diff --git a/packages/core/types/src/auth/service.ts b/packages/core/types/src/auth/service.ts
@@ -46,12 +46,12 @@ export interface IAuthModuleService extends IModuleService {
    */
   authenticate(
     provider: string,
-    providerData: AuthenticationInput,
+    providerData: AuthenticationInput
   ): Promise<AuthenticationResponse>
 
   register(
     provider: string,
-    providerData: AuthenticationInput,
+    providerData: AuthenticationInput
   ): Promise<AuthenticationResponse>
 
   /**
@@ -76,7 +76,7 @@ export interface IAuthModuleService extends IModuleService {
    * `req` is an instance of the `MedusaRequest` object:
    *
    * ```ts
-   * const { success, authIdentity, error, successRedirectUrl } =
+   * const { success, authIdentity, error } =
    *   await authModuleService.validateCallback("google", {
    *     url: req.url,
    *     headers: req.headers,

diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts
@@ -41,8 +41,10 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
     protocol: req.protocol,
   } as AuthenticationInput
 
-  const { success, error, authIdentity, successRedirectUrl } =
-    await service.validateCallback(auth_provider, authData)
+  const { success, error, authIdentity } = await service.validateCallback(
+    auth_provider,
+    authData
+  )
 
   const entityIdKey = `${actor_type}_id`
   const entityId = authIdentity?.app_metadata?.[entityIdKey] as
@@ -71,13 +73,6 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
       }
     )
 
-    if (successRedirectUrl) {
-      const url = new URL(successRedirectUrl!)
-      url.searchParams.append("access_token", token)
-
-      return res.redirect(url.toString())
-    }
-
     return res.json({ token })
   }
 

diff --git a/packages/modules/providers/auth-github/integration-tests/__tests__/services.spec.ts b/packages/modules/providers/auth-github/integration-tests/__tests__/services.spec.ts
@@ -81,7 +81,6 @@ describe("Github auth provider", () => {
       {
         clientId: "test",
         clientSecret: "test",
-        successRedirectUrl: baseUrl,
         callbackUrl: `${baseUrl}/auth/github/callback`,
       }
     )
@@ -179,7 +178,6 @@ describe("Github auth provider", () => {
 
     expect(res).toEqual({
       success: true,
-      successRedirectUrl: baseUrl,
       authIdentity: {
         provider_identities: [
           {
@@ -232,7 +230,6 @@ describe("Github auth provider", () => {
 
     expect(res).toEqual({
       success: true,
-      successRedirectUrl: baseUrl,
       authIdentity: {
         provider_identities: [
           {

diff --git a/packages/modules/providers/auth-github/src/services/github.ts b/packages/modules/providers/auth-github/src/services/github.ts
@@ -122,7 +122,6 @@ export class GithubAuthService extends AbstractAuthModuleProvider {
       return {
         success,
         authIdentity,
-        successRedirectUrl: this.config_.successRedirectUrl,
       }
     } catch (error) {
       return { success: false, error: error.message }

diff --git a/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts b/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts
@@ -80,7 +80,6 @@ describe("Google auth provider", () => {
       {
         clientId: "test",
         clientSecret: "test",
-        successRedirectUrl: baseUrl,
         callbackUrl: `${baseUrl}/auth/google/callback`,
       }
     )
@@ -178,7 +177,6 @@ describe("Google auth provider", () => {
 
     expect(res).toEqual({
       success: true,
-      successRedirectUrl: baseUrl,
       authIdentity: {
         provider_identities: [
           {
@@ -221,7 +219,6 @@ describe("Google auth provider", () => {
 
     expect(res).toEqual({
       success: true,
-      successRedirectUrl: baseUrl,
       authIdentity: {
         provider_identities: [
           {

diff --git a/packages/modules/providers/auth-google/src/services/google.ts b/packages/modules/providers/auth-google/src/services/google.ts
@@ -109,7 +109,6 @@ export class GoogleAuthService extends AbstractAuthModuleProvider {
       return {
         success,
         authIdentity,
-        successRedirectUrl: this.config_.successRedirectUrl,
       }
     } catch (error) {
       return { success: false, error: error.message }