@vercel/oidc 3.2.1 → 3.3.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/oidc
 
+## 3.3.0
+
+### Minor Changes
+
+- 24686d0: Add configurable auth token storage with keyring-backed persistence and file fallback support.
+
+### Patch Changes
+
+- 56c9f89: add missing prettier dev dependency
+- Updated dependencies [24686d0]
+- Updated dependencies [d36ee35]
+- Updated dependencies [56c9f89]
+  - @vercel/cli-auth@0.1.0
+
 ## 3.2.1
 
 ### Patch Changes

package/dist/auth-config.d.ts

@@ -1,7 +1,9 @@
 /**
- * Auth configuration stored in ~/.../com.vercel.cli/auth.json
+ * Auth configuration stored in ~/.../com.vercel.cli/auth.json or OS keyring
  */
 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,9 +1,7 @@
 "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)
@@ -17,14 +15,6 @@ 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, {
@@ -33,40 +23,35 @@ __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");
-function getAuthConfigPath() {
+const {
+  clearAllCredentialsStrict,
+  hasCredentials,
+  readCredentials,
+  writeCredentials
+} = require("@vercel/cli-auth/credentials-store.js");
+function getAuthConfigDir() {
   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 path.join(dataDir, "auth.json");
+  return dataDir;
 }
 function readAuthConfig() {
   try {
-    const authPath = getAuthConfigPath();
-    if (!fs.existsSync(authPath)) {
-      return null;
-    }
-    const content = fs.readFileSync(authPath, "utf8");
-    if (!content) {
-      return null;
-    }
-    return JSON.parse(content);
+    return readCredentials(getAuthConfigDir());
   } catch (_error) {
     return null;
   }
 }
 function writeAuthConfig(config) {
-  const authPath = getAuthConfigPath();
-  const authDir = path.dirname(authPath);
-  if (!fs.existsSync(authDir)) {
-    fs.mkdirSync(authDir, { mode: 504, recursive: true });
+  if (hasCredentials(config)) {
+    writeCredentials(getAuthConfigDir(), config);
+    return;
   }
-  fs.writeFileSync(authPath, JSON.stringify(config, null, 2), { mode: 384 });
+  clearAllCredentialsStrict(getAuthConfigDir());
 }
 function isValidAccessToken(authConfig, expirationBufferMs = 0) {
   if (!authConfig.token)

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

@@ -54,6 +54,10 @@ 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,7 +49,14 @@ import_vitest.vi.mock("./token-io");
     fs.mkdirSync(path.join(rootDir, ".vercel"), {
       recursive: true
     });
-    fs.writeFileSync(path.join(cliDataDir, "auth.json"), '{token: "test"}');
+    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(rootDir, ".vercel", "project.json"),
       JSON.stringify({ projectId })

package/package.json

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