From e08dcd798af28306ae1ab3a6afdaf8b2892ffaea Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 17 Dec 2025 14:30:11 -0800
Subject: [PATCH] Change Google login url to map to spring's default oauth auth
 endpoint

---
 src/app/login/login-home/login-home.component.ts                | 2 +-
 .../register-google-user-already-exists.component.ts            | 2 +-
 src/app/register/register-user-complete.component.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/login/login-home/login-home.component.ts b/src/app/login/login-home/login-home.component.ts
index 6412e298f5a..0aec72e69cd 100644
--- a/src/app/login/login-home/login-home.component.ts
+++ b/src/app/login/login-home/login-home.component.ts
@@ -121,7 +121,7 @@ export class LoginHomeComponent implements OnInit {
   getRedirectUrl(social: string): string {
     let redirectUrl = '';
     if (social === 'google') {
-      redirectUrl = `${this.configService.getContextPath()}/api/google-login?redirectUrl=${this.userService.getRedirectUrl()}`;
+      redirectUrl = `${this.configService.getContextPath()}/oauth2/authorization/google?redirectUrl=${this.userService.getRedirectUrl()}`;
     } else if (social === 'microsoft') {
       redirectUrl = `/api/microsoft-login?redirectUrl=/`;
     } else {
diff --git a/src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.ts b/src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.ts
index 9ecd557d174..ebbb2768037 100644
--- a/src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.ts
+++ b/src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.ts
@@ -13,6 +13,6 @@ export class RegisterGoogleUserAlreadyExistsComponent {
   constructor(private configService: ConfigService) {}
 
   public socialSignIn(socialPlatform: string) {
-    window.location.href = `${this.configService.getContextPath()}/api/google-login`;
+    window.location.href = `${this.configService.getContextPath()}/oauth2/authorization/google`;
   }
 }
diff --git a/src/app/register/register-user-complete.component.ts b/src/app/register/register-user-complete.component.ts
index 18b8472f18a..ea8ec962f7d 100644
--- a/src/app/register/register-user-complete.component.ts
+++ b/src/app/register/register-user-complete.component.ts
@@ -4,7 +4,7 @@ import { ConfigService } from '../services/config.service';
 
 @Directive()
 export abstract class RegisterUserCompleteComponent implements OnInit {
-  protected googleLogInURL = `${this.configService.getContextPath()}/api/google-login`;
+  protected googleLogInURL = `${this.configService.getContextPath()}/oauth2/authorization/google`;
   protected microsoftLogInURL = `${this.configService.getContextPath()}/api/microsoft-login?redirectUrl=/`;
   protected socialAccount: boolean;
   protected isUsingGoogleId: boolean;