@base44-preview/cli 0.0.54-pr.538.01bc08e → 0.0.54-pr.538.31b00c3
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/cli/index.js +15 -22
- package/dist/cli/index.js.map +5 -5
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
|
@@ -235154,24 +235154,10 @@ function getTestOverrides() {
|
|
|
235154
235154
|
// src/core/auth/config.ts
|
|
235155
235155
|
var TOKEN_REFRESH_BUFFER_MS = 60 * 1000;
|
|
235156
235156
|
var refreshPromise = null;
|
|
235157
|
-
function
|
|
235158
|
-
|
|
235159
|
-
if (!accessToken) {
|
|
235160
|
-
return null;
|
|
235161
|
-
}
|
|
235162
|
-
return {
|
|
235163
|
-
accessToken,
|
|
235164
|
-
refreshToken: process.env.BASE44_REFRESH_TOKEN ?? "",
|
|
235165
|
-
expiresAt: Number.POSITIVE_INFINITY,
|
|
235166
|
-
email: "",
|
|
235167
|
-
name: ""
|
|
235168
|
-
};
|
|
235157
|
+
function getEnvAccessToken() {
|
|
235158
|
+
return process.env.BASE44_ACCESS_TOKEN || undefined;
|
|
235169
235159
|
}
|
|
235170
235160
|
async function readAuth() {
|
|
235171
|
-
const envAuth = readEnvAuth();
|
|
235172
|
-
if (envAuth) {
|
|
235173
|
-
return envAuth;
|
|
235174
|
-
}
|
|
235175
235161
|
try {
|
|
235176
235162
|
const authData = await readJsonFile(getAuthFilePath());
|
|
235177
235163
|
const result = AuthDataSchema.safeParse(authData);
|
|
@@ -235208,9 +235194,6 @@ function isTokenExpired(auth) {
|
|
|
235208
235194
|
return Date.now() >= auth.expiresAt - TOKEN_REFRESH_BUFFER_MS;
|
|
235209
235195
|
}
|
|
235210
235196
|
async function refreshAndSaveTokens() {
|
|
235211
|
-
if (readEnvAuth()) {
|
|
235212
|
-
return null;
|
|
235213
|
-
}
|
|
235214
235197
|
if (refreshPromise) {
|
|
235215
235198
|
return refreshPromise;
|
|
235216
235199
|
}
|
|
@@ -235235,6 +235218,9 @@ async function refreshAndSaveTokens() {
|
|
|
235235
235218
|
return refreshPromise;
|
|
235236
235219
|
}
|
|
235237
235220
|
async function isLoggedIn() {
|
|
235221
|
+
if (getEnvAccessToken()) {
|
|
235222
|
+
return true;
|
|
235223
|
+
}
|
|
235238
235224
|
try {
|
|
235239
235225
|
await readAuth();
|
|
235240
235226
|
return true;
|
|
@@ -244185,6 +244171,9 @@ async function handleUnauthorized(request, _options, response) {
|
|
|
244185
244171
|
if (retriedRequests.has(request)) {
|
|
244186
244172
|
return;
|
|
244187
244173
|
}
|
|
244174
|
+
if (getEnvAccessToken()) {
|
|
244175
|
+
return;
|
|
244176
|
+
}
|
|
244188
244177
|
const newAccessToken = await refreshAndSaveTokens();
|
|
244189
244178
|
if (!newAccessToken) {
|
|
244190
244179
|
return;
|
|
@@ -244211,6 +244200,11 @@ var base44Client = distribution_default.create({
|
|
|
244211
244200
|
captureRequestBody,
|
|
244212
244201
|
async (request) => {
|
|
244213
244202
|
try {
|
|
244203
|
+
const envToken = getEnvAccessToken();
|
|
244204
|
+
if (envToken) {
|
|
244205
|
+
request.headers.set("Authorization", `Bearer ${envToken}`);
|
|
244206
|
+
return;
|
|
244207
|
+
}
|
|
244214
244208
|
const auth = await readAuth();
|
|
244215
244209
|
if (isTokenExpired(auth)) {
|
|
244216
244210
|
const newAccessToken = await refreshAndSaveTokens();
|
|
@@ -251792,8 +251786,7 @@ function getLogoutCommand() {
|
|
|
251792
251786
|
// src/cli/commands/auth/whoami.ts
|
|
251793
251787
|
async function whoami(_ctx) {
|
|
251794
251788
|
const auth2 = await readAuth();
|
|
251795
|
-
|
|
251796
|
-
return { outroMessage: `Logged in as: ${theme.styles.bold(identity4)}` };
|
|
251789
|
+
return { outroMessage: `Logged in as: ${theme.styles.bold(auth2.email)}` };
|
|
251797
251790
|
}
|
|
251798
251791
|
function getWhoamiCommand() {
|
|
251799
251792
|
return new Base44Command("whoami", { requireAppConfig: false }).description("Display current authenticated user").action(whoami);
|
|
@@ -261810,4 +261803,4 @@ export {
|
|
|
261810
261803
|
CLIExitError
|
|
261811
261804
|
};
|
|
261812
261805
|
|
|
261813
|
-
//# debugId=
|
|
261806
|
+
//# debugId=3C4BC63D9DD7271A64756E2164756E21
|