Quellcode durchsuchen

further enhancements

Dr-Swopt vor 6 Monaten
Ursprung
Commit
9f9f34a2d0

+ 11 - 1
src/app.controller.ts

@@ -1,8 +1,11 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, Logger, UseGuards } from '@nestjs/common';
 import { GeneralService } from './services/general.service';
+import { serverConfig } from './config';
+import { JwtAuthGuard } from './common/guards/jwt-auth.guard';
 
 @Controller()
 export class AppController {
+  private logger: Logger = new Logger(`AppController`)
   constructor(private readonly service: GeneralService) { }
 
   @Get()
@@ -10,4 +13,11 @@ export class AppController {
     return this.service.getHello();
   }
 
+  @Get(`server`)
+  @UseGuards(JwtAuthGuard)
+  getServerAPIurl(): string {
+    this.logger.log(`attempted acquisition`)
+    return serverConfig.exposedUrl
+  }
+
 }

+ 2 - 1
src/app.module.ts

@@ -3,9 +3,10 @@ import { AppController } from './app.controller';
 import { GeneralService } from './services/general.service';
 import { AuthModule } from './auth/auth.module';
 import { AttendanceModule } from './attendance/attendance.module';
+import { SocketGateway } from './gateway/socket.gateway';
 
 @Module({
-  imports: [AuthModule, AttendanceModule],
+  imports: [AuthModule, AttendanceModule, SocketGateway],
   controllers: [AppController],
   providers: [GeneralService],
 })

+ 2 - 1
src/auth/auth.controller.ts

@@ -13,9 +13,10 @@ export class AuthController {
         let user: User = body
         return this.authService.register(user);
     }
-
+    
     @Post('login')
     login(@Body() body: { email?: string; password?: string }) {
+        this.logger.log(`logging in ${body.email}`)
         if (!body.email || !body.password) {
             this.logger.error('Missing email or password');
         } else {

+ 1 - 1
src/config.ts

@@ -1,3 +1,3 @@
 export const serverConfig = {
-    exposedUrl: `https://05d8-60-53-251-228.ngrok-free.app`
+    exposedUrl: `https://a19f-60-53-251-228.ngrok-free.app`
 }

+ 2 - 2
src/gateway/socket.gateway.ts

@@ -7,7 +7,7 @@ import * as _ from 'lodash'
 import { Logger } from '@nestjs/common';
 @WebSocketGateway({
     cors: {
-        origins: '*'
+        origin: '*'
     },
     namespace: `ws`
 })
@@ -18,7 +18,7 @@ export class SocketGateway implements OnGatewayConnection, OnGatewayDisconnect {
     private messageResponseSubject: Subject<any> = new Subject()
 
     constructor() {
-        
+        console.log(`NestJS socket started...`)
     }
 
     emit(message: any) {

+ 3 - 0
src/main.ts

@@ -4,7 +4,10 @@ import { serverConfig } from './config';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
+  app.enableCors(); // ← enable CORS globally
+
   await app.listen(process.env.PORT ?? 3000);
+
   console.log(`Server started at localhost:3000 $$ Exposed at ${serverConfig.exposedUrl}`)
 }
 bootstrap();

+ 1 - 0
src/services/auth.service.ts

@@ -28,4 +28,5 @@ export class AuthService {
             })
         })
     }
+
 }