create-prisma-php-app 1.20.518 → 1.20.520

package/dist/bootstrap.php

@@ -8,6 +8,7 @@ require_once __DIR__ . '/vendor/autoload.php';
 require_once __DIR__ . '/settings/paths.php';
 
 use Lib\Middleware\AuthMiddleware;
+use Lib\Auth\Auth;
 use Dotenv\Dotenv;
 
 $dotenv = Dotenv::createImmutable(\DOCUMENT_PATH);
@@ -136,8 +137,9 @@ function getFilePrecedence()
 
 function uriExtractor(string $scriptUrl): string
 {
-    $prismaPHPSettings = json_decode(file_get_contents("prisma-php.json"), true);
-    $projectName = $prismaPHPSettings['projectName'] ?? '';
+    global $_prismaPHPSettings;
+
+    $projectName = $_prismaPHPSettings['projectName'] ?? '';
     if (empty($projectName)) {
         return "/";
     }
@@ -383,44 +385,6 @@ function setupErrorHandling(&$content)
     });
 }
 
-ob_start();
-require_once SETTINGS_PATH . '/public-functions.php';
-require_once SETTINGS_PATH . '/request-methods.php';
-$_metadataFile = APP_PATH . '/metadata.php';
-$_metadataArray = file_exists($_metadataFile) ? require_once $_metadataFile : [];
-$_filesListRoutes = [];
-/**
- * @var array $metadata Metadata information
- */
-$metadata = [];
-/**
- * @var string $uri The URI of the current request
- */
-$uri = "";
-/**
- * @var string $pathname The pathname of the current request
- */
-$pathname = "";
-/**
- * @var array $dynamicRouteParams The dynamic route parameters
- */
-$dynamicRouteParams = [];
-/**
- * @var string $content The content to be included in the main layout file
- */
-$content = "";
-/**
- * @var string $childContent The child content to be included in the layout file
- */
-$childContent = "";
-/**
- * @var array $mainLayoutHead The head content to be included in the main layout file
- */
-$mainLayoutHead = [];
-/**
- * @var array $mainLayoutFooter The footer content to be included in the main layout file
- */
-$mainLayoutFooter = [];
 
 function containsChildContent($filePath)
 {
@@ -615,6 +579,76 @@ function getLoadingsFiles()
     return '';
 }
 
