@zapier/zapier-sdk-cli 0.2.0 → 0.3.1

package/bin/zapier-sdk.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 // Import the CLI from the compiled TypeScript
-require("../dist/cli.js");
+import "../dist/cli.js";

package/bin/zsdk.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 // Import the CLI from the compiled TypeScript
-require("../dist/cli.js");
+import "../dist/cli.js";

package/dist/cli.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import { createZapierSdk } from "@zapier/zapier-sdk";
-import { generateCliCommands } from "./utils/cli-generator";
-import { ensureValidToken } from "./utils/auth/ensureValidToken";
-import { createLoginCommand, createLogoutCommand, createWhoamiCommand, createConfigPathCommand, } from "./commands";
+import { generateCliCommands } from "./utils/cli-generator.js";
+import { createLoginCommand, createLogoutCommand, createWhoamiCommand, createConfigPathCommand, } from "./commands/index.js";
 const program = new Command();
 program
     .name("zapier-sdk")
@@ -12,9 +11,8 @@ program
     .option("--debug", "Enable debug logging");
 // Check for debug flag early
 const isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
-// Create SDK instance with dynamic token resolution
+// Create SDK instance - automatically handles token resolution
 const sdk = createZapierSdk({
-    getToken: ensureValidToken,
     debug: isDebugMode,
 });
 // Add auth commands before generating SDK commands

package/dist/commands/configPath.js

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { getConfigPath } from "../utils/getConfigPath";
+import { getConfigPath } from "@zapier/zapier-sdk";
 export function createConfigPathCommand() {
     return new Command("get-config-path")
         .description("Show the path to the configuration file")

package/dist/commands/index.d.ts

@@ -1,4 +1,4 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createWhoamiCommand } from "./whoami";
-export { createConfigPathCommand } from "./configPath";
+export { createLoginCommand } from "./login.js";
+export { createLogoutCommand } from "./logout.js";
+export { createWhoamiCommand } from "./whoami.js";
+export { createConfigPathCommand } from "./configPath.js";

package/dist/commands/index.js

@@ -1,4 +1,4 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createWhoamiCommand } from "./whoami";
-export { createConfigPathCommand } from "./configPath";
+export { createLoginCommand } from "./login.js";
+export { createLogoutCommand } from "./logout.js";
+export { createWhoamiCommand } from "./whoami.js";
+export { createConfigPathCommand } from "./configPath.js";

package/dist/commands/login.js

@@ -1,6 +1,6 @@
 import { Command } from "commander";
