diff --git a/apps/api/src/auth/auth.controller.ts b/apps/api/src/auth/auth.controller.ts
index b28f97b..43ff1f8 100644
--- a/apps/api/src/auth/auth.controller.ts
+++ b/apps/api/src/auth/auth.controller.ts
@@ -26,38 +26,16 @@ export class AuthController {
}
}
- private getTargetUri(req) {
- const refererURL = new URL(req?.headers?.referer);
-
- return refererURL.searchParams.get('uri') || '/';
- }
-
- private getInvalidPasswordUrl(targetUri: string) {
- const params = new URLSearchParams();
- params.append('uri', targetUri);
- params.append('invalid', 'true');
-
- const invalidPasswordURI = '/login'.concat('?', params.toString());
-
- return invalidPasswordURI;
- }
-
@Post('/signin')
async login(@Req() req: FastifyRequest, @Res() reply: FastifyReply) {
- const targetUri = this.getTargetUri(req);
const { login, password } = req.body as Credentials;
try {
const token = await this.authService.login(login, password);
- return await reply
- .setCookie(COOKIE_TOKEN_NAME, token, this.cookieOptions)
- .status(302)
- .redirect(targetUri);
+ return await reply.setCookie(COOKIE_TOKEN_NAME, token, this.cookieOptions).status(200).send();
} catch {
- const invalidPasswordURI = this.getInvalidPasswordUrl(targetUri);
-
- return reply.status(302).redirect(decodeURIComponent(invalidPasswordURI));
+ throw new HttpException('Unauthorized', HttpStatus.UNAUTHORIZED);
}
}
diff --git a/apps/web/components/Form.jsx b/apps/web/components/Form.jsx
index 43e07f9..a41c35f 100644
--- a/apps/web/components/Form.jsx
+++ b/apps/web/components/Form.jsx
@@ -5,16 +5,36 @@ import { H3 } from 'elements/H';
import { useRouter } from 'next/router';
import Error from 'elements/Error';
import getConfig from 'next/config';
+import axios from 'axios';
+import { useState } from 'react';
const { publicRuntimeConfig: config } = getConfig();
export default function Form() {
const router = useRouter();
- const { invalid } = router.query;
- const error = invalid ?