melabidi/carmanagement
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix both admin and company login
Build & Push / Pipeline Tests (push) Failing after 1m27s
Details
Build & Push / Build & Push Docker Image (push) Has been skipped
Details
Test / Type Check (all packages) (push) Successful in 55s
Details
Test / API Unit Tests (push) Successful in 1m9s
Details
Test / Homepage Unit Tests (push) Successful in 50s
Details
Test / Carplace Unit Tests (push) Has been cancelled
Details
Test / Admin Unit Tests (push) Has been cancelled
Details
Test / Dashboard Unit Tests (push) Has been cancelled
Details
Test / API Integration Tests (push) Has been cancelled
Details

Browse Source
This commit is contained in:
root
2026-07-28 23:11:46 -04:00
parent 50c74b9007
commit eeec8f0a82
5 changed files with 167 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/homepage/tests/unit/components/sign-in-form.test.tsx
+20 -25
View File
@@ -40,7 +40,7 @@ describe('SignInForm auth routing', () => {
));
});
it('uses employee login only on the default sign-in page', async () => {
it('uses unified login on the default sign-in page', async () => {
vi.mocked(fetch).mockResolvedValueOnce(
jsonResponse(200, { data: { employee: { id: 'employee_1' } } }),
);
@@ -50,7 +50,7 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/auth/employee/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(
@@ -59,30 +59,25 @@ describe('SignInForm auth routing', () => {
);
});
it('falls back to admin login when default employee login rejects the credentials', async () => {
vi.mocked(fetch)
.mockResolvedValueOnce(jsonResponse(401, { error: 'invalid_credentials' }))
.mockResolvedValueOnce(jsonResponse(401, { error: 'totp_required' }));
it('shows invalid credentials when unified login rejects the credentials', async () => {
render(<SignInForm locale="en" />);
await submitForm();
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(2));
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenNthCalledWith(
1,
`${API_BASE}/auth/employee/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).toHaveBeenNthCalledWith(
2,
expect(fetch).not.toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
expect.objectContaining({ method: 'POST' }),
expect.anything(),
);
expect(await screen.findByText('Authentication code')).toBeInTheDocument();
expect(await screen.findByText('Invalid email or password.')).toBeInTheDocument();
});
it('uses employee login only when the requested destination is a dashboard path', async () => {
it('uses unified login when the requested destination is a dashboard path', async () => {
vi.mocked(fetch).mockResolvedValueOnce(
jsonResponse(200, { data: { employee: { id: 'employee_1' } } }),
);
@@ -93,7 +88,7 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/auth/employee/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(
@@ -102,7 +97,7 @@ describe('SignInForm auth routing', () => {
);
});
it('uses admin login only when the admin portal is requested', async () => {
it('uses unified login when the admin portal is requested', async () => {
searchParams = new URLSearchParams('portal=admin');
render(<SignInForm locale="en" />);
@@ -110,7 +105,7 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(
@@ -119,7 +114,7 @@ describe('SignInForm auth routing', () => {
);
});
it('uses admin login when the requested destination is an admin path', async () => {
it('uses unified login when the requested destination is an admin path', async () => {
searchParams = new URLSearchParams('next=/admin/dashboard');
render(<SignInForm locale="en" />);
@@ -127,12 +122,12 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
});
it('uses admin login when the requested destination is an absolute admin URL', async () => {
it('uses unified login when the requested destination is an absolute admin URL', async () => {
searchParams = new URLSearchParams('redirect=http://localhost:3000/admin/dashboard');
render(<SignInForm locale="en" />);
@@ -140,7 +135,7 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(
@@ -149,14 +144,14 @@ describe('SignInForm auth routing', () => {
);
});
it('uses admin login when the page forces admin auth mode', async () => {
it('uses unified login when the page forces admin auth mode', async () => {
render(<SignInForm locale="en" authMode="admin" />);
await submitForm();
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(
@@ -165,7 +160,7 @@ describe('SignInForm auth routing', () => {
);
});
it('uses admin login on the admin sign-in path', async () => {
it('uses unified login on the admin sign-in path', async () => {
pathname = '/en/light/admin-sign-in';
render(<SignInForm locale="en" />);
@@ -173,7 +168,7 @@ describe('SignInForm auth routing', () => {
await waitFor(() => expect(fetch).toHaveBeenCalledTimes(1));
expect(fetch).toHaveBeenCalledWith(
`${API_BASE}/admin/auth/login`,
`${API_BASE}/auth/login`,
expect.objectContaining({ method: 'POST' }),
);
expect(fetch).not.toHaveBeenCalledWith(