@vercel/oidc 3.3.0 → 3.3.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/oidc
 
+## 3.3.1
+
+### Patch Changes
+
+- bf07448: Revert "auth: Make it possible to store CLI credentials in OS keychain (#16083)"
+
 ## 3.3.0
 
 ### Minor Changes

package/dist/auth-config.d.ts

@@ -1,9 +1,7 @@
 /**
- * Auth configuration stored in ~/.../com.vercel.cli/auth.json or OS keyring
+ * Auth configuration stored in ~/.../com.vercel.cli/auth.json
  */
 export interface AuthConfig {
-    '// Note'?: string;
-    '// Docs'?: string;
     /** An `access_token` obtained using the OAuth Device Authorization flow. */
     token?: string;
     /** A `refresh_token` obtained using the OAuth Device Authorization flow. */

package/dist/auth-config.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var auth_config_exports = {};
 __export(auth_config_exports, {
@@ -23,35 +33,40 @@ __export(auth_config_exports, {
   writeAuthConfig: () => writeAuthConfig
 });
 module.exports = __toCommonJS(auth_config_exports);
+var fs = __toESM(require("fs"));
+var path = __toESM(require("path"));
 var import_token_util = require("./token-util");
-const {
-  clearAllCredentialsStrict,
-  hasCredentials,
-  readCredentials,
-  writeCredentials
-} = require("@vercel/cli-auth/credentials-store.js");
-function getAuthConfigDir() {
+function getAuthConfigPath() {
   const dataDir = (0, import_token_util.getVercelDataDir)();
   if (!dataDir) {
     throw new Error(
       `Unable to find Vercel CLI data directory. Your platform: ${process.platform}. Supported: darwin, linux, win32.`
     );
   }
-  return dataDir;
+  return path.join(dataDir, "auth.json");
 }
 function readAuthConfig() {
   try {
-    return readCredentials(getAuthConfigDir());
+    const authPath = getAuthConfigPath();
+    if (!fs.existsSync(authPath)) {
+      return null;
+    }
+    const content = fs.readFileSync(authPath, "utf8");
+    if (!content) {
+      return null;
+    }
+    return JSON.parse(content);
   } catch (_error) {
     return null;
   }
 }
 function writeAuthConfig(config) {
-  if (hasCredentials(config)) {
-    writeCredentials(getAuthConfigDir(), config);
-    return;
+  const authPath = getAuthConfigPath();
+  const authDir = path.dirname(authPath);
+  if (!fs.existsSync(authDir)) {
+    fs.mkdirSync(authDir, { mode: 504, recursive: true });
   }
-  clearAllCredentialsStrict(getAuthConfigDir());
+  fs.writeFileSync(authPath, JSON.stringify(config, null, 2), { mode: 384 });
 }
 function isValidAccessToken(authConfig, expirationBufferMs = 0) {
   if (!authConfig.token)

package/dist/get-vercel-oidc-token.test.js

@@ -54,10 +54,6 @@ import_vitest.vi.mock("./get-context", () => ({
     fs.mkdirSync(path.join(rootDir, ".vercel"), {
       recursive: true
     });
-    fs.writeFileSync(
-      path.join(cliDataDir, "config.json"),
-      JSON.stringify({ authTokenStorage: "file" })
-    );
     import_vitest.vi.spyOn(process, "cwd").mockReturnValue(rootDir);
     import_vitest.vi.mocked(import_token_io.findRootDir).mockReturnValue(rootDir);
     import_vitest.vi.mocked(import_token_io.getUserDataDir).mockReturnValue(userDataDir);

package/dist/token.test.js

@@ -49,14 +49,7 @@ import_vitest.vi.mock("./token-io");
     fs.mkdirSync(path.join(rootDir, ".vercel"), {
       recursive: true
     });
-    fs.writeFileSync(
-      path.join(cliDataDir, "config.json"),
-      JSON.stringify({ authTokenStorage: "file" })
-    );
-    fs.writeFileSync(
-      path.join(cliDataDir, "auth.json"),
-      JSON.stringify({ token: "test" })
-    );
+    fs.writeFileSync(path.join(cliDataDir, "auth.json"), '{token: "test"}');
     fs.writeFileSync(
       path.join(rootDir, ".vercel", "project.json"),
       JSON.stringify({ projectId })

package/package.json

@@ -17,7 +17,7 @@
       "require": "./dist/index.js"
     }
   },
-  "version": "3.3.0",
+  "version": "3.3.1",
   "repository": {
     "directory": "packages/oidc",
     "type": "git",
@@ -26,9 +26,6 @@
   "bugs": {
     "url": "https://github.com/vercel/vercel/issues"
   },
-  "dependencies": {
-    "@vercel/cli-auth": "0.1.0"
-  },
   "devDependencies": {
     "prettier": "3.8.3",
     "tinyspawn": "1.3.1",