Revize 7a32656e

Refactoring

Backend/Backend/Controllers/AuthController.cs

@@ -24 +24 @@
     [HttpPost("/auth/login")]
     [ProducesResponseType((int) HttpStatusCode.OK, Type = typeof(LoginResponse))]
     [ProducesResponseType((int) HttpStatusCode.Forbidden)]
-    public ActionResult<LoginResponse> Index([FromBody] LoginRequest loginData)
+    public ActionResult<LoginResponse> Login([FromBody] LoginRequest loginData)
     {
         try
         {
-            var loginResponse = authService.Index(loginData.Username, loginData.Password);
+            var loginResponse = authService.Login(loginData.Username, loginData.Password);
             if (loginResponse == null)
             {
                 return Forbid();

Backend/Core/Services/AuthService/AuthService.cs

@@ -15 +15 @@
         this.jwtUtils = jwtUtils;
     }
 
-    public LoginResponse? Index(string username, string password)
+    public LoginResponse? Login(string username, string password)
     {
         var user = userService.CheckUsernamePassword(username, password);
 

Backend/Core/Services/AuthService/IAuthService.cs

@@ -5 +5 @@
 
 public interface IAuthService
 {
-    public LoginResponse? Index(string username, string password);
+    public LoginResponse? Login(string username, string password);
 }

webapp/components/annotation/AnnotationPanel.tsx

@@ -45 +45 @@
             </Stack>
         </div>
     );
-}
+}

webapp/components/navigation/AdminNavBar.tsx

@@ -12 +12 @@
     faBookmark,
 } from '@fortawesome/free-solid-svg-icons';
 
-const UserNavBar = () => {
+const AdminNavBar = () => {
     const router = useRouter();
     const { logout } = useContext(LoggedUserContext);
     const { SubMenu } = Menu;
@@ -53 +53 @@
     );
 };
 
-export default UserNavBar;
+export default AdminNavBar;

webapp/components/types/Auth.ts

@@ +1 @@
+import { AppProps } from 'next/app';
+import { ERole } from '../../api';
+
+export type SecuredComponent = AppProps['Component'] & {
+    auth: ComponentAuth;
+};
+
+export class ComponentAuth {
+    minRole: ERole | null;
+
+    constructor(minRole: ERole | null = null) {
+        this.minRole = minRole;
+    }
+}

webapp/components/types/auth.ts

@@ -1 @@
-import { AppProps } from 'next/app';
-import { ERole } from '../../api';
-
-export type SecuredComponent = AppProps['Component'] & {
-    auth: ComponentAuth;
-};
-
-export class ComponentAuth {
-    minRole: ERole | null;
-
-    constructor(minRole: ERole | null = null) {
-        this.minRole = minRole;
-    }
-}

webapp/layouts/LoginLayout.tsx

@@ +1 @@
+import React from 'react';
 import logo from '/public/usp-logo.svg';
 import Image from 'next/image';
 import styles from '/styles/Login.module.scss';
 import { Col, Container, Row, Stack } from 'react-bootstrap';
-import React from 'react';
 
 /**
  * Creates a layout of a login screen.

webapp/pages/_app.tsx

@@ -4 +4 @@
 
 import type { AppProps } from 'next/app';
 import Head from 'next/head';
-import { SecuredComponent } from '../components/types/auth';
+import { SecuredComponent } from '../components/types/Auth';
 import LoggedUserProvider from '../contexts/LoggedUserContext';
 import Auth from '../components/common/Auth';
 

webapp/pages/documents/annotator/index.tsx

@@ -4 +4 @@
 import { useUnauthRedirect } from '../../../hooks';
 import { useRouter } from 'next/router';
 import { Layout, Typography } from 'antd';
-import UserNavBar from '../../../components/navigation/userNavBar';
+import UserNavBar from '../../../components/navigation/UserNavBar';
 import { faFileLines } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { LoggedUserContext } from '../../../contexts/LoggedUserContext';