create-strata 2.2.41 → 2.2.42
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.js +37 -37
- package/dist/templates/package.json +3 -3
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -1236,7 +1236,7 @@ function renderAuthModule(layers) {
|
|
|
1236
1236
|
imports.push(oidc ? `import { clearOidcPkceCookie, createOAuthState, readOidcPkceCookie, sealOidcPkceCookie, verifyOAuthState } from "@getstrata/core/security/oauthState";` : `import { createOAuthState, verifyOAuthState } from "@getstrata/core/security/oauthState";`);
|
|
1237
1237
|
}
|
|
1238
1238
|
if (jsonApi || cookie) {
|
|
1239
|
-
imports.push(`import {
|
|
1239
|
+
imports.push(`import { privateJsonResponse, withErrorHandling } from "@getstrata/core/http/response";`);
|
|
1240
1240
|
imports.push(`import { resolveCsrfTokenForRequest } from "@getstrata/core/http/csrfToken";`);
|
|
1241
1241
|
}
|
|
1242
1242
|
imports.push(cookie && verify ? `import { absoluteTemporarySignedUrl, assertValidSignature } from "@getstrata/core/http/signedUrl";` : `import { absoluteTemporarySignedUrl } from "@getstrata/core/http/signedUrl";`);
|
|
@@ -1406,7 +1406,7 @@ async function completeBrowserSsoLogin(
|
|
|
1406
1406
|
let record = await starterAuthDirectory.findByEmail?.(email);
|
|
1407
1407
|
if (!record) {
|
|
1408
1408
|
if ((process.env.FEATURE_REGISTRATION ?? "true") === "false") {
|
|
1409
|
-
return
|
|
1409
|
+
return privateJsonResponse({ error: \`\${label} user is not provisioned.\` }, { status: 403 });
|
|
1410
1410
|
}
|
|
1411
1411
|
const hashed = await hashPassword(randomBytes(18).toString("hex"));
|
|
1412
1412
|
try {
|
|
@@ -1424,10 +1424,10 @@ async function completeBrowserSsoLogin(
|
|
|
1424
1424
|
record = await starterAuthDirectory.findByEmail?.(email);
|
|
1425
1425
|
}
|
|
1426
1426
|
if (!record) {
|
|
1427
|
-
return
|
|
1427
|
+
return privateJsonResponse({ error: \`Could not complete \${label} login.\` }, { status: 500 });
|
|
1428
1428
|
}
|
|
1429
1429
|
return runWithLockedAuthUser(record.id, async (record) => {
|
|
1430
|
-
if (!record?.is_active || record.email !== email) return
|
|
1430
|
+
if (!record?.is_active || record.email !== email) return privateJsonResponse({ error: "Account unavailable." }, { status: 403 });
|
|
1431
1431
|
${mfa ? `if (record.mfa_enabled) {
|
|
1432
1432
|
const pending = redirectTo("/login/mfa");
|
|
1433
1433
|
pending.headers.append("set-cookie", pendingMfaSetCookie(record.id, record.auth_version));
|
|
@@ -1444,11 +1444,11 @@ async function completeBrowserSsoLogin(
|
|
|
1444
1444
|
const { email, password, mfa_code } = await parseJsonBody(request, parseLoginCredentials);
|
|
1445
1445
|
return runWithLoginUser(email, async (record) => {
|
|
1446
1446
|
if (!record?.password || !(await verifyPassword(password, record.password))) {
|
|
1447
|
-
return
|
|
1447
|
+
return privateJsonResponse({ error: "Invalid credentials" }, { status: 422 });
|
|
1448
1448
|
}
|
|
1449
1449
|
const mfaResult = completePasswordLogin(record, { mfaCode: mfa_code });
|
|
1450
1450
|
if (!mfaResult.ok) {
|
|
1451
|
-
return
|
|
1451
|
+
return privateJsonResponse({ error: mfaResult.error }, { status: mfaResult.error === "mfa_required" ? 401 : 422 });
|
|
1452
1452
|
}
|
|
1453
1453
|
await persistAuthRecovery(record.id, record.mfa_recovery_codes, mfaResult.consumedRecoveryHash);
|
|
1454
1454
|
const user = { id: record.id, role: record.role };
|
|
@@ -1467,7 +1467,7 @@ async function completeBrowserSsoLogin(
|
|
|
1467
1467
|
expires_at: expiresAt ? sqlTimestamp(expiresAt) : null,
|
|
1468
1468
|
});
|
|
1469
1469
|
});
|
|
1470
|
-
const payload =
|
|
1470
|
+
const payload = privateJsonResponse({ token: plain, expires_at: expiresAt?.toISOString() ?? null });
|
|
1471
1471
|
${cookie ? `const sessionAuth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
|
|
1472
1472
|
const { setCookie } = await sessionAuth.signIn(sessionUser(record));
|
|
1473
1473
|
payload.headers.append("set-cookie", setCookie);
|
|
@@ -1479,7 +1479,7 @@ async function completeBrowserSsoLogin(
|
|
|
1479
1479
|
GET: kernel.wrapApi(async (request) => {
|
|
1480
1480
|
const user = await dependencies.container.resolve<AuthManager>(CORE_AUTH_TOKEN).requireUser(request);
|
|
1481
1481
|
const record = await starterAuthDirectory.findByIdOrThrow(Number(user.id));
|
|
1482
|
-
return
|
|
1482
|
+
return privateJsonResponse({
|
|
1483
1483
|
id: record.id,
|
|
1484
1484
|
name: record.name ?? record.email,
|
|
1485
1485
|
email: record.email,
|
|
@@ -1491,13 +1491,13 @@ async function completeBrowserSsoLogin(
|
|
|
1491
1491
|
"/api/v1/auth/register": {
|
|
1492
1492
|
POST: kernel.wrap("api", kernel.wrapRegister(withErrorHandling(async (request) => {
|
|
1493
1493
|
if ((process.env.FEATURE_REGISTRATION ?? "true") === "false") {
|
|
1494
|
-
return
|
|
1494
|
+
return privateJsonResponse({ error: "Not found" }, { status: 404 });
|
|
1495
1495
|
}
|
|
1496
1496
|
const { name, email, password } = await parseJsonBody(request, parseRegisterCredentials);
|
|
1497
1497
|
const existing = await starterAuthDirectory.findByEmail?.(email);
|
|
1498
1498
|
await hashPassword(password);
|
|
1499
1499
|
if (existing) {
|
|
1500
|
-
return
|
|
1500
|
+
return privateJsonResponse({ ok: true }, { status: 201 });
|
|
1501
1501
|
}
|
|
1502
1502
|
const hashed = await hashPassword(password);
|
|
1503
1503
|
await runAuthWrite(email, async () => {
|
|
@@ -1512,7 +1512,7 @@ async function completeBrowserSsoLogin(
|
|
|
1512
1512
|
${verify ? `if (created) {
|
|
1513
1513
|
await issueSignedAuthMail(email, "Verify your email", "/api/v1/auth/verify-email", AUTH_ONE_TIME_PURPOSES.emailVerify, created.id, { id: String(created.id) });
|
|
1514
1514
|
}` : ""}
|
|
1515
|
-
return
|
|
1515
|
+
return privateJsonResponse({ ok: true }, { status: 201 });
|
|
1516
1516
|
}))),
|
|
1517
1517
|
},` : "";
|
|
1518
1518
|
const jwtLogin = authUsesJwt(layers.auth) ? `
|
|
@@ -1521,11 +1521,11 @@ async function completeBrowserSsoLogin(
|
|
|
1521
1521
|
const { email, password, mfa_code } = await parseJsonBody(request, parseLoginCredentials);
|
|
1522
1522
|
return runWithLoginUser(email, async (record) => {
|
|
1523
1523
|
if (!record?.password || !(await verifyPassword(password, record.password))) {
|
|
1524
|
-
return
|
|
1524
|
+
return privateJsonResponse({ error: "Invalid credentials" }, { status: 422 });
|
|
1525
1525
|
}
|
|
1526
1526
|
const mfaResult = completePasswordLogin(record, { mfaCode: mfa_code });
|
|
1527
1527
|
if (!mfaResult.ok) {
|
|
1528
|
-
return
|
|
1528
|
+
return privateJsonResponse({ error: mfaResult.error }, { status: mfaResult.error === "mfa_required" ? 401 : 422 });
|
|
1529
1529
|
}
|
|
1530
1530
|
await persistAuthRecovery(record.id, record.mfa_recovery_codes, mfaResult.consumedRecoveryHash);
|
|
1531
1531
|
const user = { id: record.id, role: record.role, emailVerifiedAt: record.email_verified_at ?? null };
|
|
@@ -1536,7 +1536,7 @@ async function completeBrowserSsoLogin(
|
|
|
1536
1536
|
abilities: [],${verify ? `
|
|
1537
1537
|
emailVerifiedAt: user.emailVerifiedAt ?? null,` : ""}
|
|
1538
1538
|
});
|
|
1539
|
-
return
|
|
1539
|
+
return privateJsonResponse({
|
|
1540
1540
|
token,
|
|
1541
1541
|
token_type: "bearer",
|
|
1542
1542
|
expires_in: jwtTtlSeconds(),
|
|
@@ -1548,12 +1548,12 @@ async function completeBrowserSsoLogin(
|
|
|
1548
1548
|
"/api/user": {
|
|
1549
1549
|
GET: kernel.wrapApi(async (request) => {
|
|
1550
1550
|
const user = await dependencies.container.resolve<AuthManager>(CORE_AUTH_TOKEN).requireUser(request);
|
|
1551
|
-
return
|
|
1551
|
+
return privateJsonResponse({ id: user.id, role: user.role ?? "member" });
|
|
1552
1552
|
}),
|
|
1553
1553
|
},
|
|
1554
1554
|
"/api/v1/auth/logout": {
|
|
1555
1555
|
POST: kernel.wrap("api", withErrorHandling(async (request) => {
|
|
1556
|
-
const payload =
|
|
1556
|
+
const payload = privateJsonResponse({ ok: true });
|
|
1557
1557
|
${cookie ? `const sessionAuth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
|
|
1558
1558
|
const { setCookie } = await sessionAuth.signOut(request);
|
|
1559
1559
|
payload.headers.append("set-cookie", setCookie);
|
|
@@ -1568,7 +1568,7 @@ async function completeBrowserSsoLogin(
|
|
|
1568
1568
|
if (user) {
|
|
1569
1569
|
await issueSignedAuthMail(email, "Reset your password", "/api/v1/auth/reset-password", AUTH_ONE_TIME_PURPOSES.passwordReset, user.id, { email });
|
|
1570
1570
|
}
|
|
1571
|
-
return
|
|
1571
|
+
return privateJsonResponse({ ok: true });
|
|
1572
1572
|
})),
|
|
1573
1573
|
},
|
|
1574
1574
|
"/api/v1/auth/reset-password": {
|
|
@@ -1576,24 +1576,24 @@ async function completeBrowserSsoLogin(
|
|
|
1576
1576
|
const body: unknown = await request.json();
|
|
1577
1577
|
const password = typeof body === "object" && body !== null && "password" in body ? body.password : undefined;
|
|
1578
1578
|
if (!(await completeSignedPasswordReset(request, password))) {
|
|
1579
|
-
return
|
|
1579
|
+
return privateJsonResponse({ error: "Invalid or expired reset link." }, { status: 403 });
|
|
1580
1580
|
}
|
|
1581
|
-
return
|
|
1581
|
+
return privateJsonResponse({ ok: true });
|
|
1582
1582
|
}))),
|
|
1583
1583
|
},` : "";
|
|
1584
1584
|
const jsonVerify = jsonApi && verify ? `
|
|
1585
1585
|
"/api/v1/auth/verify-email": {
|
|
1586
1586
|
POST: kernel.wrap("api", kernel.wrapSigned(withErrorHandling(async (request) => {
|
|
1587
1587
|
if (!(await completeSignedEmailVerification(request))) {
|
|
1588
|
-
return
|
|
1588
|
+
return privateJsonResponse({ error: "Invalid or expired verification link." }, { status: 403 });
|
|
1589
1589
|
}
|
|
1590
|
-
return
|
|
1590
|
+
return privateJsonResponse({ ok: true });
|
|
1591
1591
|
}))),
|
|
1592
1592
|
},` : "";
|
|
1593
1593
|
const csrfRoute = `
|
|
1594
1594
|
"/api/v1/auth/csrf": {
|
|
1595
1595
|
GET: kernel.wrap("api", withErrorHandling(async (request) => {
|
|
1596
|
-
return
|
|
1596
|
+
return privateJsonResponse({ token: resolveCsrfTokenForRequest(request) });
|
|
1597
1597
|
})),
|
|
1598
1598
|
},`;
|
|
1599
1599
|
const cookieJsonAuth = cookie && !jsonApi ? `
|
|
@@ -1602,16 +1602,16 @@ async function completeBrowserSsoLogin(
|
|
|
1602
1602
|
const { email, password, mfa_code } = await parseJsonBody(request, parseLoginCredentials);
|
|
1603
1603
|
return runWithLoginUser(email, async (record) => {
|
|
1604
1604
|
if (!record?.password || !(await verifyPassword(password, record.password))) {
|
|
1605
|
-
return
|
|
1605
|
+
return privateJsonResponse({ error: "Invalid credentials" }, { status: 422 });
|
|
1606
1606
|
}
|
|
1607
1607
|
const mfaResult = completePasswordLogin(record, { mfaCode: mfa_code });
|
|
1608
1608
|
if (!mfaResult.ok) {
|
|
1609
|
-
return
|
|
1609
|
+
return privateJsonResponse({ error: mfaResult.error }, { status: mfaResult.error === "mfa_required" ? 401 : 422 });
|
|
1610
1610
|
}
|
|
1611
1611
|
await persistAuthRecovery(record.id, record.mfa_recovery_codes, mfaResult.consumedRecoveryHash);
|
|
1612
1612
|
const sessionAuth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
|
|
1613
1613
|
const { setCookie } = await sessionAuth.signIn(sessionUser(record));
|
|
1614
|
-
const payload =
|
|
1614
|
+
const payload = privateJsonResponse({ ok: true });
|
|
1615
1615
|
payload.headers.append("set-cookie", setCookie);
|
|
1616
1616
|
return payload;
|
|
1617
1617
|
});
|
|
@@ -1621,7 +1621,7 @@ async function completeBrowserSsoLogin(
|
|
|
1621
1621
|
GET: kernel.wrapApi(async (request) => {
|
|
1622
1622
|
const user = await dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN).requireUser(request);
|
|
1623
1623
|
const record = await starterAuthDirectory.findByIdOrThrow(Number(user.id));
|
|
1624
|
-
return
|
|
1624
|
+
return privateJsonResponse({
|
|
1625
1625
|
id: record.id,
|
|
1626
1626
|
name: record.name ?? record.email,
|
|
1627
1627
|
email: record.email,
|
|
@@ -1633,7 +1633,7 @@ async function completeBrowserSsoLogin(
|
|
|
1633
1633
|
POST: kernel.wrap("api", withErrorHandling(async (request) => {
|
|
1634
1634
|
const sessionAuth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
|
|
1635
1635
|
const { setCookie } = await sessionAuth.signOut(request);
|
|
1636
|
-
const payload =
|
|
1636
|
+
const payload = privateJsonResponse({ ok: true });
|
|
1637
1637
|
payload.headers.append("set-cookie", setCookie);
|
|
1638
1638
|
return payload;
|
|
1639
1639
|
})),
|
|
@@ -1658,13 +1658,13 @@ async function completeBrowserSsoLogin(
|
|
|
1658
1658
|
const samlResponse = String(form.get("SAMLResponse") ?? "");
|
|
1659
1659
|
const relayState = String(form.get("RelayState") ?? "");
|
|
1660
1660
|
if (!verifyOAuthState(request, relayState)) {
|
|
1661
|
-
return
|
|
1661
|
+
return privateJsonResponse({ error: "Invalid SAML state." }, { status: 403 });
|
|
1662
1662
|
}
|
|
1663
1663
|
const profile = await createSamlServiceProvider()
|
|
1664
1664
|
.consumePost(samlResponse, relayState)
|
|
1665
1665
|
.catch(() => null);
|
|
1666
1666
|
if (!profile) {
|
|
1667
|
-
return
|
|
1667
|
+
return privateJsonResponse({ error: "Invalid SAML response." }, { status: 400 });
|
|
1668
1668
|
}
|
|
1669
1669
|
return completeBrowserSsoLogin(dependencies, profile, "SAML");
|
|
1670
1670
|
})),
|
|
@@ -1700,14 +1700,14 @@ async function completeBrowserSsoLogin(
|
|
|
1700
1700
|
const code = url.searchParams.get("code");
|
|
1701
1701
|
const state = url.searchParams.get("state");
|
|
1702
1702
|
if (!code || !verifyOAuthState(request, state)) {
|
|
1703
|
-
return
|
|
1703
|
+
return privateJsonResponse({ error: "Invalid GitHub OAuth state." }, { status: 403 });
|
|
1704
1704
|
}
|
|
1705
1705
|
const redirectUri = process.env.GITHUB_REDIRECT_URI?.trim() || \`\${appUrl()}/auth/github/callback\`;
|
|
1706
1706
|
const profile = await new GitHubOAuthProvider({ clientId, clientSecret, redirectUri })
|
|
1707
1707
|
.exchangeCode(code)
|
|
1708
1708
|
.catch(() => null);
|
|
1709
1709
|
if (!profile) {
|
|
1710
|
-
return
|
|
1710
|
+
return privateJsonResponse({ error: "Invalid GitHub OAuth response." }, { status: 400 });
|
|
1711
1711
|
}
|
|
1712
1712
|
return completeBrowserSsoLogin(dependencies, profile, "GitHub");
|
|
1713
1713
|
})),
|
|
@@ -1752,7 +1752,7 @@ async function completeBrowserSsoLogin(
|
|
|
1752
1752
|
const state = url.searchParams.get("state");
|
|
1753
1753
|
const pkce = readOidcPkceCookie(request, state);
|
|
1754
1754
|
if (!code || !verifyOAuthState(request, state) || !pkce) {
|
|
1755
|
-
const denied =
|
|
1755
|
+
const denied = privateJsonResponse({ error: "Invalid OIDC state." }, { status: 403 });
|
|
1756
1756
|
denied.headers.append("set-cookie", clearOidcPkceCookie());
|
|
1757
1757
|
return denied;
|
|
1758
1758
|
}
|
|
@@ -1761,7 +1761,7 @@ async function completeBrowserSsoLogin(
|
|
|
1761
1761
|
.exchangeCode(code, redirectUri, pkce)
|
|
1762
1762
|
.catch(() => null);
|
|
1763
1763
|
if (!profile) {
|
|
1764
|
-
const failed =
|
|
1764
|
+
const failed = privateJsonResponse({ error: "Invalid OIDC response." }, { status: 400 });
|
|
1765
1765
|
failed.headers.append("set-cookie", clearOidcPkceCookie());
|
|
1766
1766
|
return failed;
|
|
1767
1767
|
}
|
|
@@ -1800,7 +1800,7 @@ async function completeBrowserSsoLogin(
|
|
|
1800
1800
|
const cookieRoutes = cookie ? `
|
|
1801
1801
|
webRoutes({ kernel, dependencies }) {
|
|
1802
1802
|
const auth = dependencies.container.resolve<CookieSessionAuthManager>(CORE_AUTH_TOKEN);
|
|
1803
|
-
const views = dependencies.container.resolve(CORE_VIEW_RENDERER_TOKEN).namespace("auth");
|
|
1803
|
+
const views = dependencies.container.resolve(CORE_VIEW_RENDERER_TOKEN).namespace("auth", { headers: { "Cache-Control": "private, no-store" } });
|
|
1804
1804
|
return {
|
|
1805
1805
|
"/login": {
|
|
1806
1806
|
GET: kernel.wrapWebGuest(async (request) =>
|
|
@@ -3179,9 +3179,9 @@ function renderPackageJson(projectName, options = {}) {
|
|
|
3179
3179
|
"@getstrata/cli": "workspace:*",
|
|
3180
3180
|
"@getstrata/core": "workspace:*"
|
|
3181
3181
|
} : {
|
|
3182
|
-
"@getstrata/bootstrap": "^2.2.
|
|
3183
|
-
"@getstrata/cli": "^2.2.
|
|
3184
|
-
"@getstrata/core": "^2.2.
|
|
3182
|
+
"@getstrata/bootstrap": "^2.2.42",
|
|
3183
|
+
"@getstrata/cli": "^2.2.42",
|
|
3184
|
+
"@getstrata/core": "^2.2.42"
|
|
3185
3185
|
};
|
|
3186
3186
|
coreDeps.eta = "^4.6.0";
|
|
3187
3187
|
if (options.layers?.database === "mysql") {
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"check": "tsc --noEmit"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@getstrata/bootstrap": "^2.2.
|
|
16
|
-
"@getstrata/cli": "^2.2.
|
|
17
|
-
"@getstrata/core": "^2.2.
|
|
15
|
+
"@getstrata/bootstrap": "^2.2.42",
|
|
16
|
+
"@getstrata/cli": "^2.2.42",
|
|
17
|
+
"@getstrata/core": "^2.2.42",
|
|
18
18
|
"eta": "^4.6.0"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|