convex 1.47.0 → 1.48.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser.bundle.js +1 -1
- package/dist/browser.bundle.js.map +1 -1
- package/dist/cjs/bundler/context.js +7 -5
- package/dist/cjs/bundler/context.js.map +2 -2
- package/dist/cjs/bundler/fs.js +47 -6
- package/dist/cjs/bundler/fs.js.map +2 -2
- package/dist/cjs/cli/account.js +237 -0
- package/dist/cjs/cli/account.js.map +7 -0
- package/dist/cjs/cli/configure.js +15 -2
- package/dist/cjs/cli/configure.js.map +2 -2
- package/dist/cjs/cli/lib/deployKeyWarning.js +43 -0
- package/dist/cjs/cli/lib/deployKeyWarning.js.map +7 -0
- package/dist/cjs/cli/lib/deployment.js +2 -0
- package/dist/cjs/cli/lib/deployment.js.map +2 -2
- package/dist/cjs/cli/lib/deploymentSelection.js +27 -18
- package/dist/cjs/cli/lib/deploymentSelection.js.map +2 -2
- package/dist/cjs/cli/lib/envvars.js +32 -0
- package/dist/cjs/cli/lib/envvars.js.map +2 -2
- package/dist/cjs/cli/lib/fsUtils.js +1 -1
- package/dist/cjs/cli/lib/fsUtils.js.map +2 -2
- package/dist/cjs/cli/lib/generateDocs.js +1 -1
- package/dist/cjs/cli/lib/generateDocs.js.map +1 -1
- package/dist/cjs/cli/lib/login.js +28 -4
- package/dist/cjs/cli/lib/login.js.map +2 -2
- package/dist/cjs/cli/lib/mcp/requestContext.js +5 -1
- package/dist/cjs/cli/lib/mcp/requestContext.js.map +2 -2
- package/dist/cjs/cli/lib/profileManagement.js +196 -0
- package/dist/cjs/cli/lib/profileManagement.js.map +7 -0
- package/dist/cjs/cli/lib/profiles.js +333 -0
- package/dist/cjs/cli/lib/profiles.js.map +7 -0
- package/dist/cjs/cli/lib/utils/utils.js +18 -9
- package/dist/cjs/cli/lib/utils/utils.js.map +2 -2
- package/dist/cjs/cli/login.js +213 -114
- package/dist/cjs/cli/login.js.map +3 -3
- package/dist/cjs/cli/logout.js +113 -12
- package/dist/cjs/cli/logout.js.map +3 -3
- package/dist/cjs/cli/mcp.js +43 -10
- package/dist/cjs/cli/mcp.js.map +3 -3
- package/dist/cjs/cli/program.js +2 -1
- package/dist/cjs/cli/program.js.map +2 -2
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs-types/bundler/context.d.ts +5 -0
- package/dist/cjs-types/bundler/context.d.ts.map +1 -1
- package/dist/cjs-types/bundler/fs.d.ts +7 -2
- package/dist/cjs-types/bundler/fs.d.ts.map +1 -1
- package/dist/cjs-types/cli/account.d.ts +6 -0
- package/dist/cjs-types/cli/account.d.ts.map +1 -0
- package/dist/cjs-types/cli/configure.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/deployKeyWarning.d.ts +3 -0
- package/dist/cjs-types/cli/lib/deployKeyWarning.d.ts.map +1 -0
- package/dist/cjs-types/cli/lib/deployment.d.ts +2 -0
- package/dist/cjs-types/cli/lib/deployment.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/deploymentSelection.d.ts +2 -1
- package/dist/cjs-types/cli/lib/deploymentSelection.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/envvars.d.ts +6 -0
- package/dist/cjs-types/cli/lib/envvars.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/fsUtils.d.ts +1 -0
- package/dist/cjs-types/cli/lib/fsUtils.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/login.d.ts +3 -1
- package/dist/cjs-types/cli/lib/login.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/mcp/requestContext.d.ts.map +1 -1
- package/dist/cjs-types/cli/lib/mcp/tools/insights.d.ts +2 -2
- package/dist/cjs-types/cli/lib/profileManagement.d.ts +10 -0
- package/dist/cjs-types/cli/lib/profileManagement.d.ts.map +1 -0
- package/dist/cjs-types/cli/lib/profiles.d.ts +59 -0
- package/dist/cjs-types/cli/lib/profiles.d.ts.map +1 -0
- package/dist/cjs-types/cli/lib/utils/utils.d.ts +5 -0
- package/dist/cjs-types/cli/lib/utils/utils.d.ts.map +1 -1
- package/dist/cjs-types/cli/login.d.ts +21 -0
- package/dist/cjs-types/cli/login.d.ts.map +1 -1
- package/dist/cjs-types/cli/logout.d.ts +8 -1
- package/dist/cjs-types/cli/logout.d.ts.map +1 -1
- package/dist/cjs-types/cli/mcp.d.ts.map +1 -1
- package/dist/cjs-types/cli/program.d.ts.map +1 -1
- package/dist/cjs-types/index.d.ts +1 -1
- package/dist/cjs-types/index.d.ts.map +1 -1
- package/dist/cli.bundle.cjs +2118 -1096
- package/dist/cli.bundle.cjs.map +4 -4
- package/dist/esm/bundler/context.js +7 -5
- package/dist/esm/bundler/context.js.map +2 -2
- package/dist/esm/bundler/fs.js +47 -6
- package/dist/esm/bundler/fs.js.map +2 -2
- package/dist/esm/cli/account.js +221 -0
- package/dist/esm/cli/account.js.map +7 -0
- package/dist/esm/cli/configure.js +15 -2
- package/dist/esm/cli/configure.js.map +2 -2
- package/dist/esm/cli/lib/deployKeyWarning.js +27 -0
- package/dist/esm/cli/lib/deployKeyWarning.js.map +7 -0
- package/dist/esm/cli/lib/deployment.js +2 -2
- package/dist/esm/cli/lib/deployment.js.map +2 -2
- package/dist/esm/cli/lib/deploymentSelection.js +35 -20
- package/dist/esm/cli/lib/deploymentSelection.js.map +2 -2
- package/dist/esm/cli/lib/envvars.js +35 -1
- package/dist/esm/cli/lib/envvars.js.map +2 -2
- package/dist/esm/cli/lib/fsUtils.js +1 -1
- package/dist/esm/cli/lib/fsUtils.js.map +2 -2
- package/dist/esm/cli/lib/generateDocs.js +1 -1
- package/dist/esm/cli/lib/generateDocs.js.map +1 -1
- package/dist/esm/cli/lib/login.js +36 -4
- package/dist/esm/cli/lib/login.js.map +2 -2
- package/dist/esm/cli/lib/mcp/requestContext.js +5 -1
- package/dist/esm/cli/lib/mcp/requestContext.js.map +2 -2
- package/dist/esm/cli/lib/profileManagement.js +179 -0
- package/dist/esm/cli/lib/profileManagement.js.map +7 -0
- package/dist/esm/cli/lib/profiles.js +288 -0
- package/dist/esm/cli/lib/profiles.js.map +7 -0
- package/dist/esm/cli/lib/utils/utils.js +16 -9
- package/dist/esm/cli/lib/utils/utils.js.map +2 -2
- package/dist/esm/cli/login.js +225 -112
- package/dist/esm/cli/login.js.map +3 -3
- package/dist/esm/cli/logout.js +110 -13
- package/dist/esm/cli/logout.js.map +2 -2
- package/dist/esm/cli/mcp.js +34 -10
- package/dist/esm/cli/mcp.js.map +2 -2
- package/dist/esm/cli/program.js +2 -1
- package/dist/esm/cli/program.js.map +2 -2
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm-types/bundler/context.d.ts +5 -0
- package/dist/esm-types/bundler/context.d.ts.map +1 -1
- package/dist/esm-types/bundler/fs.d.ts +7 -2
- package/dist/esm-types/bundler/fs.d.ts.map +1 -1
- package/dist/esm-types/cli/account.d.ts +6 -0
- package/dist/esm-types/cli/account.d.ts.map +1 -0
- package/dist/esm-types/cli/configure.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/deployKeyWarning.d.ts +3 -0
- package/dist/esm-types/cli/lib/deployKeyWarning.d.ts.map +1 -0
- package/dist/esm-types/cli/lib/deployment.d.ts +2 -0
- package/dist/esm-types/cli/lib/deployment.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/deploymentSelection.d.ts +2 -1
- package/dist/esm-types/cli/lib/deploymentSelection.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/envvars.d.ts +6 -0
- package/dist/esm-types/cli/lib/envvars.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/fsUtils.d.ts +1 -0
- package/dist/esm-types/cli/lib/fsUtils.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/login.d.ts +3 -1
- package/dist/esm-types/cli/lib/login.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/mcp/requestContext.d.ts.map +1 -1
- package/dist/esm-types/cli/lib/mcp/tools/insights.d.ts +2 -2
- package/dist/esm-types/cli/lib/profileManagement.d.ts +10 -0
- package/dist/esm-types/cli/lib/profileManagement.d.ts.map +1 -0
- package/dist/esm-types/cli/lib/profiles.d.ts +59 -0
- package/dist/esm-types/cli/lib/profiles.d.ts.map +1 -0
- package/dist/esm-types/cli/lib/utils/utils.d.ts +5 -0
- package/dist/esm-types/cli/lib/utils/utils.d.ts.map +1 -1
- package/dist/esm-types/cli/login.d.ts +21 -0
- package/dist/esm-types/cli/login.d.ts.map +1 -1
- package/dist/esm-types/cli/logout.d.ts +8 -1
- package/dist/esm-types/cli/logout.d.ts.map +1 -1
- package/dist/esm-types/cli/mcp.d.ts.map +1 -1
- package/dist/esm-types/cli/program.d.ts.map +1 -1
- package/dist/esm-types/index.d.ts +1 -1
- package/dist/esm-types/index.d.ts.map +1 -1
- package/dist/react.bundle.js +1 -1
- package/dist/react.bundle.js.map +1 -1
- package/package.json +1 -1
- package/src/bundler/context.ts +9 -5
- package/src/bundler/fs.ts +54 -5
- package/src/cli/account.ts +320 -0
- package/src/cli/configure.ts +18 -2
- package/src/cli/lib/deployKeyWarning.ts +43 -0
- package/src/cli/lib/deployment.ts +2 -2
- package/src/cli/lib/deploymentSelection.ts +37 -18
- package/src/cli/lib/envvars.ts +43 -1
- package/src/cli/lib/fsUtils.ts +5 -2
- package/src/cli/lib/generateDocs.ts +1 -1
- package/src/cli/lib/login.ts +47 -3
- package/src/cli/lib/mcp/requestContext.ts +7 -1
- package/src/cli/lib/profileManagement.ts +262 -0
- package/src/cli/lib/profiles.ts +398 -0
- package/src/cli/lib/utils/utils.ts +19 -15
- package/src/cli/login.ts +293 -168
- package/src/cli/logout.ts +142 -17
- package/src/cli/mcp.ts +48 -11
- package/src/cli/program.ts +2 -0
- package/src/index.ts +1 -1
|
@@ -0,0 +1,333 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
|
+
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var profiles_exports = {};
|
|
30
|
+
__export(profiles_exports, {
|
|
31
|
+
findProfileDirectory: () => findProfileDirectory,
|
|
32
|
+
getProfileSelection: () => getProfileSelection,
|
|
33
|
+
initializeDefaultProfile: () => initializeDefaultProfile,
|
|
34
|
+
legacyAuthForFirstProfile: () => legacyAuthForFirstProfile,
|
|
35
|
+
profileConfigPath: () => profileConfigPath,
|
|
36
|
+
readProfileAuth: () => readProfileAuth,
|
|
37
|
+
readProfileCredentials: () => readProfileCredentials,
|
|
38
|
+
readProfileSettings: () => readProfileSettings,
|
|
39
|
+
readProfileToken: () => readProfileToken,
|
|
40
|
+
savedProfileNames: () => savedProfileNames,
|
|
41
|
+
updateProfileSettings: () => updateProfileSettings,
|
|
42
|
+
validateProfileName: () => validateProfileName,
|
|
43
|
+
writeProfileCredentials: () => writeProfileCredentials,
|
|
44
|
+
writeProfileDirectory: () => writeProfileDirectory
|
|
45
|
+
});
|
|
46
|
+
module.exports = __toCommonJS(profiles_exports);
|
|
47
|
+
var import_path = __toESM(require("path"), 1);
|
|
48
|
+
var import_util = require("util");
|
|
49
|
+
var import_crypto = require("crypto");
|
|
50
|
+
var dotenv = __toESM(require("dotenv"), 1);
|
|
51
|
+
var import_zod = require("zod");
|
|
52
|
+
var import_log = require("../../bundler/log.js");
|
|
53
|
+
var import_globalConfig = require("./utils/globalConfig.js");
|
|
54
|
+
var import_utils = require("./utils/utils.js");
|
|
55
|
+
var import_envvars = require("./envvars.js");
|
|
56
|
+
const settingsSchema = import_zod.z.object({
|
|
57
|
+
defaultProfile: import_zod.z.string().optional(),
|
|
58
|
+
directories: import_zod.z.record(import_zod.z.string()).optional(),
|
|
59
|
+
revokeReplacedTokens: import_zod.z.boolean().optional()
|
|
60
|
+
}).passthrough();
|
|
61
|
+
const credentialsSchema = import_zod.z.object({
|
|
62
|
+
accessToken: import_zod.z.string().min(1),
|
|
63
|
+
memberId: import_zod.z.string().optional(),
|
|
64
|
+
email: import_zod.z.string().optional()
|
|
65
|
+
}).passthrough();
|
|
66
|
+
async function readProfileSettings(ctx) {
|
|
67
|
+
if (!ctx.fs.exists((0, import_globalConfig.globalConfigPath)())) return {};
|
|
68
|
+
try {
|
|
69
|
+
return settingsSchema.parse(
|
|
70
|
+
JSON.parse(ctx.fs.readUtf8File((0, import_globalConfig.globalConfigPath)()))
|
|
71
|
+
);
|
|
72
|
+
} catch {
|
|
73
|
+
return await ctx.crash({
|
|
74
|
+
exitCode: 1,
|
|
75
|
+
errorType: "invalid filesystem data",
|
|
76
|
+
printedMessage: `Unable to read account settings from ${(0, import_globalConfig.globalConfigPath)()}. Check defaultProfile, directories, and revokeReplacedTokens.`
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function writeProfileSettings(ctx, settings) {
|
|
81
|
+
if (Object.keys(settings).length === 0) {
|
|
82
|
+
if (ctx.fs.exists((0, import_globalConfig.globalConfigPath)())) ctx.fs.unlink((0, import_globalConfig.globalConfigPath)());
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
const temporary = `${(0, import_globalConfig.globalConfigPath)()}.${(0, import_crypto.randomUUID)()}.tmp`;
|
|
86
|
+
try {
|
|
87
|
+
ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 384);
|
|
88
|
+
ctx.fs.swapTmpFile(temporary, (0, import_globalConfig.globalConfigPath)());
|
|
89
|
+
} finally {
|
|
90
|
+
if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
async function updateProfileSettings(ctx, update, afterWrite) {
|
|
94
|
+
const lockPath = `${(0, import_globalConfig.globalConfigPath)()}.lock`;
|
|
95
|
+
ctx.fs.mkdir((0, import_utils.rootDirectory)(), { allowExisting: true });
|
|
96
|
+
const deadline = Date.now() + 5e3;
|
|
97
|
+
for (; ; ) {
|
|
98
|
+
try {
|
|
99
|
+
ctx.fs.mkdir(lockPath);
|
|
100
|
+
break;
|
|
101
|
+
} catch (err) {
|
|
102
|
+
if (err.code !== "EEXIST") throw err;
|
|
103
|
+
if (Date.now() >= deadline) {
|
|
104
|
+
return await ctx.crash({
|
|
105
|
+
exitCode: 1,
|
|
106
|
+
errorType: "fatal",
|
|
107
|
+
printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
await new Promise((resolve) => setTimeout(resolve, 25));
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
let released = false;
|
|
114
|
+
const release = () => {
|
|
115
|
+
if (released) return;
|
|
116
|
+
ctx.fs.rmdir(lockPath);
|
|
117
|
+
released = true;
|
|
118
|
+
};
|
|
119
|
+
const cleanup = ctx.registerCleanup(async () => release());
|
|
120
|
+
try {
|
|
121
|
+
const settings = await readProfileSettings(ctx);
|
|
122
|
+
const result = await update(settings);
|
|
123
|
+
writeProfileSettings(ctx, settings);
|
|
124
|
+
afterWrite?.();
|
|
125
|
+
return result;
|
|
126
|
+
} finally {
|
|
127
|
+
ctx.removeCleanup(cleanup);
|
|
128
|
+
release();
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
function profileConfigPath(name) {
|
|
132
|
+
return import_path.default.join(
|
|
133
|
+
(0, import_utils.rootDirectory)(),
|
|
134
|
+
"profiles",
|
|
135
|
+
`${encodeURIComponent(name)}.json`
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
async function validateProfileName(ctx, name) {
|
|
139
|
+
if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {
|
|
140
|
+
await ctx.crash({
|
|
141
|
+
exitCode: 1,
|
|
142
|
+
errorType: "invalid filesystem or env vars",
|
|
143
|
+
printedMessage: "Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores."
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
async function getProfileSelection(ctx, options = {}) {
|
|
148
|
+
let name = options.name;
|
|
149
|
+
let source = "--account";
|
|
150
|
+
if (name === void 0 && process.env[import_envvars.CONVEX_ACCOUNT_ENV_VAR] !== void 0) {
|
|
151
|
+
name = process.env[import_envvars.CONVEX_ACCOUNT_ENV_VAR];
|
|
152
|
+
source = `${import_envvars.CONVEX_ACCOUNT_ENV_VAR} environment variable`;
|
|
153
|
+
}
|
|
154
|
+
if (name === void 0) {
|
|
155
|
+
const files = options.envFile ? [options.envFile] : [import_utils.ENV_VAR_FILE_PATH, ".env"];
|
|
156
|
+
for (const file of files) {
|
|
157
|
+
if (!ctx.fs.exists(file)) continue;
|
|
158
|
+
name = dotenv.parse(ctx.fs.readUtf8File(file))[import_envvars.CONVEX_ACCOUNT_ENV_VAR];
|
|
159
|
+
if (name !== void 0) {
|
|
160
|
+
source = `${import_envvars.CONVEX_ACCOUNT_ENV_VAR} in ${file}`;
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
if (name === void 0) {
|
|
166
|
+
const config = await readProfileSettings(ctx);
|
|
167
|
+
const binding = findProfileDirectory(
|
|
168
|
+
config.directories ?? {},
|
|
169
|
+
process.cwd()
|
|
170
|
+
);
|
|
171
|
+
name = binding?.name ?? config.defaultProfile;
|
|
172
|
+
source = binding ? `directory selection for ${binding.directory}` : `default account in ${(0, import_globalConfig.globalConfigPath)()}`;
|
|
173
|
+
}
|
|
174
|
+
if (name === void 0) return null;
|
|
175
|
+
await validateProfileName(ctx, name);
|
|
176
|
+
return { name, source };
|
|
177
|
+
}
|
|
178
|
+
async function readProfileAuth(ctx, profile, allowMissing = false) {
|
|
179
|
+
const credentials = await readProfileCredentials(ctx, profile, allowMissing);
|
|
180
|
+
return credentials === null ? null : {
|
|
181
|
+
kind: "accessToken",
|
|
182
|
+
accessToken: credentials.accessToken,
|
|
183
|
+
header: `Bearer ${credentials.accessToken}`,
|
|
184
|
+
profile
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
async function readProfileCredentials(ctx, profile, allowMissing = false) {
|
|
188
|
+
await validateProfileName(ctx, profile.name);
|
|
189
|
+
const configPath = profileConfigPath(profile.name);
|
|
190
|
+
if (!ctx.fs.exists(configPath)) {
|
|
191
|
+
if (allowMissing) return null;
|
|
192
|
+
return await ctx.crash({
|
|
193
|
+
exitCode: 1,
|
|
194
|
+
errorType: "invalid filesystem data",
|
|
195
|
+
printedMessage: `Account "${profile.name}" selected by ${profile.source} is not logged in. Run \`npx convex login --account ${profile.name}\`.`
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
try {
|
|
199
|
+
return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));
|
|
200
|
+
} catch {
|
|
201
|
+
return await ctx.crash({
|
|
202
|
+
exitCode: 1,
|
|
203
|
+
errorType: "invalid filesystem data",
|
|
204
|
+
printedMessage: `Unable to read credentials for account "${profile.name}" from ${configPath}.`
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
function readProfileToken(ctx, name) {
|
|
209
|
+
try {
|
|
210
|
+
const token = JSON.parse(
|
|
211
|
+
ctx.fs.readUtf8File(profileConfigPath(name))
|
|
212
|
+
).accessToken;
|
|
213
|
+
return typeof token === "string" && token.length > 0 ? token : null;
|
|
214
|
+
} catch {
|
|
215
|
+
return null;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
async function writeCredentialsFile(ctx, name, credentials) {
|
|
219
|
+
const configPath = profileConfigPath(name);
|
|
220
|
+
const directory = import_path.default.dirname(configPath);
|
|
221
|
+
ctx.fs.mkdir(directory, { allowExisting: true });
|
|
222
|
+
for (const dir of [(0, import_utils.rootDirectory)(), directory]) {
|
|
223
|
+
if (!ctx.fs.lstat(dir).isDirectory()) {
|
|
224
|
+
return await ctx.crash({
|
|
225
|
+
exitCode: 1,
|
|
226
|
+
errorType: "invalid filesystem data",
|
|
227
|
+
printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
const temporary = `${configPath}.${(0, import_crypto.randomUUID)()}.tmp`;
|
|
232
|
+
try {
|
|
233
|
+
ctx.fs.writeUtf8File(
|
|
234
|
+
temporary,
|
|
235
|
+
JSON.stringify(credentials, null, 2),
|
|
236
|
+
384
|
|
237
|
+
);
|
|
238
|
+
ctx.fs.swapTmpFile(temporary, configPath);
|
|
239
|
+
} finally {
|
|
240
|
+
if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
async function writeProfileCredentials(ctx, name, accessToken, metadata = {}, expected) {
|
|
244
|
+
await validateProfileName(ctx, name);
|
|
245
|
+
await updateProfileSettings(ctx, async (settings) => {
|
|
246
|
+
if (expected !== void 0) {
|
|
247
|
+
const current = await readProfileCredentials(
|
|
248
|
+
ctx,
|
|
249
|
+
{ name, source: "login" },
|
|
250
|
+
true
|
|
251
|
+
);
|
|
252
|
+
if (!(0, import_util.isDeepStrictEqual)(current, expected)) {
|
|
253
|
+
return await ctx.crash({
|
|
254
|
+
exitCode: 1,
|
|
255
|
+
errorType: "fatal",
|
|
256
|
+
printedMessage: `Account "${name}" changed during login. Retry the login.`
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
await writeCredentialsFile(ctx, name, { ...metadata, accessToken });
|
|
261
|
+
if (settings.defaultProfile === name) settings.accessToken = accessToken;
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
async function legacyAuthForFirstProfile(ctx, profile) {
|
|
265
|
+
const settings = await readProfileSettings(ctx);
|
|
266
|
+
const profilesDir = import_path.default.dirname(profileConfigPath(profile.name));
|
|
267
|
+
if (settings.defaultProfile !== void 0 || ctx.fs.exists(profilesDir) && ctx.fs.listDir(profilesDir).some((entry) => entry.name.endsWith(".json"))) {
|
|
268
|
+
return null;
|
|
269
|
+
}
|
|
270
|
+
const config = (0, import_globalConfig.readGlobalConfig)(ctx);
|
|
271
|
+
return config === null ? null : {
|
|
272
|
+
kind: "accessToken",
|
|
273
|
+
accessToken: config.accessToken,
|
|
274
|
+
header: `Bearer ${config.accessToken}`,
|
|
275
|
+
profile
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
async function initializeDefaultProfile(ctx, profile, namingLegacyAccount, select = true) {
|
|
279
|
+
const defaultProfile = await updateProfileSettings(ctx, async (settings) => {
|
|
280
|
+
if (settings.defaultProfile !== void 0) return void 0;
|
|
281
|
+
const credentials = await readProfileCredentials(ctx, profile);
|
|
282
|
+
const accessToken = credentials.accessToken;
|
|
283
|
+
const legacyToken = settings.accessToken;
|
|
284
|
+
if (!select && (savedProfileNames(ctx).some((name) => name !== profile.name) || !namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken))
|
|
285
|
+
return void 0;
|
|
286
|
+
if (!namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken) {
|
|
287
|
+
let legacyName = "default";
|
|
288
|
+
for (let suffix = 2; ctx.fs.exists(profileConfigPath(legacyName)); suffix++) {
|
|
289
|
+
legacyName = `default-${suffix}`;
|
|
290
|
+
}
|
|
291
|
+
await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });
|
|
292
|
+
settings.defaultProfile = legacyName;
|
|
293
|
+
} else {
|
|
294
|
+
settings.defaultProfile = profile.name;
|
|
295
|
+
settings.accessToken = accessToken;
|
|
296
|
+
}
|
|
297
|
+
return settings.defaultProfile;
|
|
298
|
+
});
|
|
299
|
+
if (defaultProfile !== void 0)
|
|
300
|
+
(0, import_log.logFinishedStep)(`Default account: ${defaultProfile}`);
|
|
301
|
+
}
|
|
302
|
+
function findProfileDirectory(directories, cwd) {
|
|
303
|
+
let directory = import_path.default.resolve(cwd);
|
|
304
|
+
for (; ; ) {
|
|
305
|
+
if (Object.hasOwn(directories, directory)) {
|
|
306
|
+
return { directory, name: directories[directory] };
|
|
307
|
+
}
|
|
308
|
+
const parent = import_path.default.dirname(directory);
|
|
309
|
+
if (parent === directory) return null;
|
|
310
|
+
directory = parent;
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
function savedProfileNames(ctx) {
|
|
314
|
+
const directory = import_path.default.join((0, import_utils.rootDirectory)(), "profiles");
|
|
315
|
+
if (!ctx.fs.exists(directory)) return [];
|
|
316
|
+
return ctx.fs.listDir(directory).filter((entry) => entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -5)).sort();
|
|
317
|
+
}
|
|
318
|
+
async function writeProfileDirectory(ctx, name) {
|
|
319
|
+
await validateProfileName(ctx, name);
|
|
320
|
+
await updateProfileSettings(ctx, (settings) => {
|
|
321
|
+
settings.directories = { ...settings.directories, [process.cwd()]: name };
|
|
322
|
+
});
|
|
323
|
+
(0, import_log.logFinishedStep)(
|
|
324
|
+
`Saved directory selection: ${name} (applies to this directory and its subdirectories).`
|
|
325
|
+
);
|
|
326
|
+
const selected = await getProfileSelection(ctx);
|
|
327
|
+
if (selected !== null && selected.name !== name) {
|
|
328
|
+
(0, import_log.logWarning)(
|
|
329
|
+
`Account "${selected.name}" selected by ${selected.source} overrides this directory selection. Remove that override to use account "${name}".`
|
|
330
|
+
);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
//# sourceMappingURL=profiles.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../src/cli/lib/profiles.ts"],
|
|
4
|
+
"sourcesContent": ["import path from \"path\";\nimport { isDeepStrictEqual } from \"util\";\nimport { randomUUID } from \"crypto\";\nimport { TempPath } from \"../../bundler/fs.js\";\nimport * as dotenv from \"dotenv\";\nimport { z } from \"zod\";\nimport { BigBrainAuth, Context } from \"../../bundler/context.js\";\nimport { logFinishedStep, logWarning } from \"../../bundler/log.js\";\nimport { globalConfigPath, readGlobalConfig } from \"./utils/globalConfig.js\";\nimport { ENV_VAR_FILE_PATH, rootDirectory } from \"./utils/utils.js\";\n\nimport { CONVEX_ACCOUNT_ENV_VAR } from \"./envvars.js\";\n\nexport type ProfileSelection = {\n name: string;\n source: string;\n};\n\nconst settingsSchema = z\n .object({\n defaultProfile: z.string().optional(),\n directories: z.record(z.string()).optional(),\n revokeReplacedTokens: z.boolean().optional(),\n })\n .passthrough();\n\nconst credentialsSchema = z\n .object({\n accessToken: z.string().min(1),\n memberId: z.string().optional(),\n email: z.string().optional(),\n })\n .passthrough();\n\nexport type ProfileCredentials = z.infer<typeof credentialsSchema>;\n\nexport async function readProfileSettings(\n ctx: Context,\n): Promise<z.infer<typeof settingsSchema>> {\n if (!ctx.fs.exists(globalConfigPath())) return {};\n try {\n return settingsSchema.parse(\n JSON.parse(ctx.fs.readUtf8File(globalConfigPath())),\n );\n } catch {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Unable to read account settings from ${globalConfigPath()}. Check defaultProfile, directories, and revokeReplacedTokens.`,\n });\n }\n}\n\nfunction writeProfileSettings(ctx: Context, settings: Record<string, unknown>) {\n if (Object.keys(settings).length === 0) {\n if (ctx.fs.exists(globalConfigPath())) ctx.fs.unlink(globalConfigPath());\n return;\n }\n const temporary = `${globalConfigPath()}.${randomUUID()}.tmp` as TempPath;\n try {\n ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 0o600);\n ctx.fs.swapTmpFile(temporary, globalConfigPath());\n } finally {\n if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n }\n}\n\nexport async function updateProfileSettings<T>(\n ctx: Context,\n update: (settings: z.infer<typeof settingsSchema>) => T | Promise<T>,\n afterWrite?: () => void,\n): Promise<T> {\n const lockPath = `${globalConfigPath()}.lock`;\n ctx.fs.mkdir(rootDirectory(), { allowExisting: true });\n const deadline = Date.now() + 5000;\n for (;;) {\n try {\n ctx.fs.mkdir(lockPath);\n break;\n } catch (err: any) {\n // Only the process that creates the directory owns the update lock.\n // eslint-disable-next-line no-restricted-syntax\n if (err.code !== \"EEXIST\") throw err;\n if (Date.now() >= deadline) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"fatal\",\n printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`,\n });\n }\n await new Promise((resolve) => setTimeout(resolve, 25));\n }\n }\n let released = false;\n const release = () => {\n if (released) return;\n ctx.fs.rmdir(lockPath);\n released = true;\n };\n const cleanup = ctx.registerCleanup(async () => release());\n try {\n const settings = await readProfileSettings(ctx);\n const result = await update(settings);\n writeProfileSettings(ctx, settings);\n // Credential deletion follows persistence while sharing the lock with renewals.\n afterWrite?.();\n return result;\n } finally {\n ctx.removeCleanup(cleanup);\n release();\n }\n}\n\nexport function profileConfigPath(name: string): string {\n return path.join(\n rootDirectory(),\n \"profiles\",\n `${encodeURIComponent(name)}.json`,\n );\n}\n\nexport async function validateProfileName(\n ctx: Context,\n name: string,\n): Promise<void> {\n if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {\n await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem or env vars\",\n printedMessage:\n \"Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores.\",\n });\n }\n}\n\nexport async function getProfileSelection(\n ctx: Context,\n options: { name?: string | undefined; envFile?: string | undefined } = {},\n): Promise<ProfileSelection | null> {\n let name = options.name;\n let source = \"--account\";\n if (name === undefined && process.env[CONVEX_ACCOUNT_ENV_VAR] !== undefined) {\n name = process.env[CONVEX_ACCOUNT_ENV_VAR];\n source = `${CONVEX_ACCOUNT_ENV_VAR} environment variable`;\n }\n if (name === undefined) {\n const files = options.envFile\n ? [options.envFile]\n : [ENV_VAR_FILE_PATH, \".env\"];\n for (const file of files) {\n if (!ctx.fs.exists(file)) continue;\n name = dotenv.parse(ctx.fs.readUtf8File(file))[CONVEX_ACCOUNT_ENV_VAR];\n if (name !== undefined) {\n source = `${CONVEX_ACCOUNT_ENV_VAR} in ${file}`;\n break;\n }\n }\n }\n if (name === undefined) {\n const config = await readProfileSettings(ctx);\n const binding = findProfileDirectory(\n config.directories ?? {},\n process.cwd(),\n );\n name = binding?.name ?? config.defaultProfile;\n source = binding\n ? `directory selection for ${binding.directory}`\n : `default account in ${globalConfigPath()}`;\n }\n if (name === undefined) return null;\n await validateProfileName(ctx, name);\n return { name, source };\n}\n\nexport async function readProfileAuth(\n ctx: Context,\n profile: ProfileSelection,\n allowMissing = false,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n const credentials = await readProfileCredentials(ctx, profile, allowMissing);\n return credentials === null\n ? null\n : {\n kind: \"accessToken\",\n accessToken: credentials.accessToken,\n header: `Bearer ${credentials.accessToken}`,\n profile,\n };\n}\n\nexport async function readProfileCredentials(\n ctx: Context,\n profile: ProfileSelection,\n allowMissing = false,\n): Promise<ProfileCredentials | null> {\n await validateProfileName(ctx, profile.name);\n const configPath = profileConfigPath(profile.name);\n if (!ctx.fs.exists(configPath)) {\n if (allowMissing) return null;\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Account \"${profile.name}\" selected by ${profile.source} is not logged in. Run \\`npx convex login --account ${profile.name}\\`.`,\n });\n }\n try {\n return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));\n } catch {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Unable to read credentials for account \"${profile.name}\" from ${configPath}.`,\n });\n }\n}\n\nexport function readProfileToken(ctx: Context, name: string): string | null {\n try {\n const token = JSON.parse(\n ctx.fs.readUtf8File(profileConfigPath(name)),\n ).accessToken;\n return typeof token === \"string\" && token.length > 0 ? token : null;\n } catch {\n return null;\n }\n}\n\nasync function writeCredentialsFile(\n ctx: Context,\n name: string,\n credentials: ProfileCredentials,\n) {\n const configPath = profileConfigPath(name);\n const directory = path.dirname(configPath);\n ctx.fs.mkdir(directory, { allowExisting: true });\n for (const dir of [rootDirectory(), directory]) {\n if (!ctx.fs.lstat(dir).isDirectory()) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`,\n });\n }\n }\n const temporary = `${configPath}.${randomUUID()}.tmp` as TempPath;\n try {\n ctx.fs.writeUtf8File(\n temporary,\n JSON.stringify(credentials, null, 2),\n 0o600,\n );\n ctx.fs.swapTmpFile(temporary, configPath);\n } finally {\n if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n }\n}\n\nexport async function writeProfileCredentials(\n ctx: Context,\n name: string,\n accessToken: string,\n metadata: Omit<ProfileCredentials, \"accessToken\"> = {},\n expected?: ProfileCredentials | null,\n): Promise<void> {\n await validateProfileName(ctx, name);\n await updateProfileSettings(ctx, async (settings) => {\n if (expected !== undefined) {\n const current = await readProfileCredentials(\n ctx,\n { name, source: \"login\" },\n true,\n );\n if (!isDeepStrictEqual(current, expected)) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"fatal\",\n printedMessage: `Account \"${name}\" changed during login. Retry the login.`,\n });\n }\n }\n await writeCredentialsFile(ctx, name, { ...metadata, accessToken });\n if (settings.defaultProfile === name) settings.accessToken = accessToken;\n });\n}\n\nexport async function legacyAuthForFirstProfile(\n ctx: Context,\n profile: ProfileSelection,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n const settings = await readProfileSettings(ctx);\n const profilesDir = path.dirname(profileConfigPath(profile.name));\n if (\n settings.defaultProfile !== undefined ||\n (ctx.fs.exists(profilesDir) &&\n ctx.fs.listDir(profilesDir).some((entry) => entry.name.endsWith(\".json\")))\n ) {\n return null;\n }\n const config = readGlobalConfig(ctx);\n return config === null\n ? null\n : {\n kind: \"accessToken\",\n accessToken: config.accessToken,\n header: `Bearer ${config.accessToken}`,\n profile,\n };\n}\n\nexport async function initializeDefaultProfile(\n ctx: Context,\n profile: ProfileSelection,\n namingLegacyAccount: boolean,\n select = true,\n) {\n const defaultProfile = await updateProfileSettings(ctx, async (settings) => {\n if (settings.defaultProfile !== undefined) return undefined;\n const credentials = await readProfileCredentials(ctx, profile);\n const accessToken = credentials!.accessToken;\n const legacyToken = settings.accessToken;\n if (\n !select &&\n (savedProfileNames(ctx).some((name) => name !== profile.name) ||\n (!namingLegacyAccount &&\n typeof legacyToken === \"string\" &&\n legacyToken.length > 0 &&\n legacyToken !== accessToken))\n )\n return undefined;\n if (\n !namingLegacyAccount &&\n typeof legacyToken === \"string\" &&\n legacyToken.length > 0 &&\n legacyToken !== accessToken\n ) {\n // An explicitly new login keeps the previous account as the default for\n // directories that haven't selected an account.\n let legacyName = \"default\";\n for (\n let suffix = 2;\n ctx.fs.exists(profileConfigPath(legacyName));\n suffix++\n ) {\n legacyName = `default-${suffix}`;\n }\n await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });\n settings.defaultProfile = legacyName;\n } else {\n settings.defaultProfile = profile.name;\n settings.accessToken = accessToken;\n }\n\n return settings.defaultProfile;\n });\n if (defaultProfile !== undefined)\n logFinishedStep(`Default account: ${defaultProfile}`);\n}\n\nexport function findProfileDirectory(\n directories: Record<string, string>,\n cwd: string,\n): { directory: string; name: string } | null {\n let directory = path.resolve(cwd);\n for (;;) {\n if (Object.hasOwn(directories, directory)) {\n return { directory, name: directories[directory] };\n }\n const parent = path.dirname(directory);\n if (parent === directory) return null;\n directory = parent;\n }\n}\n\nexport function savedProfileNames(ctx: Context): string[] {\n const directory = path.join(rootDirectory(), \"profiles\");\n if (!ctx.fs.exists(directory)) return [];\n return ctx.fs\n .listDir(directory)\n .filter((entry) => entry.name.endsWith(\".json\"))\n .map((entry) => entry.name.slice(0, -5))\n .sort();\n}\n\nexport async function writeProfileDirectory(ctx: Context, name: string) {\n await validateProfileName(ctx, name);\n await updateProfileSettings(ctx, (settings) => {\n settings.directories = { ...settings.directories, [process.cwd()]: name };\n });\n logFinishedStep(\n `Saved directory selection: ${name} (applies to this directory and its subdirectories).`,\n );\n const selected = await getProfileSelection(ctx);\n if (selected !== null && selected.name !== name) {\n logWarning(\n `Account \"${selected.name}\" selected by ${selected.source} overrides this directory selection. Remove that override to use account \"${name}\".`,\n );\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["path"]
|
|
7
|
+
}
|
|
@@ -37,6 +37,7 @@ __export(utils_exports, {
|
|
|
37
37
|
CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME: () => CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME,
|
|
38
38
|
CONVEX_SELF_HOSTED_URL_VAR_NAME: () => CONVEX_SELF_HOSTED_URL_VAR_NAME,
|
|
39
39
|
ENV_VAR_FILE_PATH: () => ENV_VAR_FILE_PATH,
|
|
40
|
+
IGNORED_DEPLOY_KEY: () => IGNORED_DEPLOY_KEY,
|
|
40
41
|
ThrowingFetchError: () => ThrowingFetchError,
|
|
41
42
|
bareDeploymentFetch: () => bareDeploymentFetch,
|
|
42
43
|
bigBrainAPI: () => bigBrainAPI,
|
|
@@ -68,6 +69,7 @@ __export(utils_exports, {
|
|
|
68
69
|
processDeployKeyValue: () => processDeployKeyValue,
|
|
69
70
|
productionProvisionHost: () => productionProvisionHost,
|
|
70
71
|
provisionHost: () => provisionHost,
|
|
72
|
+
readDeployKeyEnvVar: () => readDeployKeyEnvVar,
|
|
71
73
|
readDeployKeyFromEnv: () => readDeployKeyFromEnv,
|
|
72
74
|
retryDelay: () => retryDelay,
|
|
73
75
|
rootDirectory: () => rootDirectory,
|
|
@@ -108,13 +110,14 @@ const CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME = "CONVEX_DEPLOYMENT_TOKEN";
|
|
|
108
110
|
const CONVEX_DEPLOYMENT_ENV_VAR_NAME = "CONVEX_DEPLOYMENT";
|
|
109
111
|
const CONVEX_SELF_HOSTED_URL_VAR_NAME = "CONVEX_SELF_HOSTED_URL";
|
|
110
112
|
const CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME = "CONVEX_SELF_HOSTED_ADMIN_KEY";
|
|
113
|
+
const IGNORED_DEPLOY_KEY = "<ignore_deploy_key>";
|
|
111
114
|
const MAX_RETRIES = 6;
|
|
112
115
|
const RETRY_LOG_THRESHOLD = 3;
|
|
113
116
|
async function processDeployKeyValue(ctx, deployKey) {
|
|
114
117
|
if (deployKey === void 0) {
|
|
115
118
|
return void 0;
|
|
116
119
|
}
|
|
117
|
-
if (deployKey ===
|
|
120
|
+
if (deployKey === IGNORED_DEPLOY_KEY) {
|
|
118
121
|
return void 0;
|
|
119
122
|
}
|
|
120
123
|
const missingKeyPattern = /^<missing_deploy_key:(.+)>$/;
|
|
@@ -130,17 +133,23 @@ async function processDeployKeyValue(ctx, deployKey) {
|
|
|
130
133
|
return deployKey;
|
|
131
134
|
}
|
|
132
135
|
function readDeployKeyFromEnv(getEnv) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
+
return readDeployKeyEnvVar(getEnv)?.value;
|
|
137
|
+
}
|
|
138
|
+
function readDeployKeyEnvVar(getEnv) {
|
|
139
|
+
for (const name of [
|
|
140
|
+
CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
|
|
141
|
+
CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME
|
|
142
|
+
]) {
|
|
143
|
+
const value = getEnv(name);
|
|
144
|
+
if (value) return { name, value };
|
|
145
|
+
}
|
|
146
|
+
return void 0;
|
|
136
147
|
}
|
|
137
148
|
const PERMISSION_DENIED_MESSAGE_PREFIX = "You do not have permission to perform this operation";
|
|
138
149
|
function deployKeyPermissionAdvice() {
|
|
139
|
-
const
|
|
140
|
-
if (
|
|
141
|
-
|
|
142
|
-
}
|
|
143
|
-
return `This is determined by the permissions granted to ${envVarName}.`;
|
|
150
|
+
const envVar = readDeployKeyEnvVar((name) => process.env[name]);
|
|
151
|
+
if (envVar === void 0 || envVar.value === IGNORED_DEPLOY_KEY) return null;
|
|
152
|
+
return `This is determined by the permissions granted to ${envVar.name}.`;
|
|
144
153
|
}
|
|
145
154
|
function permissionDeniedErrorMessage(errorMessage) {
|
|
146
155
|
const index = errorMessage.indexOf(PERMISSION_DENIED_MESSAGE_PREFIX);
|