fix(server): remove default auth redirect url (#8140)

packages/backend/server/src/core/auth/controller.ts

@@ -138,8 +138,7 @@ export class AuthController {
     res: Response,
     email: string,
     callbackUrl = '/magic-link',
-
-    redirectUrl = this.url.home
+    redirectUrl?: string
   ) {
     // send email magic link
     const user = await this.user.findUserByEmail(email);
@@ -155,7 +154,11 @@ export class AuthController {
     const magicLink = this.url.link(callbackUrl, {
       token,
       email,
-      redirect_uri: redirectUrl,
+      ...(redirectUrl
+        ? {
+            redirect_uri: redirectUrl,
+          }
+        : {}),
     });
 
     const result = await this.auth.sendSignInEmail(email, magicLink, !user);

packages/backend/server/src/plugins/oauth/controller.ts

@@ -18,7 +18,6 @@ import {
   OauthAccountAlreadyConnected,
   OauthStateExpired,
   UnknownOauthProvider,
-  URLHelper,
 } from '../../fundamentals';
 import { OAuthProviderName } from './config';
 import { OAuthAccount, Tokens } from './providers/def';
@@ -31,7 +30,6 @@ export class OAuthController {
     private readonly auth: AuthService,
     private readonly oauth: OAuthService,
     private readonly user: UserService,
-    private readonly url: URLHelper,
     private readonly providerFactory: OAuthProviderFactory,
     private readonly db: PrismaClient
   ) {}
@@ -41,7 +39,7 @@ export class OAuthController {
   @HttpCode(HttpStatus.OK)
   async preflight(
     @Body('provider') unknownProviderName?: string,
-    @Body('redirect_uri') redirectUri: string = this.url.home
+    @Body('redirect_uri') redirectUri?: string
   ) {
     if (!unknownProviderName) {
       throw new MissingOauthQueryParameter({ name: 'provider' });

packages/frontend/core/src/pages/auth/magic-link.tsx

@@ -58,10 +58,7 @@ export const Component = () => {
     auth
       .signInMagicLink(data.email, data.token)
       .then(() => {
-        // compatible with old client
-        if (data.redirectUri) {
-          nav(data.redirectUri);
-        }
+        nav(data.redirectUri ?? '/');
       })
       .catch(e => {
         nav(`/signIn?error=${encodeURIComponent(e.message)}`);

packages/frontend/core/src/pages/auth/oauth-callback.tsx

@@ -60,9 +60,8 @@ export const Component = () => {
     auth
       .signInOauth(data.code, data.state)
       .then(({ redirectUri }) => {
-        if (redirectUri) {
-          nav(redirectUri);
-        }
+        // TODO(@forehalo): need a good way to go back to previous tab and close current one
+        nav(redirectUri ?? '/');
       })
       .catch(e => {
         nav(`/signIn?error=${encodeURIComponent(e.message)}`);