Skip to content

feat(Application): SpringBoot 3 upgrade #2251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hirokiterashima wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

feat(Application): SpringBoot 3 upgrade #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e08dcd7
Change Google login url to map to spring's default oauth auth endpoint
hirokiterashima Dec 17, 2025
a0739e1
Fix test
breity Jan 5, 2026
310dae6
Merge branch 'develop' into spring-boot-3-upgrade
hirokiterashima Aug 24, 2026
1c1de6e
Got OAuth with Microsoft working again.
hirokiterashima Aug 26, 2026
1d273a0
updated package-lock.json
hirokiterashima Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 0 additions & 173 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/login/login-home/login-home.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function getRedirectUrl() {
describe('getRedirectUrl()', () => {
it('should add redirectUrl to Google login url', () => {
expect(component.getRedirectUrl('google')).toEqual(
`${contextPath}/api/google-login?redirectUrl=${redirectUrl}`
`${contextPath}/oauth2/authorization/google?redirectUrl=${redirectUrl}`
);
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/app/login/login-home/login-home.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ 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 = `/oauth2/authorization/google?redirectUrl=${this.userService.getRedirectUrl()}`;
} else if (social === 'microsoft') {
redirectUrl = `/api/microsoft-login?redirectUrl=/`;
redirectUrl = `/oauth2/authorization/microsoft?redirectUrl=${this.userService.getRedirectUrl()}`;
} else {
redirectUrl = this.userService.getRedirectUrl();
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/register/abstract-register-user.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export abstract class AbstractRegisterUserComponent implements OnInit {
}

protected microsoftSignIn(): void {
window.location.href = `/api/microsoft-login?redirectUrl=${this.joinFormPath}`;
window.location.href = `/oauth2/authorization/microsoft?redirectUrl=${this.joinFormPath}`;
}

protected abstract getFormParams(): any;
Expand Down
2 changes: 1 addition & 1 deletion ...ster/register-google-user-already-exists/register-google-user-already-exists.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
}
}
2 changes: 1 addition & 1 deletion ...egister-microsoft-user-already-exists/register-microsoft-user-already-exists.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ import { MatButton } from '@angular/material/button';
})
export class RegisterMicrosoftUserAlreadyExistsComponent {
protected login(): void {
window.location.href = `/api/microsoft-login?redirectUrl=/`;
window.location.href = `/oauth2/authorization/microsoft`;
}
}
4 changes: 2 additions & 2 deletions src/app/register/register-user-complete.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { ConfigService } from '../services/config.service';

@Directive()
export abstract class RegisterUserCompleteComponent implements OnInit {
protected googleLogInURL = `${this.configService.getContextPath()}/api/google-login`;
protected microsoftLogInURL = `${this.configService.getContextPath()}/api/microsoft-login?redirectUrl=/`;
protected googleLogInURL = `${this.configService.getContextPath()}/oauth2/authorization/google`;
protected microsoftLogInURL = `${this.configService.getContextPath()}/oauth2/authorization/microsoft`;
protected socialAccount: boolean;
protected isUsingGoogleId: boolean;
protected isUsingMicrosoftId: boolean;
Expand Down
Loading