-import login from "../utils/auth/login";
-import getLoggedInUser from "../utils/auth/getLoggedInUser";
+import login from "../utils/auth/login.js";
+import { getLoggedInUser } from "@zapier/zapier-sdk";
 export function createLoginCommand() {
     return new Command("login")
         .description("Log in to Zapier to access your account")

package/dist/commands/logout.js

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import logout from "../utils/auth/logout";
+import { logout } from "@zapier/zapier-sdk";
 export function createLogoutCommand() {
     return new Command("logout")
         .description("Log out of your Zapier account")

package/dist/commands/whoami.js

@@ -1,11 +1,12 @@
 import { Command } from "commander";
-import getLoggedInUser from "../utils/auth/getLoggedInUser";
+import { getLoggedInUser } from "@zapier/zapier-sdk";
+import { spinPromise } from "../utils/spinner.js";
 export function createWhoamiCommand() {
     return new Command("whoami")
         .description("Show current login status and user information")
         .action(async () => {
         try {
-            const user = await getLoggedInUser();
+            const user = await spinPromise(getLoggedInUser(), "Checking login status...");
             console.log(`✅ Logged in as ${user.email} (Account ID: ${user.accountId})`);
         }
         catch {

package/dist/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.js

@@ -1,3 +1,3 @@
-"use strict";
+export {};
 // Main exports for the CLI package
 // All CLI functionality is now schema-driven via generateCLICommands

package/dist/utils/auth/login.js

@@ -2,13 +2,12 @@ import open from "open";
 import crypto from "node:crypto";
 import express from "express";
 import pkceChallenge from "pkce-challenge";
-import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, LOGIN_PORTS, LOGIN_TIMEOUT_MS, ZAPIER_BASE, } from "../constants";
-import { spinPromise } from "../spinner";
-import log from "../log";
-import api from "../api/client";
-import getCallablePromise from "../getCallablePromise";
-import updateLogin from "./updateLogin";
-import logout from "./logout";
+import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, LOGIN_PORTS, LOGIN_TIMEOUT_MS, ZAPIER_BASE, } from "../constants.js";
+import { spinPromise } from "../spinner.js";
+import log from "../log.js";
+import api from "../api/client.js";
+import getCallablePromise from "../getCallablePromise.js";
+import { updateLogin, logout } from "@zapier/zapier-sdk";
 const findAvailablePort = () => {
     return new Promise((resolve, reject) => {
         let portIndex = 0;

package/dist/utils/cli-generator.js

@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { hasResolver, isPositional } from "@zapier/zapier-sdk";
-import { SchemaParameterResolver } from "./parameter-resolver";
-import { createPager } from "./pager";
-import { formatItemsFromSchema } from "./schema-formatter";
+import { SchemaParameterResolver } from "./parameter-resolver.js";
+import { createPager } from "./pager.js";
+import { formatItemsFromSchema } from "./schema-formatter.js";
 import chalk from "chalk";
 import util from "util";
 // ============================================================================

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Command line interface for Zapier SDK",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -22,7 +23,6 @@
     "chalk": "^5.3.0",
     "cli-table3": "^0.6.5",
     "commander": "^12.0.0",
-    "conf": "^14.0.0",
     "express": "^5.1.0",
     "inquirer": "^12.6.3",
     "jsonwebtoken": "^9.0.2",
@@ -30,7 +30,7 @@
     "ora": "^8.2.0",
     "pkce-challenge": "^5.0.0",
     "zod": "^3.25.67",
-    "@zapier/zapier-sdk": "0.2.0"
+    "@zapier/zapier-sdk": "0.3.1"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",

package/src/cli.ts

@@ -2,14 +2,13 @@
 
 import { Command } from "commander";
 import { createZapierSdk } from "@zapier/zapier-sdk";
-import { generateCliCommands } from "./utils/cli-generator";
-import { ensureValidToken } from "./utils/auth/ensureValidToken";
+import { generateCliCommands } from "./utils/cli-generator.js";
 import {
   createLoginCommand,
   createLogoutCommand,
   createWhoamiCommand,
   createConfigPathCommand,
-} from "./commands";
+} from "./commands/index.js";
 
 const program = new Command();
 
@@ -23,9 +22,8 @@ program
 const isDebugMode =
   process.env.DEBUG === "true" || process.argv.includes("--debug");
 
-// Create SDK instance with dynamic token resolution
+// Create SDK instance - automatically handles token resolution
 const sdk = createZapierSdk({
-  getToken: ensureValidToken,
   debug: isDebugMode,
 });
 

package/src/commands/configPath.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { getConfigPath } from "../utils/getConfigPath";
+import { getConfigPath } from "@zapier/zapier-sdk";
 
 export function createConfigPathCommand(): Command {
   return new Command("get-config-path")

package/src/commands/index.ts

@@ -1,4 +1,4 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createWhoamiCommand } from "./whoami";
-export { createConfigPathCommand } from "./configPath";
+export { createLoginCommand } from "./login.js";
+export { createLogoutCommand } from "./logout.js";
+export { createWhoamiCommand } from "./whoami.js";
+export { createConfigPathCommand } from "./configPath.js";

package/src/commands/login.ts

@@ -1,6 +1,6 @@
 import { Command } from "commander";
-import login from "../utils/auth/login";
-import getLoggedInUser from "../utils/auth/getLoggedInUser";
+import login from "../utils/auth/login.js";
+import { getLoggedInUser } from "@zapier/zapier-sdk";
 
 export function createLoginCommand(): Command {
   return new Command("login")

package/src/commands/logout.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import logout from "../utils/auth/logout";
+import { logout } from "@zapier/zapier-sdk";
 
 export function createLogoutCommand(): Command {
   return new Command("logout")

package/src/commands/whoami.ts

@@ -1,12 +1,17 @@
 import { Command } from "commander";
-import getLoggedInUser from "../utils/auth/getLoggedInUser";
+import { getLoggedInUser } from "@zapier/zapier-sdk";
+import { spinPromise } from "../utils/spinner.js";
 
 export function createWhoamiCommand(): Command {
   return new Command("whoami")
     .description("Show current login status and user information")
     .action(async () => {
       try {
-        const user = await getLoggedInUser();
+        const user = await spinPromise(
+          getLoggedInUser(),
+          "Checking login status...",
+        );
+
         console.log(
           `✅ Logged in as ${user.email} (Account ID: ${user.accountId})`,
         );

package/src/utils/auth/login.ts

@@ -9,13 +9,12 @@ import {
   LOGIN_PORTS,
   LOGIN_TIMEOUT_MS,
   ZAPIER_BASE,
-} from "../constants";
-import { spinPromise } from "../spinner";
-import log from "../log";
-import api from "../api/client";
-import getCallablePromise from "../getCallablePromise";
-import updateLogin from "./updateLogin";
-import logout from "./logout";
+} from "../constants.js";
+import { spinPromise } from "../spinner.js";
+import log from "../log.js";
+import api from "../api/client.js";
+import getCallablePromise from "../getCallablePromise.js";
+import { updateLogin, logout } from "@zapier/zapier-sdk";
 
 const findAvailablePort = (): Promise<number> => {
   return new Promise((resolve, reject) => {

package/src/utils/cli-generator.ts

@@ -1,9 +1,9 @@
 import { Command } from "commander";
 import { z } from "zod";
 import { ZapierSdk, hasResolver, isPositional } from "@zapier/zapier-sdk";
-import { SchemaParameterResolver } from "./parameter-resolver";
-import { createPager } from "./pager";
-import { formatItemsFromSchema } from "./schema-formatter";
+import { SchemaParameterResolver } from "./parameter-resolver.js";
+import { createPager } from "./pager.js";
+import { formatItemsFromSchema } from "./schema-formatter.js";
 import chalk from "chalk";
 import util from "util";
 

package/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "ES2020",
-    "moduleResolution": "bundler",
+    "module": "Node16",
+    "moduleResolution": "node16",
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,

package/dist/utils/auth/ensureValidToken.d.ts

@@ -1,7 +0,0 @@
-/**
- * Ensures we have a valid, non-expired JWT token.
- * Will attempt to refresh expired tokens automatically.
- * Falls back to ZAPIER_TOKEN environment variable if no stored login.
- * Returns undefined if no token is available or refresh fails.
- */
-export declare const ensureValidToken: () => Promise<string | undefined>;

package/dist/utils/auth/ensureValidToken.js

@@ -1,33 +0,0 @@
-import getAuthState from "./getAuthState";
-import refreshJWT from "./refreshJWT";
-/**
- * Ensures we have a valid, non-expired JWT token.
- * Will attempt to refresh expired tokens automatically.
- * Falls back to ZAPIER_TOKEN environment variable if no stored login.
- * Returns undefined if no token is available or refresh fails.
- */
-export const ensureValidToken = async () => {
-    try {
-        const state = getAuthState();
-        if (state.status === "logged-out") {
-            // Fall back to environment variable if not logged in
-            return process.env.ZAPIER_TOKEN;
-        }
-        if (state.status === "expired") {
-            // Attempt to refresh the token
-            try {
-                return await refreshJWT();
-            }
-            catch {
-                // If refresh fails, fall back to environment variable
-                return process.env.ZAPIER_TOKEN;
-            }
-        }
-        // Status is "logged-in", return the valid token
-        return state.jwt;
-    }
-    catch {
-        // If any error occurs, fall back to environment variable
-        return process.env.ZAPIER_TOKEN;
-    }
-};

package/dist/utils/auth/getAuthState.d.ts

@@ -1,12 +0,0 @@
-type Status = {
-    status: "logged-in";
-    jwt: string;
-    refresh_token: string;
-} | {
-    status: "expired";
-    refresh_token: string;
-} | {
-    status: "logged-out";
-};
-declare const getAuthState: () => Status;
-export default getAuthState;

package/dist/utils/auth/getAuthState.js

@@ -1,17 +0,0 @@
-import { config } from "../config";
-const getAuthState = () => {
-    const jwt = config.get("login_jwt");
-    const refreshToken = config.get("login_refresh_token");
-    const expiresAt = config.get("login_expires_at");
-    if (!jwt || !refreshToken || !expiresAt) {
-        return { status: "logged-out" };
-    }
-    if (expiresAt > Date.now() + 30 * 1000) {
-        return { status: "logged-in", jwt, refresh_token: refreshToken };
-    }
-    return {
-        status: "expired",
-        refresh_token: refreshToken,
-    };
-};
-export default getAuthState;

package/dist/utils/auth/getJWT.d.ts

@@ -1,2 +0,0 @@
-declare const getJWT: () => Promise<string>;
-export default getJWT;

package/dist/utils/auth/getJWT.js

@@ -1,13 +0,0 @@
-import getAuthState from "./getAuthState";
-import refreshJWT from "./refreshJWT";
-const getJWT = async () => {
-    const state = getAuthState();
-    if (state.status === "logged-out") {
-        throw new Error("Expected getJWT to only be called when user has logged in.");
-    }
-    if (state.status === "expired") {
-        return await refreshJWT();
-    }
-    return state.jwt;
-};
-export default getJWT;

package/dist/utils/auth/getLoggedInUser.d.ts

@@ -1,6 +0,0 @@
-declare const getLoggedInUser: () => Promise<{
-    accountId: number;
-    customUserId: number;
-    email: string;
-}>;
-export default getLoggedInUser;

package/dist/utils/auth/getLoggedInUser.js

@@ -1,47 +0,0 @@
-import jsonwebtoken from "jsonwebtoken";
-import getJWT from "./getJWT";
-const decodeJWTOrThrow = (jwt) => {
-    if (typeof jwt !== "string") {
-        throw new Error("Expected JWT to be a string");
-    }
-    const decodedJWT = jsonwebtoken.decode(jwt, { complete: true });
-    if (!decodedJWT) {
-        throw new Error("Could not decode JWT");
-    }
-    if (typeof decodedJWT.payload === "string") {
-        throw new Error("Did not expect JWT payload to be a string");
-    }
-    return decodedJWT;
-};
-const getLoggedInUser = async () => {
-    const jwt = await getJWT();
-    let decodedJwt = decodeJWTOrThrow(jwt);
-    if (decodedJwt.payload["sub_type"] == "service") {
-        decodedJwt = decodeJWTOrThrow(decodedJwt.payload["njwt"]);
-    }
-    if (typeof decodedJwt.payload["zap:acc"] !== "string") {
-        throw new Error("JWT payload does not contain accountId");
-    }
-    const accountId = parseInt(decodedJwt.payload["zap:acc"], 10);
-    if (isNaN(accountId)) {
-        throw new Error("JWT accountId is not a number");
-    }
-    if (decodedJwt.payload["sub_type"] !== "customuser" ||
-        typeof decodedJwt.payload["sub"] !== "string") {
-        throw new Error("JWT payload does not contain customUserId");
-    }
-    const customUserId = parseInt(decodedJwt.payload["sub"], 10);
-    if (isNaN(customUserId)) {
-        throw new Error("JWT customUserId is not a number");
-    }
-    const email = decodedJwt.payload["zap:uname"];
-    if (typeof email !== "string") {
-        throw new Error("JWT payload does not contain email");
-    }
-    return {
-        accountId,
-        customUserId,
-        email,
-    };
-};
-export default getLoggedInUser;

package/dist/utils/auth/logout.d.ts

@@ -1,2 +0,0 @@
-declare const logout: () => void;
-export default logout;

package/dist/utils/auth/logout.js

@@ -1,7 +0,0 @@
-import { config } from "../config";
-const logout = () => {
-    config.delete("login_jwt");
-    config.delete("login_refresh_token");
-    config.delete("login_expires_at");
-};
-export default logout;

package/dist/utils/auth/refreshJWT.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => Promise<string>;
-export default _default;

package/dist/utils/auth/refreshJWT.js

@@ -1,33 +0,0 @@
-import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, ZAPIER_BASE } from "../constants";
-import api from "../api/client";
-import serializeAsync from "../serializeAsync";
-import { spinPromise } from "../spinner";
-import getAuthState from "./getAuthState";
-import updateLogin from "./updateLogin";
-import logout from "./logout";
-const refreshJWT = async () => {
-    const state = getAuthState();
-    if (state.status === "logged-out") {
-        throw new Error("Unexpected call to refreshJWT while logged out.");
-    }
-    try {
-        const { data } = await spinPromise(api.post(`${ZAPIER_BASE}/oauth/token/`, {
-            client_id: LOGIN_CLIENT_ID,
-            refresh_token: state.refresh_token,
-            grant_type: "refresh_token",
-        }, {
-            headers: {
-                "Content-Type": "application/x-www-form-urlencoded",
-                [AUTH_MODE_HEADER]: "no",
-            },
-        }), "Refreshing your token...");
-        updateLogin(data);
-        return data.access_token;
-    }
-    catch (e) {
-        // Force logout
-        logout();
-        throw e;
-    }
-};
-export default serializeAsync(refreshJWT);

package/dist/utils/auth/updateLogin.d.ts

@@ -1,7 +0,0 @@
-interface LoginData {
-    access_token: string;
-    refresh_token: string;
-    expires_in: number;
-}
-declare const updateLogin: ({ access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn, }: LoginData) => void;
-export default updateLogin;

package/dist/utils/auth/updateLogin.js

@@ -1,7 +0,0 @@
-import { config } from "../config";
-const updateLogin = ({ access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn, }) => {
-    config.set("login_jwt", accessToken);
-    config.set("login_refresh_token", refreshToken);
-    config.set("login_expires_at", Date.now() + expiresIn * 1000);
-};
-export default updateLogin;

package/dist/utils/config.d.ts

@@ -1,2 +0,0 @@
-import Conf from "conf";
-export declare const config: Conf<Record<string, unknown>>;

package/dist/utils/config.js

@@ -1,2 +0,0 @@
-import Conf from "conf";
-export const config = new Conf({ projectName: "zapier-sdk-cli" });

package/dist/utils/getConfigPath.d.ts

@@ -1 +0,0 @@
-export declare const getConfigPath: () => string;

package/dist/utils/getConfigPath.js

@@ -1,4 +0,0 @@
-import { config } from "./config";
-export const getConfigPath = () => {
-    return config.path;
-};

package/src/utils/auth/ensureValidToken.ts

@@ -1,35 +0,0 @@
-import getAuthState from "./getAuthState";
-import refreshJWT from "./refreshJWT";
-
-/**
- * Ensures we have a valid, non-expired JWT token.
- * Will attempt to refresh expired tokens automatically.
- * Falls back to ZAPIER_TOKEN environment variable if no stored login.
- * Returns undefined if no token is available or refresh fails.
- */
-export const ensureValidToken = async (): Promise<string | undefined> => {
-  try {
-    const state = getAuthState();
-
-    if (state.status === "logged-out") {
-      // Fall back to environment variable if not logged in
-      return process.env.ZAPIER_TOKEN;
-    }
-
-    if (state.status === "expired") {
-      // Attempt to refresh the token
-      try {
-        return await refreshJWT();
-      } catch {
-        // If refresh fails, fall back to environment variable
-        return process.env.ZAPIER_TOKEN;
-      }
-    }
-
-    // Status is "logged-in", return the valid token
-    return state.jwt;
-  } catch {
-    // If any error occurs, fall back to environment variable
-    return process.env.ZAPIER_TOKEN;
-  }
-};

package/src/utils/auth/getAuthState.ts

@@ -1,36 +0,0 @@
-import { config } from "../config";
-
-type Status =
-  | {
-      status: "logged-in";
-      jwt: string;
-      refresh_token: string;
-    }
-  | {
-      status: "expired";
-      refresh_token: string;
-    }
-  | {
-      status: "logged-out";
-    };
-
-const getAuthState = (): Status => {
-  const jwt = config.get("login_jwt") as string | undefined;
-  const refreshToken = config.get("login_refresh_token") as string | undefined;
-  const expiresAt = config.get("login_expires_at") as number | undefined;
-
-  if (!jwt || !refreshToken || !expiresAt) {
-    return { status: "logged-out" };
-  }
-
-  if (expiresAt > Date.now() + 30 * 1000) {
-    return { status: "logged-in", jwt, refresh_token: refreshToken };
-  }
-
-  return {
-    status: "expired",
-    refresh_token: refreshToken,
-  };
-};
-
-export default getAuthState;

package/src/utils/auth/getJWT.ts

@@ -1,20 +0,0 @@
-import getAuthState from "./getAuthState";
-import refreshJWT from "./refreshJWT";
-
-const getJWT = async (): Promise<string> => {
-  const state = getAuthState();
-
-  if (state.status === "logged-out") {
-    throw new Error(
-      "Expected getJWT to only be called when user has logged in.",
-    );
-  }
-
-  if (state.status === "expired") {
-    return await refreshJWT();
-  }
-
-  return state.jwt;
-};
-
-export default getJWT;

package/src/utils/auth/getLoggedInUser.ts

@@ -1,68 +0,0 @@
-import jsonwebtoken, { JwtPayload } from "jsonwebtoken";
-import getJWT from "./getJWT";
-
-const decodeJWTOrThrow = (jwt: unknown): JwtPayload => {
-  if (typeof jwt !== "string") {
-    throw new Error("Expected JWT to be a string");
-  }
-
-  const decodedJWT = jsonwebtoken.decode(jwt, { complete: true });
-
-  if (!decodedJWT) {
-    throw new Error("Could not decode JWT");
-  }
-
-  if (typeof decodedJWT.payload === "string") {
-    throw new Error("Did not expect JWT payload to be a string");
-  }
-
-  return decodedJWT;
-};
-
-const getLoggedInUser = async (): Promise<{
-  accountId: number;
-  customUserId: number;
-  email: string;
-}> => {
-  const jwt = await getJWT();
-
-  let decodedJwt = decodeJWTOrThrow(jwt);
-
-  if (decodedJwt.payload["sub_type"] == "service") {
-    decodedJwt = decodeJWTOrThrow(decodedJwt.payload["njwt"]);
-  }
-
-  if (typeof decodedJwt.payload["zap:acc"] !== "string") {
-    throw new Error("JWT payload does not contain accountId");
-  }
-
-  const accountId = parseInt(decodedJwt.payload["zap:acc"], 10);
-  if (isNaN(accountId)) {
-    throw new Error("JWT accountId is not a number");
-  }
-
-  if (
-    decodedJwt.payload["sub_type"] !== "customuser" ||
-    typeof decodedJwt.payload["sub"] !== "string"
-  ) {
-    throw new Error("JWT payload does not contain customUserId");
-  }
-
-  const customUserId = parseInt(decodedJwt.payload["sub"], 10);
-  if (isNaN(customUserId)) {
-    throw new Error("JWT customUserId is not a number");
-  }
-
-  const email = decodedJwt.payload["zap:uname"];
-  if (typeof email !== "string") {
-    throw new Error("JWT payload does not contain email");
-  }
-
-  return {
-    accountId,
-    customUserId,
-    email,
-  };
-};
-
-export default getLoggedInUser;

package/src/utils/auth/logout.ts

@@ -1,9 +0,0 @@
-import { config } from "../config";
-
-const logout = () => {
-  config.delete("login_jwt");
-  config.delete("login_refresh_token");
-  config.delete("login_expires_at");
-};
-
-export default logout;

package/src/utils/auth/refreshJWT.ts

@@ -1,50 +0,0 @@
-import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, ZAPIER_BASE } from "../constants";
-import api from "../api/client";
-import serializeAsync from "../serializeAsync";
-import { spinPromise } from "../spinner";
-import getAuthState from "./getAuthState";
-import updateLogin from "./updateLogin";
-import logout from "./logout";
-
-const refreshJWT = async (): Promise<string> => {
-  const state = getAuthState();
-
-  if (state.status === "logged-out") {
-    throw new Error("Unexpected call to refreshJWT while logged out.");
-  }
-
-  try {
-    const { data } = await spinPromise(
-      api.post<{
-        access_token: string;
-        refresh_token: string;
-        expires_in: number;
-      }>(
-        `${ZAPIER_BASE}/oauth/token/`,
-        {
-          client_id: LOGIN_CLIENT_ID,
-          refresh_token: state.refresh_token,
-          grant_type: "refresh_token",
-        },
-        {
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded",
-            [AUTH_MODE_HEADER]: "no",
-          },
-        },
-      ),
-      "Refreshing your token...",
-    );
-
-    updateLogin(data);
-
-    return data.access_token;
-  } catch (e) {
-    // Force logout
-    logout();
-
-    throw e;
-  }
-};
-
-export default serializeAsync(refreshJWT);

package/src/utils/auth/updateLogin.ts

@@ -1,19 +0,0 @@
-import { config } from "../config";
-
-interface LoginData {
-  access_token: string;
-  refresh_token: string;
-  expires_in: number;
-}
-
-const updateLogin = ({
-  access_token: accessToken,
-  refresh_token: refreshToken,
-  expires_in: expiresIn,
-}: LoginData) => {
-  config.set("login_jwt", accessToken);
-  config.set("login_refresh_token", refreshToken);
-  config.set("login_expires_at", Date.now() + expiresIn * 1000);
-};
-
-export default updateLogin;

package/src/utils/config.ts

@@ -1,3 +0,0 @@
-import Conf from "conf";
-
-export const config = new Conf({ projectName: "zapier-sdk-cli" });

package/src/utils/getConfigPath.ts

@@ -1,5 +0,0 @@
-import { config } from "./config";
-
-export const getConfigPath = (): string => {
-  return config.path;
-};