@content-island/vscode-api-client 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createClient as I } from "@content-island/api-client";
 import { mapContentToModel as Y } from "@content-island/api-client";
-import * as a from "vscode";
+import * as r from "vscode";
 import _ from "node:crypto";
 import A from "node:util";
 let E;
@@ -37,10 +37,10 @@ const g = {
 }, L = (t) => {
   const s = (t.secureProtocol === void 0 ? g.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", e = t.domain ? t.domain : g.DEFAULT_API_CLIENT_DOMAIN, n = t.apiVersion ? t.apiVersion : g.DEFAULT_API_CLIENT_VERSION;
   return `${s}://${e}/api/${n}`;
-}, y = (t) => {
+}, f = (t) => {
   const s = (t.secureProtocol === void 0 ? g.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", e = t.loginDomain ? t.loginDomain : g.DEFAULT_LOGIN_DOMAIN;
   return `${s}://${e}/#/?redirect=vscode`;
-}, f = 16, p = (t = f) => _.randomBytes(t).toString("hex"), O = 64, m = "sha512", x = 1e5, D = async (t, o, s = O) => (await A.promisify(_.pbkdf2)(t, o, x, s, m)).toString("hex"), N = async () => {
+}, y = 16, p = (t = y) => _.randomBytes(t).toString("hex"), O = 64, m = "sha512", x = 1e5, D = async (t, o, s = O) => (await A.promisify(_.pbkdf2)(t, o, x, s, m)).toString("hex"), N = async () => {
   const t = l.getContext();
   let o = await t.secrets.get(u.SALT);
   return o || (o = p(32), await t.secrets.store(u.SALT, o)), o;
@@ -49,13 +49,13 @@ const g = {
   return await D(t, o, k);
 }, w = async (t) => {
   const o = "Open Login Page";
-  if (await a.window.showInformationMessage(
+  if (await r.window.showInformationMessage(
     "You need to log in to Content Island to continue. Do you want to open the login page?",
     o
   ) !== o)
     return;
-  const e = a.Uri.parse(y(t));
-  await a.env.openExternal(e);
+  const e = r.Uri.parse(f(t));
+  await r.env.openExternal(e);
 }, M = (t) => {
   try {
     return JSON.parse(t.message);
@@ -70,14 +70,14 @@ const g = {
     if (n) {
       if (n.status === 401)
         throw await w(o), new Error("Unauthorized: Please log in to continue.");
-      n.status === 403 && a.window.showErrorMessage("Access forbidden: You do not have permission to perform this action.");
+      n.status === 403 && r.window.showErrorMessage("Access forbidden: You do not have permission to perform this action.");
     }
     throw e;
   }
 }, U = async (t, o, s) => {
   const e = L(t);
   let n;
-  const c = {
+  const a = {
     authorizationCode: o,
     metadata: s
   };
@@ -87,23 +87,27 @@ const g = {
       headers: {
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(c)
+      body: JSON.stringify(a)
     });
   } catch {
-    a.window.showErrorMessage(
+    r.window.showErrorMessage(
       "Unable to connect to the authorization server. Check your network connection and try again."
     );
+    return;
+  }
+  if (!n.ok) {
+    n.status === 401 ? await w(t) : n.status === 403 && r.window.showErrorMessage(
+      "You do not have permission to access this resource. Please check your access rights in Content Island."
+    ), r.window.showErrorMessage(
+      "Failed to obtain access token. Please complete the authorization in Content Island."
+    );
+    return;
   }
-  n.ok || (n.status === 401 ? await w(t) : n.status === 403 && a.window.showErrorMessage(
-    "You do not have permission to access this resource. Please check your access rights in Content Island."
-  ), a.window.showErrorMessage(
-    "Failed to obtain access token. Please complete the authorization in Content Island."
-  ));
   try {
-    const r = await n.json();
-    return (!r?.accessToken || typeof r.accessToken != "string") && (a.window.showErrorMessage("Invalid response from the authorization server."), await w(t)), r.accessToken;
+    const c = await n.json();
+    return (!c?.accessToken || typeof c.accessToken != "string") && (r.window.showErrorMessage("Invalid response from the authorization server."), await w(t)), c.accessToken;
   } catch {
-    a.window.showErrorMessage("Error processing response from the authorization server.");
+    r.window.showErrorMessage("Error processing response from the authorization server.");
   }
 }, T = (t) => {
   const o = `PREVIEW_${t.accessToken}`, s = I({ ...t, accessToken: o });
@@ -124,18 +128,20 @@ const g = {
   };
   return {
     authorize: async (e, n) => {
-      const c = await U(t, e, n);
-      s(c, n);
-      const r = await o.getProject();
-      await C.set(r.id, c), await h.set(r.id, n);
+      const a = await U(t, e, n);
+      if (a) {
+        s(a, n);
+        const c = await o.getProject();
+        await C.set(c.id, a), await h.set(c.id, n);
+      }
     },
     authorizeByProjectId: async (e) => {
-      const n = await C.get(e), c = await h.get(e);
-      if (!n || !c) {
+      const n = await C.get(e), a = await h.get(e);
+      if (!n || !a) {
         await w(t);
         return;
       }
-      s(n, c);
+      s(n, a);
     },
     setVSCodeExtensionContext: (e) => {
       l.setContext(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@content-island/vscode-api-client",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Content Island - VSCode Extension API Client",
   "private": false,
   "sideEffects": false,