create-sprint 0.0.52 → 0.0.54

package/dist/generators.js

@@ -200,8 +200,8 @@ export const jwtValidateController: Handler = (req: SprintRequest, res: SprintRe
     }
 
     try {
-        const { publicKey } = getJwtFromEnv();
-        const decoded = verifyEncrypted(token, publicKey);
+        const { publicKey, encryptionSecret } = getJwtFromEnv();
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
 
         if (!decoded) {
             return res.status(401).json({ error: "Invalid token" });
@@ -232,8 +232,8 @@ export const jwtValidateController = (req: SprintRequest, res: SprintResponse) =
     }
 
     try {
-        const { publicKey } = getJwtFromEnv();
-        const decoded = verifyEncrypted(token, publicKey);
+        const { publicKey, encryptionSecret } = getJwtFromEnv();
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
 
         if (!decoded) {
             return res.status(401).json({ error: "Invalid token" });
@@ -273,7 +273,7 @@ export const jwtGenerateController: Handler = (req: SprintRequest, res: SprintRe
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
-        const token = signEncrypted(payload, privateKey, { expiresIn: "1h" });
+        const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
     } catch (error) {
         return res.status(500).json({ error: "JWT not configured" });
@@ -304,9 +304,9 @@ export const jwtGenerateController = (req: SprintRequest, res: SprintResponse) =
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey } = getJwtFromEnv();
+        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
-        const token = signEncrypted(payload, privateKey, { expiresIn: "1h" });
+        const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
     } catch (error) {
         return res.status(500).json({ error: "JWT not configured" });
@@ -368,26 +368,21 @@ export const jwtGenerateSchema = defineRouteSchema({
 });
 `;
 }
-export function getAuthMiddleware(language) {
+export function getInternalAuthMiddleware(language) {
     if (language === "typescript") {
         return `import { defineMiddleware } from "sprint-es";
 
 export default defineMiddleware({
-    name: "auth",
+    name: "adminAuth",
     priority: 10,
     include: "/admin/**",
     handler: (req, res, next) => {
         const auth = req.sprint.getAuthorization();
-
-        if (!auth) {
-            return res.status(401).json({ error: "No authorization header" });
-        }
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
 
         const token = auth.replace("Bearer ", "");
 
-        if (token !== "admin-token") {
-            return res.status(403).json({ error: "Invalid token" });
-        }
+        if (token !== "admin-token") return res.status(403).json({ error: "Invalid token" });
 
         next();
     }
@@ -397,21 +392,72 @@ export default defineMiddleware({
     return `import { defineMiddleware } from "sprint-es";
 
 export default defineMiddleware({
-    name: "auth",
+    name: "adminAuth",
     priority: 10,
     include: "/admin/**",
     handler: (req, res, next) => {
         const auth = req.sprint.getAuthorization();
+        if (!auth)  return res.status(401).json({ error: "No authorization header" });
+        
+        const token = auth.replace("Bearer ", "");
 
-        if (!auth) {
-            return res.status(401).json({ error: "No authorization header" });
-        }
+        if (token !== "admin-token") return res.status(403).json({ error: "Invalid token" });
+        
+        next();
+    }
+});
+`;
+}
+export function getUserAuthMiddleware(language) {
+    if (language === "typescript") {
+        return `import { defineMiddleware } from "sprint-es";
+import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
+
+const { publicKey, encryptionSecret } = getJwtFromEnv();
+
+export default defineMiddleware({
+    name: "userAuth",
+    priority: 10,
+    include: "/**",
+    exclude: "/admin/**",
+    handler: (req, res, next) => {
+        const auth = req.sprint.getAuthorization();
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
 
         const token = auth.replace("Bearer ", "");
 
-        if (token !== "admin-token") {
-            return res.status(403).json({ error: "Invalid token" });
-        }
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);cd .
+
+        if (!decoded) return res.status(403).json({ error: "Invalid token" });
+        
+        req.custom.user = decoded;
+
+        next();
+    }
+});
+`;
+    }
+    return `import { defineMiddleware } from "sprint-es";
+import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
+
+const { publicKey, encryptionSecret } = getJwtFromEnv();
+
+export default defineMiddleware({
+    name: "userAuth",
+    priority: 10,
+    include: "/**",
+    exclude: "/admin/**",
+    handler: (req, res, next) => {
+        const auth = req.sprint.getAuthorization();
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
+
+        const token = auth.replace("Bearer ", "");
+
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
+
+        if (!decoded) return res.status(403).json({ error: "Invalid token" });
+
+        req.custom.user = decoded;
 
         next();
     }

package/dist/index.js

@@ -5,7 +5,7 @@ import { join } from "path";
 import color from "picocolors";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
-import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
+import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
 export async function writeFile(path, content, options) {
     if (typeof content === "string")
         content = content.trimEnd();
@@ -158,7 +158,8 @@ async function createProject(projectName, language, telemetry, useDocker) {
     await writeFile(join(srcDir, "routes", "admin." + (language === "typescript" ? "ts" : "js")), getAdminRoute(language));
     await writeFile(join(srcDir, "controllers", "home." + (language === "typescript" ? "ts" : "js")), getHomeController(language));
     await writeFile(join(srcDir, "controllers", "admin." + (language === "typescript" ? "ts" : "js")), getAdminController(language));
-    await writeFile(join(srcDir, "middlewares", "auth." + (language === "typescript" ? "ts" : "js")), getAuthMiddleware(language));
+    await writeFile(join(srcDir, "middlewares", "auth.internal." + (language === "typescript" ? "ts" : "js")), getInternalAuthMiddleware(language));
+    await writeFile(join(srcDir, "middlewares", "auth.user." + (language === "typescript" ? "ts" : "js")), getUserAuthMiddleware(language));
     await writeFile(join(srcDir, "schemas", "home." + (language === "typescript" ? "ts" : "js")), getHomeSchema(language));
     await writeFile(join(srcDir, "schemas", "admin." + (language === "typescript" ? "ts" : "js")), getAdminSchema(language));
     await writeFile(join(srcDir, "cronjobs", "example." + (language === "typescript" ? "ts" : "js")), getExampleCronJob(language));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-sprint",
-    "version": "0.0.52",
+    "version": "0.0.54",
     "description": "Create a new Sprint API project",
     "type": "module",
     "bin": {

package/src/generators.ts

@@ -218,8 +218,8 @@ export const jwtValidateController: Handler = (req: SprintRequest, res: SprintRe
     }
 
     try {
-        const { publicKey } = getJwtFromEnv();
-        const decoded = verifyEncrypted(token, publicKey);
+        const { publicKey, encryptionSecret } = getJwtFromEnv();
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
 
         if (!decoded) {
             return res.status(401).json({ error: "Invalid token" });
@@ -250,8 +250,8 @@ export const jwtValidateController = (req: SprintRequest, res: SprintResponse) =
     }
 
     try {
-        const { publicKey } = getJwtFromEnv();
-        const decoded = verifyEncrypted(token, publicKey);
+        const { publicKey, encryptionSecret } = getJwtFromEnv();
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
 
         if (!decoded) {
             return res.status(401).json({ error: "Invalid token" });
@@ -292,7 +292,7 @@ export const jwtGenerateController: Handler = (req: SprintRequest, res: SprintRe
     try {
         const { privateKey } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
-        const token = signEncrypted(payload, privateKey, { expiresIn: "1h" });
+        const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
     } catch (error) {
         return res.status(500).json({ error: "JWT not configured" });
@@ -323,9 +323,9 @@ export const jwtGenerateController = (req: SprintRequest, res: SprintResponse) =
     const { userId, role } = req.body || {};
     
     try {
-        const { privateKey } = getJwtFromEnv();
+        const { privateKey, encryptionSecret } = getJwtFromEnv();
         const payload = { userId, role: role || "user" };
-        const token = signEncrypted(payload, privateKey, { expiresIn: "1h" });
+        const token = signEncrypted(payload, privateKey, encryptionSecret, { expiresIn: "1h" });
         res.json({ token });
     } catch (error) {
         return res.status(500).json({ error: "JWT not configured" });
@@ -391,26 +391,21 @@ export const jwtGenerateSchema = defineRouteSchema({
 `;
 }
 
-export function getAuthMiddleware(language: string) {
+export function getInternalAuthMiddleware(language: string) {
     if (language === "typescript") {
         return `import { defineMiddleware } from "sprint-es";
 
 export default defineMiddleware({
-    name: "auth",
+    name: "adminAuth",
     priority: 10,
     include: "/admin/**",
     handler: (req, res, next) => {
         const auth = req.sprint.getAuthorization();
-
-        if (!auth) {
-            return res.status(401).json({ error: "No authorization header" });
-        }
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
 
         const token = auth.replace("Bearer ", "");
 
-        if (token !== "admin-token") {
-            return res.status(403).json({ error: "Invalid token" });
-        }
+        if (token !== "admin-token") return res.status(403).json({ error: "Invalid token" });
 
         next();
     }
@@ -420,21 +415,73 @@ export default defineMiddleware({
     return `import { defineMiddleware } from "sprint-es";
 
 export default defineMiddleware({
-    name: "auth",
+    name: "adminAuth",
     priority: 10,
     include: "/admin/**",
     handler: (req, res, next) => {
         const auth = req.sprint.getAuthorization();
+        if (!auth)  return res.status(401).json({ error: "No authorization header" });
+        
+        const token = auth.replace("Bearer ", "");
 
-        if (!auth) {
-            return res.status(401).json({ error: "No authorization header" });
-        }
+        if (token !== "admin-token") return res.status(403).json({ error: "Invalid token" });
+        
+        next();
+    }
+});
+`;
+}
+
+export function getUserAuthMiddleware(language: string) {
+    if (language === "typescript") {
+        return `import { defineMiddleware } from "sprint-es";
+import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
+
+const { publicKey, encryptionSecret } = getJwtFromEnv();
+
+export default defineMiddleware({
+    name: "userAuth",
+    priority: 10,
+    include: "/**",
+    exclude: "/admin/**",
+    handler: (req, res, next) => {
+        const auth = req.sprint.getAuthorization();
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
 
         const token = auth.replace("Bearer ", "");
 
-        if (token !== "admin-token") {
-            return res.status(403).json({ error: "Invalid token" });
-        }
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);cd .
+
+        if (!decoded) return res.status(403).json({ error: "Invalid token" });
+        
+        req.custom.user = decoded;
+
+        next();
+    }
+});
+`;
+    }
+    return `import { defineMiddleware } from "sprint-es";
+import { verifyEncrypted, getJwtFromEnv } from "sprint-es/jwt";
+
+const { publicKey, encryptionSecret } = getJwtFromEnv();
+
+export default defineMiddleware({
+    name: "userAuth",
+    priority: 10,
+    include: "/**",
+    exclude: "/admin/**",
+    handler: (req, res, next) => {
+        const auth = req.sprint.getAuthorization();
+        if (!auth) return res.status(401).json({ error: "No authorization header" });
+
+        const token = auth.replace("Bearer ", "");
+
+        const decoded = verifyEncrypted(token, publicKey, encryptionSecret);
+
+        if (!decoded) return res.status(403).json({ error: "Invalid token" });
+
+        req.custom.user = decoded;
 
         next();
     }

package/src/index.ts

@@ -5,7 +5,7 @@ import { join } from "path";
 import color from "picocolors";
 import * as p from "@clack/prompts";
 import { validateProjectName } from "./validators.js";
-import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
+import { getTypeScriptPackageJson, getJavaScriptPackageJson, getTsConfig, getViteConfig, getMainFile, getHomeRoute, getAdminRoute, getHomeController, getAdminController, getInternalAuthMiddleware, getUserAuthMiddleware, getHomeSchema, getAdminSchema, getDockerfile, getDockerCompose, getGitignore, getDockerIgnore, getSprintConfigFile, getEnvDevelopment, getEnvProduction, getExampleCronJob } from "./generators.js";
 
 export interface CLIOptions {
     projectName?: string;
@@ -202,7 +202,8 @@ async function createProject(
     await writeFile(join(srcDir, "controllers", "home." + (language === "typescript" ? "ts" : "js")), getHomeController(language));
     await writeFile(join(srcDir, "controllers", "admin." + (language === "typescript" ? "ts" : "js")), getAdminController(language));
 
-    await writeFile(join(srcDir, "middlewares", "auth." + (language === "typescript" ? "ts" : "js")), getAuthMiddleware(language));
+    await writeFile(join(srcDir, "middlewares", "auth.internal." + (language === "typescript" ? "ts" : "js")), getInternalAuthMiddleware(language));
+    await writeFile(join(srcDir, "middlewares", "auth.user." + (language === "typescript" ? "ts" : "js")), getUserAuthMiddleware(language));
 
     await writeFile(join(srcDir, "schemas", "home." + (language === "typescript" ? "ts" : "js")), getHomeSchema(language));
     await writeFile(join(srcDir, "schemas", "admin." + (language === "typescript" ? "ts" : "js")), getAdminSchema(language));