@hapico/cli 0.0.10 → 0.0.11

package/bin/index.js

@@ -56,8 +56,11 @@ if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
 // Function to save token
-const saveToken = (token) => {
-    fs.writeFileSync(TOKEN_FILE, JSON.stringify({ access_token: token }, null, 2), {
+const saveToken = (tokens) => {
+    if (!tokens || !tokens.accessToken) {
+        throw new Error("Invalid token data");
+    }
+    fs.writeFileSync(TOKEN_FILE, JSON.stringify(tokens, null, 2), {
         encoding: "utf8",
     });
 };
@@ -66,9 +69,15 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json.access_token || null;
+        return json !== null && json !== void 0 ? json : {
+            accessToken: null,
+            refreshToken: null,
+        };
     }
-    return null;
+    return {
+        accessToken: null,
+        refreshToken: null,
+    };
 };
 // Function to save project ID
 const saveProjectId = (projectDir, id) => {
@@ -289,13 +298,13 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.9").description("Hapico CLI for project management");
+commander_1.program.version("0.0.10").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -350,8 +359,8 @@ commander_1.program
     .command("dev")
     .description("Start the project in development mode")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -395,8 +404,9 @@ commander_1.program
     .command("push")
     .description("Push the project source code to the server")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -422,7 +432,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -437,6 +447,7 @@ commander_1.program
     .command("login")
     .description("Login to the system")
     .action(async () => {
+    console.log("Logging in to the system...");
     const loginSpinner = (0, ora_1.default)("Initiating login...").start();
     try {
         const response = await axios_1.default.post("https://auth.myworkbeast.com/auth/device");

package/dist/index.js

@@ -56,8 +56,11 @@ if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
 // Function to save token
-const saveToken = (token) => {
-    fs.writeFileSync(TOKEN_FILE, JSON.stringify({ access_token: token }, null, 2), {
+const saveToken = (tokens) => {
+    if (!tokens || !tokens.accessToken) {
+        throw new Error("Invalid token data");
+    }
+    fs.writeFileSync(TOKEN_FILE, JSON.stringify(tokens, null, 2), {
         encoding: "utf8",
     });
 };
@@ -66,9 +69,15 @@ const getStoredToken = () => {
     if (fs.existsSync(TOKEN_FILE)) {
         const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
         const json = JSON.parse(data);
-        return json.access_token || null;
+        return json !== null && json !== void 0 ? json : {
+            accessToken: null,
+            refreshToken: null,
+        };
     }
-    return null;
+    return {
+        accessToken: null,
+        refreshToken: null,
+    };
 };
 // Function to save project ID
 const saveProjectId = (projectDir, id) => {
@@ -289,13 +298,13 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.9").description("Hapico CLI for project management");
+commander_1.program.version("0.0.10").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -350,8 +359,8 @@ commander_1.program
     .command("dev")
     .description("Start the project in development mode")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -395,8 +404,9 @@ commander_1.program
     .command("push")
     .description("Push the project source code to the server")
     .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
         console.error("You need to login first. Use 'hapico login' command.");
         return;
     }
@@ -422,7 +432,7 @@ commander_1.program
         }),
     }, {
         headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
         },
     })
@@ -437,6 +447,7 @@ commander_1.program
     .command("login")
     .description("Login to the system")
     .action(async () => {
+    console.log("Logging in to the system...");
     const loginSpinner = (0, ora_1.default)("Initiating login...").start();
     try {
         const response = await axios_1.default.post("https://auth.myworkbeast.com/auth/device");

package/index.ts

@@ -24,10 +24,13 @@ if (!fs.existsSync(CONFIG_DIR)) {
 }
 
 // Function to save token
-const saveToken = (token: string) => {
+const saveToken = (tokens: { accessToken: string; refreshToken?: string }) => {
+  if (!tokens || !tokens.accessToken) {
+    throw new Error("Invalid token data");
+  }
   fs.writeFileSync(
     TOKEN_FILE,
-    JSON.stringify({ access_token: token }, null, 2),
+    JSON.stringify(tokens, null, 2),
     {
       encoding: "utf8",
     }
@@ -35,13 +38,22 @@ const saveToken = (token: string) => {
 };
 
 // Function to get stored token
-const getStoredToken = (): string | null => {
+const getStoredToken = (): {
+  accessToken: string | null;
+  refreshToken: string | null;
+} => {
   if (fs.existsSync(TOKEN_FILE)) {
     const data = fs.readFileSync(TOKEN_FILE, { encoding: "utf8" });
     const json = JSON.parse(data);
-    return json.access_token || null;
+    return json ?? {
+      accessToken: null,
+      refreshToken: null,
+    };
   }
-  return null;
+  return {
+    accessToken: null,
+    refreshToken: null,
+  };
 };
 
 // Function to save project ID
@@ -333,14 +345,14 @@ class RoomState {
   }
 }
 
-program.version("0.0.9").description("Hapico CLI for project management");
+program.version("0.0.10").description("Hapico CLI for project management");
 
 program
   .command("clone <id>")
   .description("Clone a project by ID")
   .action(async (id: string) => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -413,8 +425,8 @@ program
   .command("dev")
   .description("Start the project in development mode")
   .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const { accessToken } = getStoredToken();
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -474,8 +486,9 @@ program
   .command("push")
   .description("Push the project source code to the server")
   .action(() => {
-    const token = getStoredToken();
-    if (!token) {
+    const data = getStoredToken();
+    const { accessToken } = data || {};
+    if (!accessToken) {
       console.error("You need to login first. Use 'hapico login' command.");
       return;
     }
@@ -508,7 +521,7 @@ program
         },
         {
           headers: {
-            Authorization: `Bearer ${token}`,
+            Authorization: `Bearer ${accessToken}`,
             "Content-Type": "application/json",
           },
         }
@@ -525,6 +538,7 @@ program
   .command("login")
   .description("Login to the system")
   .action(async () => {
+    console.log("Logging in to the system...");
     const loginSpinner: Ora = ora("Initiating login...").start();
 
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapico/cli",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A simple CLI tool for project management",
   "main": "index.js",
   "bin": {