@oussema_mili/test-pkg-123 1.1.39 → 1.1.41

package/cli-commands.js

@@ -893,11 +893,27 @@ function setupCLICommands(program, startServerFunction) {
           { timeout: 10000 },
         );
 
+        // Debug: Log the actual response
+        console.log(chalk.gray('\n   Debug - Backend response:'), JSON.stringify(response.data, null, 2));
+
+        // Try to get userEntityRef from backend, fallback to session, then "unknown"
+        let userEntityRef = response.data.userEntityRef;
+        
+        if (!userEntityRef || userEntityRef === 'unknown') {
+          const session = loadSession();
+          if (session && isSessionValid(session) && session.userEntityRef) {
+            userEntityRef = session.userEntityRef;
+            console.log(chalk.gray('   Using userEntityRef from session: ' + userEntityRef));
+          } else {
+            userEntityRef = "unknown";
+          }
+        }
+
         // Save credentials
         saveDeviceCredential({
           deviceId: response.data.deviceId,
           deviceCredential: response.data.deviceCredential,
-          userEntityRef: response.data.userEntityRef || "unknown",
+          userEntityRef: userEntityRef,
           deviceName: deviceMetadata.deviceName,
           platform: deviceMetadata.platform,
           agentVersion: deviceMetadata.agentVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oussema_mili/test-pkg-123",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "description": "Fenwave Docker Agent and CLI",
   "keywords": [
     "fenwave",

package/setup/setupWizard.js

@@ -6,6 +6,7 @@ import {
   displayPrerequisites,
   getMissingPrerequisites,
 } from "../utils/prerequisites.js";
+import { loadSession, isSessionValid } from "../auth.js";
 import {
   promptRegistrationToken,
   promptConfirmation,
@@ -231,7 +232,6 @@ export class SetupWizard {
       ...registrationData,
       deviceName: deviceMetadata.deviceName,
       platform: deviceMetadata.platform,
-      userEntityRef: deviceMetadata.userEntityRef,
     };
   }
 
@@ -255,11 +255,27 @@ export class SetupWizard {
         { timeout: 10000 }
       );
 
+      // Debug: Log the actual response to understand what backend returns
+      console.log(chalk.gray('   Debug - Backend response:'), JSON.stringify(response.data, null, 2));
+
+      // Try to get userEntityRef from backend, fallback to session, then "unknown"
+      let userEntityRef = response.data.userEntityRef;
+      
+      if (!userEntityRef || userEntityRef === 'unknown') {
+        const session = loadSession();
+        if (session && isSessionValid(session) && session.userEntityRef) {
+          userEntityRef = session.userEntityRef;
+          console.log(chalk.gray('   Using userEntityRef from session: ' + userEntityRef));
+        } else {
+          userEntityRef = "unknown";
+        }
+      }
+
       return {
         deviceId: response.data.deviceId,
         deviceCredential: response.data.deviceCredential,
         registryConfig: response.data.registryConfig,
-        userEntityRef: response.data.userEntityRef || "unknown",
+        userEntityRef: userEntityRef,
       };
     } catch (error) {
       if (error.response?.status === 401) {
@@ -368,11 +384,22 @@ export class SetupWizard {
     console.log("");
     displayHeader("Setup Summary");
 
+    // Use session userEntityRef if device credential has unknown
+    let displayUser = registrationData.userEntityRef;
+    if (!displayUser || displayUser === "unknown") {
+      const session = loadSession();
+      if (session && isSessionValid(session) && session.userEntityRef) {
+        displayUser = session.userEntityRef;
+      } else {
+        displayUser = "N/A";
+      }
+    }
+
     displayKeyValue({
       "Device ID": registrationData.deviceId,
       "Device Name": registrationData.deviceName || "N/A",
       Platform: registrationData.platform || "N/A",
-      User: registrationData.userEntityRef || "N/A",
+      User: displayUser,
     });
 
     console.log("");