Login complete

unicam-complex-system · Dec 29, 2023 · 9b6e454 · 9b6e454
1 parent ce96aa3
commit 9b6e454
Show file tree

Hide file tree

Showing 44 changed files with 687 additions and 99 deletions.
diff --git a/Backend/package-lock.json b/Backend/package-lock.json
diff --git a/Backend/package.json b/Backend/package.json
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@nestjs/common": "^10.0.0",
+    "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/platform-express": "^10.0.0",

diff --git a/Backend/src/app.module.ts b/Backend/src/app.module.ts
@@ -3,6 +3,7 @@
  */
 
 import { JwtModule } from '@nestjs/jwt';
+import { ConfigModule } from '@nestjs/config';
 import { Module } from '@nestjs/common';
 import { MachineLearningController } from './app/machineLearning/machineLearning.controller';
 import { FrontendController } from './app/frontend/frontend.controller';
@@ -14,6 +15,7 @@ import { LoginService } from './login/login.service';
 
 @Module({
   imports: [
+    ConfigModule.forRoot(),
     JwtModule.register({
       global: true,
       secret: process.env.JWT_SECRET,

diff --git a/Backend/src/database/database.service.ts b/Backend/src/database/database.service.ts
@@ -35,10 +35,10 @@ export class DatabaseService {
         if (size == 0) {
           this.DB.collection(`users`).insertOne({
             name: process.env.CSD_USER,
-            password: bcrypt.hashSync(
-              process.env.CSD_PASSWORD,
+            password: process.env.CSD_PASSWORD/* bcrypt.hashSync(
+              ,
               process.env.BCRYPT_SALT,
-            ),
+            ) */,
           });
         }
       });
@@ -50,10 +50,10 @@ export class DatabaseService {
       },
       {
         $set: {
-          password: bcrypt.hashSync(
-            process.env.CSD_PASSWORD,
+          password: process.env.CSD_PASSWORD/* bcrypt.hashSync(
+            ,
             process.env.BCRYPT_SALT,
-          ),
+          ) */,
         },
       },
     );

diff --git a/Backend/src/login/login.service.ts b/Backend/src/login/login.service.ts
@@ -17,7 +17,7 @@ export class LoginService {
     // console.log(bcrypt.hashSync(user.password, process.env.BCRYPT_SALT));
     const encryptedUser = {
       name: user.name,
-      password: bcrypt.hashSync(user.password, process.env.BCRYPT_SALT),
+      password: user.password/* bcrypt.hashSync(, process.env.BCRYPT_SALT) */,
     };
 
     // this should not throw an error, then the return is executed

diff --git a/Backend/src/main.ts b/Backend/src/main.ts
@@ -34,6 +34,7 @@ async function bootstrap() {
   const document = SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('swagger-api', app, document);
 
+  app.enableCors({ origin: true });
   await app.listen(8080);
 
   console.log(

diff --git a/Frontend/.env-example b/Frontend/.env-example
@@ -0,0 +1 @@
+NEXT_PUBLIC_BACKEND_URL=http://localhost:8080/