fix: ignore user check while session creation when auth is disabled (#1676)

Author: sudharsan-selvaraj

dashboard-frontend

@@ -116,6 +116,7 @@
     "multer": "^1.4.5-lts.1",
     "node-abort-controller": "^3.1.1",
     "node-persist": "^3.1.3",
+    "node-pty-prebuilt-multiarch": "^0.10.1-pre.5",
     "node-simctl": "^7.3.13",
     "normalize-url": "6.1.0",
     "nyc": "^15.1.0",

package-lock.json

@@ -20,21 +20,21 @@ function getDeviceFarmHome() {
 }
 
 
-function getServerMetadata() {
-  const metaFile = path.join(getDeviceFarmHome(), "metadata.json");
+export function getServerMetadata() {
+  const metaFile = path.join(getDeviceFarmHome(), 'metadata.json');
   let defaultMetadata = {
-    id: uuid()
-  }
-  if(fs.existsSync(metaFile)) {
-    const metadata = JSON.parse(fs.readFileSync(metaFile, "utf-8"));
-    if(!metadata || !metadata.id) {
+    id: uuid(),
+  };
+  if (fs.existsSync(metaFile)) {
+    const metadata = JSON.parse(fs.readFileSync(metaFile, 'utf-8'));
+    if (!metadata || !metadata.id) {
       fs.writeFileSync(metaFile, JSON.stringify(Object.assign(defaultMetadata, metadata)));
       return {
         ...defaultMetadata,
-        ...metadata
-      }
+        ...metadata,
+      };
     }
-    return metadata
+    return metadata;
   } else {
     fs.writeFileSync(metaFile, JSON.stringify(defaultMetadata));
   }
@@ -47,5 +47,5 @@ export const config: Config = {
   sessionAssetsPath: path.join(deviceFarmHome, 'assets', 'sessions'),
   takeScreenshotsFor: ['click', 'setUrl', 'setValue', 'performActions'],
   appsPath: path.join(deviceFarmHome, 'assets'),
-  serverMetadata : getServerMetadata()
+  serverMetadata: { id: '' },
 };

package.json

@@ -4,7 +4,7 @@ import os from 'os';
 import { prisma } from '../prisma';
 import { JWT_SECRET } from '../auth/middleware/auth.middleware';
 import { DevicePlugin } from '../plugin';
-import { removeDevicesForNodes } from './device-service';
+import log from '../logger';
 
 export class NodeService {
   static async register(isHub: boolean, nodeName: string, host: string, nodeId: string) {
@@ -41,16 +41,19 @@ export class NodeService {
       jwtSecretToken: node.jwtSecretToken,
       isOnline: true,
       isHub: node.isHub,
-      addedBy: userId,
+      addedBy: userId ?? null,
     };
+
     if (isNodeExists) {
+      log.info('Node already exists. So updating..');
       await prisma.node.update({
         data,
         where: {
           id: nodeId,
         },
       });
     } else {
+      log.info('Node not exists. So creating..');
       await prisma.node.create({
         data: {
           ...data,

src/config.ts

@@ -2,9 +2,11 @@ import { DevicePlugin } from './plugin';
 import ffmpeg from '@ffmpeg-installer/ffmpeg';
 import { loadExternalModules, registerErrorHandlers } from './helpers';
 import { setDefaultResultOrder } from 'dns';
+import { config, getServerMetadata } from './config';
 setDefaultResultOrder('ipv4first');
 
 //Add FFMPEG to path for appium to record video of the session
+config.serverMetadata = getServerMetadata();
 process.env.PATH = process.env.PATH + ':' + ffmpeg.path.replace(/ffmpeg$/g, '');
 loadExternalModules();
 

src/data-service/node-service.ts

@@ -444,7 +444,10 @@ class DevicePlugin extends BasePlugin {
       log.info(
         `📱 ${pendingSessionId} ----- Device UDID ${device.udid} blocked for session ${sessionId}`,
       );
-      const user = DevicePlugin.IS_HUB ? await getUserFromCapabilities(mergedCapabilites) : null;
+      const user =
+        DevicePlugin.IS_HUB && this.pluginArgs.enableAuthentication
+          ? await getUserFromCapabilities(mergedCapabilites)
+          : null;
       await updatedAllocatedDevice(device, {
         busy: true,
         session_id: sessionId,