@superblocksteam/util 0.0.16 → 0.0.17

package/dist/login.d.ts

@@ -1,8 +1,10 @@
-type TokenWithBaseUrl = {
-    token: string;
+type BaseUrl = {
     superblocksBaseUrl: string;
 };
-export declare function saveApiToken(token: string, superblocksBaseUrl: string): Promise<void>;
-export declare function getLocalTokenWithUrlIfExists(): Promise<TokenWithBaseUrl | undefined>;
-export declare function getLocalTokenWithUrl(): Promise<TokenWithBaseUrl>;
+type TokenWithBaseUrl = BaseUrl & {
+    token: string;
+};
+export declare function saveApiToken(superblocksBaseUrl: string, token?: string): Promise<void>;
+export declare function getLocalTokenWithUrlIfExists(): Promise<TokenWithBaseUrl | BaseUrl | undefined>;
+export declare function getLocalTokenWithUrl(): Promise<TokenWithBaseUrl | BaseUrl>;
 export {};

package/dist/login.js

@@ -6,13 +6,22 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const constants_1 = require("./constants");
-async function saveApiToken(token, superblocksBaseUrl) {
+async function saveApiToken(superblocksBaseUrl, token) {
     try {
         await fs.ensureDir((0, node_path_1.join)((0, node_os_1.homedir)(), ".superblocks"));
-        await fs.writeJSON((0, node_path_1.join)((0, node_os_1.homedir)(), constants_1.TOKEN_CONFIG_PATH), {
-            token,
-            superblocksBaseUrl,
-        });
+        if (token) {
+            const tokenConfig = {
+                superblocksBaseUrl,
+                token,
+            };
+            await fs.writeJSON((0, node_path_1.join)((0, node_os_1.homedir)(), constants_1.TOKEN_CONFIG_PATH), tokenConfig);
+        }
+        else {
+            const tokenConfig = {
+                superblocksBaseUrl,
+            };
+            await fs.writeJSON((0, node_path_1.join)((0, node_os_1.homedir)(), constants_1.TOKEN_CONFIG_PATH), tokenConfig);
+        }
     }
     catch {
         throw new constants_1.FileAccessError("Could not save token");
@@ -31,10 +40,19 @@ exports.getLocalTokenWithUrlIfExists = getLocalTokenWithUrlIfExists;
 async function getLocalTokenWithUrl() {
     try {
         const tokenConfig = await fs.readJSON((0, node_path_1.join)((0, node_os_1.homedir)(), constants_1.TOKEN_CONFIG_PATH));
-        return {
-            token: tokenConfig.token,
-            superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
-        };
+        if (tokenConfig.token) {
+            // user logged in
+            return {
+                token: tokenConfig.token,
+                superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
+            };
+        }
+        else {
+            // user not logged in, but set domain
+            return {
+                superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
+            };
+        }
     }
     catch {
         throw new Error("No local API key found");

package/dist/resource-configs.d.ts

@@ -1,6 +1,5 @@
 export type SuperblocksMetadata = {
     cliVersion: string;
-    remote: string;
     lastUpdated: string;
     created: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/util",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "main": "dist/index.js",
   "homepage": "https://www.superblocks.com",
   "scripts": {

package/src/login.ts

@@ -3,25 +3,36 @@ import { join } from "node:path";
 import * as fs from "fs-extra";
 import { FileAccessError, TOKEN_CONFIG_PATH } from "./constants";
 
-type TokenWithBaseUrl = {
-  token: string;
+type BaseUrl = {
   superblocksBaseUrl: string;
 };
 
-export async function saveApiToken(token: string, superblocksBaseUrl: string) {
+type TokenWithBaseUrl = BaseUrl & {
+  token: string;
+};
+
+export async function saveApiToken(superblocksBaseUrl: string, token?: string) {
   try {
     await fs.ensureDir(join(homedir(), ".superblocks"));
-    await fs.writeJSON(join(homedir(), TOKEN_CONFIG_PATH), {
-      token,
-      superblocksBaseUrl,
-    });
+    if (token) {
+      const tokenConfig: TokenWithBaseUrl = {
+        superblocksBaseUrl,
+        token,
+      };
+      await fs.writeJSON(join(homedir(), TOKEN_CONFIG_PATH), tokenConfig);
+    } else {
+      const tokenConfig: BaseUrl = {
+        superblocksBaseUrl,
+      };
+      await fs.writeJSON(join(homedir(), TOKEN_CONFIG_PATH), tokenConfig);
+    }
   } catch {
     throw new FileAccessError("Could not save token");
   }
 }
 
 export async function getLocalTokenWithUrlIfExists(): Promise<
-  TokenWithBaseUrl | undefined
+  TokenWithBaseUrl | BaseUrl | undefined
 > {
   try {
     return await getLocalTokenWithUrl();
@@ -30,13 +41,25 @@ export async function getLocalTokenWithUrlIfExists(): Promise<
   }
 }
 
-export async function getLocalTokenWithUrl(): Promise<TokenWithBaseUrl> {
+export async function getLocalTokenWithUrl(): Promise<
+  TokenWithBaseUrl | BaseUrl
+> {
   try {
-    const tokenConfig = await fs.readJSON(join(homedir(), TOKEN_CONFIG_PATH));
-    return {
-      token: tokenConfig.token as string,
-      superblocksBaseUrl: tokenConfig.superblocksBaseUrl as string,
-    };
+    const tokenConfig: TokenWithBaseUrl = await fs.readJSON(
+      join(homedir(), TOKEN_CONFIG_PATH)
+    );
+    if (tokenConfig.token) {
+      // user logged in
+      return {
+        token: tokenConfig.token,
+        superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
+      };
+    } else {
+      // user not logged in, but set domain
+      return {
+        superblocksBaseUrl: tokenConfig.superblocksBaseUrl,
+      };
+    }
   } catch {
     throw new Error("No local API key found");
   }

package/src/resource-configs.ts

@@ -3,7 +3,6 @@ import { RESOURCE_CONFIG_PATH } from "./constants";
 
 export type SuperblocksMetadata = {
   cliVersion: string;
-  remote: string;
   lastUpdated: string;
   created: string;
 };