+function authenticateUserToken()
+{
+    $token = getBearerToken();
+    if ($token) {
+        $auth = Auth::getInstance();
+        $verifyToken = $auth->verifyToken($token);
+        if ($verifyToken) {
+            $auth->authenticate($verifyToken);
+        }
+    }
+}
+
+function getPrismaSettings(): \ArrayObject
+{
+    $_prismaPHPSettingsFile = DOCUMENT_PATH . '/prisma-php.json';
+
+    if (file_exists($_prismaPHPSettingsFile)) {
+        $jsonContent = file_get_contents($_prismaPHPSettingsFile);
+        $decodedJson = json_decode($jsonContent, true);
+
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return new \ArrayObject($decodedJson, \ArrayObject::ARRAY_AS_PROPS);
+        } else {
+            return new \ArrayObject([]);
+        }
+    }
+}
+
+ob_start();
+require_once SETTINGS_PATH . '/public-functions.php';
+require_once SETTINGS_PATH . '/request-methods.php';
+$_metadataFile = APP_PATH . '/metadata.php';
+$_metadataArray = file_exists($_metadataFile) ? require_once $_metadataFile : [];
+$_filesListRoutes = [];
+$_prismaPHPSettings = getPrismaSettings();
+$_fileToInclude = '';
+
+/**
+ * @var array $metadata Metadata information
+ */
+$metadata = [];
+/**
+ * @var string $uri The URI of the current request
+ */
+$uri = "";
+/**
+ * @var string $pathname The pathname of the current request
+ */
+$pathname = "";
+/**
+ * @var array $dynamicRouteParams The dynamic route parameters
+ */
+$dynamicRouteParams = [];
+/**
+ * @var string $content The content to be included in the main layout file
+ */
+$content = "";
+/**
+ * @var string $childContent The child content to be included in the layout file
+ */
+$childContent = "";
+/**
+ * @var array $mainLayoutHead The head content to be included in the main layout file
+ */
+$mainLayoutHead = [];
+/**
+ * @var array $mainLayoutFooter The footer content to be included in the main layout file
+ */
+$mainLayoutFooter = [];
+
 try {
     $_determineContentToInclude = determineContentToInclude();
     checkForDuplicateRoutes();
@@ -622,6 +656,7 @@ try {
     $_layoutsToInclude = $_determineContentToInclude['layouts'] ?? [];
     $uri = $_determineContentToInclude['uri'] ?? '';
     $pathname = $uri ? "/" . $uri : "/";
+    $_fileToInclude = basename($_contentToInclude);
 
     if (empty($_contentToInclude)) {
         if (!$isXFilRequest) {

package/dist/index.js

@@ -343,18 +343,23 @@ function modifyLayoutPHP(baseDir, answer) {
   if (checkExcludeFiles(layoutPath)) return;
   try {
     let indexContent = fs.readFileSync(layoutPath, "utf8");
-    const stylesAndLinks = `\n    <link href="<?php echo $baseUrl; ?>/css/index.css" rel="stylesheet">\n    <script src="<?php echo $baseUrl; ?>/js/index.js"></script>`;
+    let stylesAndLinks = "";
+    if (!answer.backendOnly) {
+      stylesAndLinks = `\n    <link href="<?php echo $baseUrl; ?>/css/index.css" rel="stylesheet">\n    <script src="<?php echo $baseUrl; ?>/js/index.js"></script>`;
+    }
     // Tailwind CSS link or CDN script
-    const tailwindLink = answer.tailwindcss
-      ? `    <link href="<?php echo $baseUrl; ?>/css/styles.css" rel="stylesheet"> ${stylesAndLinks}`
-      : `    <script src="https://cdn.tailwindcss.com"></script> ${stylesAndLinks}`;
+    let tailwindLink = "";
+    if (!answer.backendOnly) {
+      tailwindLink = answer.tailwindcss
+        ? `    <link href="<?php echo $baseUrl; ?>/css/styles.css" rel="stylesheet"> ${stylesAndLinks}`
+        : `    <script src="https://cdn.tailwindcss.com"></script> ${stylesAndLinks}`;
+    }
     // Insert before the closing </head> tag
     indexContent = indexContent.replace(
       "</head>",
       `${tailwindLink}\n    <!-- Dynamic Head -->
     <?php echo implode("\\n", $mainLayoutHead); ?></head>`
     );
-    console.log("🚀 ~ modifyLayoutPHP ~ indexContent:", indexContent);
     fs.writeFileSync(layoutPath, indexContent, { flag: "w" });
     console.log(
       chalk.green(
@@ -460,13 +465,15 @@ async function createDirectoryStructure(baseDir, answer) {
   await executeCopy(baseDir, directoriesToCopy, answer);
   await updatePackageJson(baseDir, answer);
   await updateComposerJson(baseDir, answer);
-  if (!answer.backendOnly) await updateIndexJsForWebSocket(baseDir, answer);
+  if (!answer.backendOnly) {
+    await updateIndexJsForWebSocket(baseDir, answer);
+  }
   if (answer.tailwindcss) {
     createOrUpdateTailwindConfig(baseDir);
-    modifyLayoutPHP(baseDir, answer);
     modifyPostcssConfig(baseDir);
-  } else {
-    if (!answer.backendOnly) modifyLayoutPHP(baseDir, answer);
+  }
+  if (answer.tailwindcss || !answer.backendOnly || answer.swaggerDocs) {
+    modifyLayoutPHP(baseDir, answer);
   }
   const prismaPHPEnvContent = `# Prisma PHP Auth Secret Key For development only - Change this in production
 AUTH_SECRET=uxsjXVPHN038DEYls2Kw0QUgBcXKUyrjv416nIFWPY4=  

package/dist/settings/public-functions.php

@@ -88,3 +88,32 @@ function isXFilRequest(): bool
 
     return false;
 }
+
+/**
+ * Get the Bearer token from the Authorization header.
+ *
+ * @return string|null The Bearer token or null if not present.
+ */
+function getBearerToken(): ?string
+{
+    // Normalize headers to handle case-insensitive keys
+    $headers = array_change_key_case(getallheaders(), CASE_LOWER);
+    $authHeader = $headers['authorization'] ?? null;
+
+    // If not found, try fetching it from $_SERVER as a fallback
+    if (!$authHeader && isset($_SERVER['HTTP_AUTHORIZATION'])) {
+        $authHeader = $_SERVER['HTTP_AUTHORIZATION'];
+    }
+
+    // Fallback for Apache servers
+    if (!$authHeader && isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+        $authHeader = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
+    }
+
+    // Check if the Authorization header is in the expected Bearer format
+    if ($authHeader && preg_match('/Bearer\s(\S+)/', $authHeader, $matches)) {
+        return $matches[1];
+    }
+
+    return null;
+}

package/dist/settings/swagger-setup.js

@@ -1,8 +1,7 @@
 import swaggerJsdoc from "swagger-jsdoc";
-import { writeFileSync } from "fs";
+import { writeFileSync, readFileSync, existsSync } from "fs";
 import { fileURLToPath } from "url";
 import { join, dirname } from "path";
-import { readFileSync } from "fs";
 import chalk from "chalk";
 
 // Define __dirname equivalent in ES modules
@@ -16,9 +15,28 @@ const outputPath = join(
 );
 
 const bsConnectionInfo = join(__dirname, "bs-output.json");
-const jsonData = JSON.parse(readFileSync(bsConnectionInfo, "utf8"));
 
-// Swagger options
+// Check if the bs-output.json file exists
+const defaultConnectionInfo = {
+  local: "http://localhost:3000",
+  external: "http://192.168.1.5:3000",
+  ui: "http://localhost:3001",
+  uiExternal: "http://192.168.1.5:3001",
+};
+
+let jsonData = defaultConnectionInfo;
+
+if (existsSync(bsConnectionInfo)) {
+  try {
+    const data = readFileSync(bsConnectionInfo, "utf8");
+    jsonData = JSON.parse(data);
+  } catch (error) {
+    console.error("Error parsing bs-output.json:", error);
+  }
+} else {
+  console.warn("bs-output.json not found, using default connection info.");
+}
+
 const options = {
   definition: {
     openapi: "3.0.0",
@@ -30,11 +48,25 @@ const options = {
     servers: [
       {
         url: jsonData.local, // For Development
-        description: "Server",
+        description: "Development Server",
       },
       {
-        url: "your-domain", // For Production
-        description: "Server",
+        url: "your-production-domain", // For Production
+        description: "Production Server",
+      },
+    ],
+    components: {
+      securitySchemes: {
+        bearerAuth: {
+          type: "http",
+          scheme: "bearer",
+          bearerFormat: "JWT",
+        },
+      },
+    },
+    security: [
+      {
+        bearerAuth: [],
       },
     ],
   },

package/dist/src/Lib/Auth/Auth.php

@@ -100,13 +100,22 @@ class Auth
      */
     public function isAuthenticated(): bool
     {
+        global $_fileToInclude;
+
         if (!isset($_COOKIE[self::COOKIE_NAME])) {
             unset($_SESSION[self::PAYLOAD]);
             return false;
         }
 
-        $jwt = $_COOKIE[self::COOKIE_NAME];
+        if ($_fileToInclude === 'route.php') {
+            $bearerToken = getBearerToken();
+            $verifyBearerToken = $this->verifyToken($bearerToken);
+            if (!$verifyBearerToken) {
+                return false;
+            }
+        }
 
+        $jwt = $_COOKIE[self::COOKIE_NAME];
         $verifyToken = $this->verifyToken($jwt);
         if ($verifyToken === false) {
             return false;
@@ -148,17 +157,31 @@ class Auth
 
     /**
      * Verifies the JWT token and returns the decoded payload if the token is valid.
-     * If the token is invalid, an exception is thrown.
+     * If the token is invalid or expired, null is returned.
      * 
      * @param string $jwt The JWT token to verify.
-     * @return object Returns the decoded payload if the token is valid.
+     * @return object|null Returns the decoded payload if the token is valid, or null if invalid or expired.
      */
-    public function verifyToken(string $jwt)
+    public function verifyToken(?string $jwt): ?object
     {
         try {
-            return JWT::decode($jwt, new Key($this->secretKey, 'HS256'));
+            if (!$jwt) {
+                return null;
+            }
+
+            $token = JWT::decode($jwt, new Key($this->secretKey, 'HS256'));
+
+            if (empty($token->role)) {
+                return null;
+            }
+
+            if (isset($token->exp) && time() >= $token->exp) {
+                return null;
+            }
+
+            return $token;
         } catch (\Exception) {
-            throw new \InvalidArgumentException("Invalid token.");
+            return null;
         }
     }
 

package/dist/src/app/route.php

@@ -2,7 +2,8 @@
 
 $welcome = 'Welcome to the Prisma PHP Backend Only Starter Kit! This starter kit provides a powerful foundation for building robust PHP applications with Prisma PHP ORM, a modern database toolkit. To create a new route, follow these steps:
 1. Create a new folder inside the "src/app" directory with the name of your route.
-2. Inside the newly created folder, create a route.php file to define your route logic.
+2. Inside the newly created folder, create a route.php file. src/app/your-route/route.php
+3. Define your route logic inside the route.php file.
 
 This will serve as your API endpoint for the newly created route. Feel free to customize and extend the functionality as needed. Happy coding!
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "1.20.518",
+  "version": "1.20.520",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",