Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/app/login/login-home/login-home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
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 src/app/register/register-user-complete.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading