code cleanup

Author: SteRiccio

src/server/arenaServer/registerServices.ts

@@ -3,7 +3,7 @@ import {
   DataQueryServiceServer,
   SurveyServiceServer,
   UserServiceServer,
-  UserRefreshTokenServiceServer,
+  UserAuthTokenServiceServer,
 } from '../../service'
 import { ServerServiceType } from './serverServiceType'
 
@@ -12,5 +12,5 @@ export const registerServices = (): void => {
     .registerService(ServerServiceType.dataQuery, DataQueryServiceServer)
     .registerService(ServiceType.survey, SurveyServiceServer)
     .registerService(ServiceType.user, UserServiceServer)
-    .registerService(ServiceType.userAuthToken, UserRefreshTokenServiceServer)
+    .registerService(ServiceType.userAuthToken, UserAuthTokenServiceServer)
 }

src/service/index.ts

@@ -2,4 +2,4 @@ export type { DataQueryService } from './dataQuery'
 export { DataQueryServiceServer } from './dataQuery'
 export { SurveyServiceServer } from './survey'
 export { UserServiceServer } from './user'
-export { UserAuthTokenServiceServer as UserRefreshTokenServiceServer } from './userAuthToken'
+export { UserAuthTokenServiceServer } from './userAuthToken'

src/webSocket/server.ts

@@ -6,6 +6,7 @@ import { Logger } from '../log'
 import { ProcessEnv } from '../processEnv'
 import { ArenaApp } from '../server'
 import { WebSocketEvent } from './event'
+import { UserAuthTokenPayload } from '@openforis/arena-core'
 
 export class WebSocketServer {
   private static logger: Logger = new Logger(`WebSocketServer`)
@@ -20,7 +21,7 @@ export class WebSocketServer {
       }
       try {
         const jwtPayload = jwt.verify(token, ProcessEnv.refreshTokenSecret)
-        const { userUuid } = (jwtPayload as any) ?? {}
+        const { userUuid } = jwtPayload as UserAuthTokenPayload
 
         // Attach userUuid to socket data for later use
         socket.data.userUuid = userUuid