@base44-preview/cli 0.0.54-pr.537.9854ec3 → 0.0.54-pr.537.ab50dd8
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 +33 -14
- package/dist/cli/index.js.map +8 -8
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
|
@@ -235154,8 +235154,37 @@ 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 decodeJwtClaims(token) {
|
|
235158
|
+
const parts = token.split(".");
|
|
235159
|
+
if (parts.length !== 3) {
|
|
235160
|
+
return null;
|
|
235161
|
+
}
|
|
235162
|
+
try {
|
|
235163
|
+
return JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
|
|
235164
|
+
} catch {
|
|
235165
|
+
return null;
|
|
235166
|
+
}
|
|
235167
|
+
}
|
|
235168
|
+
async function seedAuthFromEnv() {
|
|
235169
|
+
const accessToken = process.env.BASE44_ACCESS_TOKEN;
|
|
235170
|
+
if (!accessToken) {
|
|
235171
|
+
return false;
|
|
235172
|
+
}
|
|
235173
|
+
const refreshToken = process.env.BASE44_REFRESH_TOKEN;
|
|
235174
|
+
const claims = decodeJwtClaims(accessToken);
|
|
235175
|
+
const sub = typeof claims?.sub === "string" ? claims.sub : undefined;
|
|
235176
|
+
const exp = typeof claims?.exp === "number" ? claims.exp : undefined;
|
|
235177
|
+
if (!refreshToken || !sub || !exp) {
|
|
235178
|
+
return false;
|
|
235179
|
+
}
|
|
235180
|
+
await writeAuth({
|
|
235181
|
+
accessToken,
|
|
235182
|
+
refreshToken,
|
|
235183
|
+
expiresAt: exp * 1000,
|
|
235184
|
+
email: sub,
|
|
235185
|
+
name: sub
|
|
235186
|
+
});
|
|
235187
|
+
return true;
|
|
235159
235188
|
}
|
|
235160
235189
|
async function readAuth() {
|
|
235161
235190
|
try {
|
|
@@ -235218,9 +235247,6 @@ async function refreshAndSaveTokens() {
|
|
|
235218
235247
|
return refreshPromise;
|
|
235219
235248
|
}
|
|
235220
235249
|
async function isLoggedIn() {
|
|
235221
|
-
if (getEnvAccessToken()) {
|
|
235222
|
-
return true;
|
|
235223
|
-
}
|
|
235224
235250
|
try {
|
|
235225
235251
|
await readAuth();
|
|
235226
235252
|
return true;
|
|
@@ -244146,9 +244172,6 @@ async function handleUnauthorized(request, _options, response) {
|
|
|
244146
244172
|
if (retriedRequests.has(request)) {
|
|
244147
244173
|
return;
|
|
244148
244174
|
}
|
|
244149
|
-
if (getEnvAccessToken()) {
|
|
244150
|
-
return;
|
|
244151
|
-
}
|
|
244152
244175
|
const newAccessToken = await refreshAndSaveTokens();
|
|
244153
244176
|
if (!newAccessToken) {
|
|
244154
244177
|
return;
|
|
@@ -244175,11 +244198,6 @@ var base44Client = distribution_default.create({
|
|
|
244175
244198
|
captureRequestBody,
|
|
244176
244199
|
async (request) => {
|
|
244177
244200
|
try {
|
|
244178
|
-
const envToken = getEnvAccessToken();
|
|
244179
|
-
if (envToken) {
|
|
244180
|
-
request.headers.set("Authorization", `Bearer ${envToken}`);
|
|
244181
|
-
return;
|
|
244182
|
-
}
|
|
244183
244201
|
const auth = await readAuth();
|
|
244184
244202
|
if (isTokenExpired(auth)) {
|
|
244185
244203
|
const newAccessToken = await refreshAndSaveTokens();
|
|
@@ -244379,6 +244397,7 @@ async function login({
|
|
|
244379
244397
|
|
|
244380
244398
|
// src/cli/utils/command/middleware.ts
|
|
244381
244399
|
async function ensureAuth(ctx) {
|
|
244400
|
+
await seedAuthFromEnv();
|
|
244382
244401
|
const loggedIn = await isLoggedIn();
|
|
244383
244402
|
if (!loggedIn) {
|
|
244384
244403
|
ctx.log.info("You need to login first to continue.");
|
|
@@ -261654,4 +261673,4 @@ export {
|
|
|
261654
261673
|
CLIExitError
|
|
261655
261674
|
};
|
|
261656
261675
|
|
|
261657
|
-
//# debugId=
|
|
261676
|
+
//# debugId=1EB78D62F7CFAAF364756E2164756E21
|