@base44-preview/cli 0.0.54-pr.537.9854ec3 → 0.0.54-pr.537.b8591fe
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 +22 -15
- package/dist/cli/index.js.map +5 -5
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
|
@@ -235154,10 +235154,24 @@ 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
|
-
|
|
235157
|
+
function readEnvAuth() {
|
|
235158
|
+
const accessToken = process.env.BASE44_ACCESS_TOKEN;
|
|
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
|
+
};
|
|
235159
235169
|
}
|
|
235160
235170
|
async function readAuth() {
|
|
235171
|
+
const envAuth = readEnvAuth();
|
|
235172
|
+
if (envAuth) {
|
|
235173
|
+
return envAuth;
|
|
235174
|
+
}
|
|
235161
235175
|
try {
|
|
235162
235176
|
const authData = await readJsonFile(getAuthFilePath());
|
|
235163
235177
|
const result = AuthDataSchema.safeParse(authData);
|
|
@@ -235194,6 +235208,9 @@ function isTokenExpired(auth) {
|
|
|
235194
235208
|
return Date.now() >= auth.expiresAt - TOKEN_REFRESH_BUFFER_MS;
|
|
235195
235209
|
}
|
|
235196
235210
|
async function refreshAndSaveTokens() {
|
|
235211
|
+
if (readEnvAuth()) {
|
|
235212
|
+
return null;
|
|
235213
|
+
}
|
|
235197
235214
|
if (refreshPromise) {
|
|
235198
235215
|
return refreshPromise;
|
|
235199
235216
|
}
|
|
@@ -235218,9 +235235,6 @@ async function refreshAndSaveTokens() {
|
|
|
235218
235235
|
return refreshPromise;
|
|
235219
235236
|
}
|
|
235220
235237
|
async function isLoggedIn() {
|
|
235221
|
-
if (getEnvAccessToken()) {
|
|
235222
|
-
return true;
|
|
235223
|
-
}
|
|
235224
235238
|
try {
|
|
235225
235239
|
await readAuth();
|
|
235226
235240
|
return true;
|
|
@@ -244146,9 +244160,6 @@ async function handleUnauthorized(request, _options, response) {
|
|
|
244146
244160
|
if (retriedRequests.has(request)) {
|
|
244147
244161
|
return;
|
|
244148
244162
|
}
|
|
244149
|
-
if (getEnvAccessToken()) {
|
|
244150
|
-
return;
|
|
244151
|
-
}
|
|
244152
244163
|
const newAccessToken = await refreshAndSaveTokens();
|
|
244153
244164
|
if (!newAccessToken) {
|
|
244154
244165
|
return;
|
|
@@ -244175,11 +244186,6 @@ var base44Client = distribution_default.create({
|
|
|
244175
244186
|
captureRequestBody,
|
|
244176
244187
|
async (request) => {
|
|
244177
244188
|
try {
|
|
244178
|
-
const envToken = getEnvAccessToken();
|
|
244179
|
-
if (envToken) {
|
|
244180
|
-
request.headers.set("Authorization", `Bearer ${envToken}`);
|
|
244181
|
-
return;
|
|
244182
|
-
}
|
|
244183
244189
|
const auth = await readAuth();
|
|
244184
244190
|
if (isTokenExpired(auth)) {
|
|
244185
244191
|
const newAccessToken = await refreshAndSaveTokens();
|
|
@@ -251761,7 +251767,8 @@ function getLogoutCommand() {
|
|
|
251761
251767
|
// src/cli/commands/auth/whoami.ts
|
|
251762
251768
|
async function whoami(_ctx) {
|
|
251763
251769
|
const auth2 = await readAuth();
|
|
251764
|
-
|
|
251770
|
+
const identity4 = auth2.email || "environment credentials";
|
|
251771
|
+
return { outroMessage: `Logged in as: ${theme.styles.bold(identity4)}` };
|
|
251765
251772
|
}
|
|
251766
251773
|
function getWhoamiCommand() {
|
|
251767
251774
|
return new Base44Command("whoami", { requireAppConfig: false }).description("Display current authenticated user").action(whoami);
|
|
@@ -261654,4 +261661,4 @@ export {
|
|
|
261654
261661
|
CLIExitError
|
|
261655
261662
|
};
|
|
261656
261663
|
|
|
261657
|
-
//# debugId=
|
|
261664
|
+
//# debugId=621023C48CF9E01F64756E2164756E21
|