Skip to content

login and sign up: use previous endpoint #1009

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

Merged
lyubov-voloshko merged 1 commit into from
Feb 3, 2025
Merged

login and sign up: use previous endpoint #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions frontend/src/app/services/auth.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { NotificationsService } from './notifications.service';
import { TestBed } from '@angular/core/testing';
import { provideHttpClient } from '@angular/common/http';

describe('AuthService', () => {
fdescribe('AuthService', () => {
let service: AuthService;
let httpMock: HttpTestingController;

Expand Down Expand Up @@ -69,7 +69,7 @@ describe('AuthService', () => {
isSignUpUserCalled = true;
});

const req = httpMock.expectOne('/saas/user/register');
const req = httpMock.expectOne('https://saas.rocketadmin.com/saas/user/register');
expect(req.request.method).toBe("POST");
expect(req.request.body).toEqual(userData);
req.flush(signUpResponse);
Expand All @@ -85,7 +85,7 @@ describe('AuthService', () => {

const tokenExpiration = service.signUpUser(userData).toPromise();

const req = httpMock.expectOne('/saas/user/register');
const req = httpMock.expectOne('https://saas.rocketadmin.com/saas/user/register');
expect(req.request.method).toBe("POST");
req.flush(fakeError, {status: 400, statusText: ''});
await tokenExpiration;
Expand Down Expand Up @@ -185,7 +185,7 @@ describe('AuthService', () => {
isLoginWithGoogleCalled = true;
});

const req = httpMock.expectOne(`/saas/user/google/login`);
const req = httpMock.expectOne(`https://saas.rocketadmin.com/saas/user/google/login`);
expect(req.request.method).toBe("POST");
expect(req.request.body).toEqual({ token: 'google-token-12345678'});
req.flush(googleResponse);
Expand All @@ -196,7 +196,7 @@ describe('AuthService', () => {
it('should fall for loginWithGoogle and show Error alert', async () => {
const googleResponse = service.loginWithGoogle('google-token-12345678').toPromise();

const req = httpMock.expectOne(`/saas/user/google/login`);
const req = httpMock.expectOne(`https://saas.rocketadmin.com/saas/user/google/login`);
expect(req.request.method).toBe("POST");
expect(req.request.body).toEqual({ token: 'google-token-12345678'});
req.flush(fakeError, {status: 400, statusText: ''});
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"#important to keep it /api for prod": true,
"baseURL": "/api",
"saasURL": ""
"saasURL": "https://saas.rocketadmin.com"
}