create-prisma-php-app 1.11.17 → 1.11.19

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

@@ -9,7 +9,6 @@ use DateTime;
 use Lib\Validator;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
-use Lib\Prisma\Classes\Prisma;
 
 class Auth
 {
@@ -209,38 +208,64 @@ class Auth
         }
     }
 
-    public function authProviders(GithubProvider | null $githubProvider = null, GoogleProvider | null $googleProvider = null)
+    private function saveAuthInfo($responseInfo, $accountData)
+    {
+        // Save user data to the database
+    }
+
+    private function findProvider(array $providers, string $type): ?object
+    {
+        foreach ($providers as $provider) {
+            if ($provider instanceof $type) {
+                return $provider;
+            }
+        }
+        return null;
+    }
+
+    public function authProviders(...$providers)
     {
         global $isGet, $dynamicRouteParams;
 
-        if ($isGet && in_array('signin', $dynamicRouteParams[self::PPHPAUTH]) && in_array('github', $dynamicRouteParams[self::PPHPAUTH]) && $githubProvider) {
-            $githubAuthUrl = "https://github.com/login/oauth/authorize?scope=user:email%20read:user&client_id=$githubProvider->clientId";
-            redirect($githubAuthUrl);
-        } elseif ($isGet && in_array('signin', $dynamicRouteParams[self::PPHPAUTH]) && in_array('google', $dynamicRouteParams[self::PPHPAUTH]) && $googleProvider) {
-            $googleAuthUrl = "https://accounts.google.com/o/oauth2/v2/auth?"
-                . "scope=" . urlencode('email profile') . "&"
-                . "response_type=code&"
-                . "client_id=" . urlencode($googleProvider->clientId) . "&"
-                . "redirect_uri=" . urlencode($googleProvider->redirectUri);
-
-            redirect($googleAuthUrl);
+        if ($isGet && in_array('signin', $dynamicRouteParams[self::PPHPAUTH])) {
+            foreach ($providers as $provider) {
+                if ($provider instanceof GithubProvider && in_array('github', $dynamicRouteParams[self::PPHPAUTH])) {
+                    $githubAuthUrl = "https://github.com/login/oauth/authorize?scope=user:email%20read:user&client_id={$provider->clientId}";
+                    redirect($githubAuthUrl);
+                } elseif ($provider instanceof GoogleProvider && in_array('google', $dynamicRouteParams[self::PPHPAUTH])) {
+                    $googleAuthUrl = "https://accounts.google.com/o/oauth2/v2/auth?"
+                        . "scope=" . urlencode('email profile') . "&"
+                        . "response_type=code&"
+                        . "client_id=" . urlencode($provider->clientId) . "&"
+                        . "redirect_uri=" . urlencode($provider->redirectUri);
+                    redirect($googleAuthUrl);
+                }
+            }
         }
 
         $authCode = Validator::validateString($_GET['code'] ?? '');
 
-        if (
-            $isGet && in_array('callback', $dynamicRouteParams[self::PPHPAUTH]) &&
-            in_array('github', $dynamicRouteParams[self::PPHPAUTH]) && isset($authCode)
-        ) {
-            return $this->githubProvider($githubProvider, $authCode);
-        } elseif (
-            $isGet && in_array('callback', $dynamicRouteParams[self::PPHPAUTH]) &&
-            in_array('google', $dynamicRouteParams[self::PPHPAUTH]) && isset($authCode)
-        ) {
-            return $this->googleProvider($googleProvider, $authCode);
-        } else {
-            exit("Error occurred. Please try again.");
+        if ($isGet && in_array('callback', $dynamicRouteParams[self::PPHPAUTH]) && isset($authCode)) {
+            if (in_array('github', $dynamicRouteParams[self::PPHPAUTH])) {
+                $provider = $this->findProvider($providers, GithubProvider::class);
+
+                if (!$provider) {
+                    exit("Error occurred. Please try again.");
+                }
+
+                return $this->githubProvider($provider, $authCode);
+            } elseif (in_array('google', $dynamicRouteParams[self::PPHPAUTH])) {
+                $provider = $this->findProvider($providers, GoogleProvider::class);
+
+                if (!$provider) {
+                    exit("Error occurred. Please try again.");
+                }
+
+                return $this->googleProvider($provider, $authCode);
+            }
         }
+
+        exit("Error occurred. Please try again.");
     }
 
     private function githubProvider(GithubProvider $githubProvider, string $authCode)
@@ -297,32 +322,7 @@ class Auth
                     'scope' => $tokenData->scope,
                 ];
 
-                $prisma = new Prisma();
-                $foundUser = $prisma->user->findUnique([
-                    'where' => [
-                        'email' => $primaryEmail,
-                    ],
-                ]);
-
-                if (!$foundUser) {
-                    $userData = [
-                        'name' => $responseInfo->login,
-                        'email' => $primaryEmail,
-                        'image' => $responseInfo->avatar_url,
-                        'emailVerified' => $primaryEmail ? date("Y-m-d H:i:s") : null,
-                        'Account' => [
-                            'create' => $accountData,
-                        ]
-                    ];
-
-                    $createUser = $prisma->user->create([
-                        'data' => $userData,
-                    ]);
-
-                    if (!$createUser) {
-                        exit("Error occurred. Please try again.");
-                    }
-                }
+                $this->saveAuthInfo($responseInfo, $accountData);
 
                 $userToAuthenticate = [
                     'name' => $responseInfo->login,
@@ -380,32 +380,7 @@ class Auth
                     'scope' => $tokenData->scope,
                 ];
 
-                $prisma = new Prisma();
-                $foundUser = $prisma->user->findUnique([
-                    'where' => [
-                        'email' => $responseInfo->email,
-                    ],
-                ]);
-
-                if (!$foundUser) {
-                    $userData = [
-                        'name' => $responseInfo->name,
-                        'email' => $responseInfo->email,
-                        'image' => $responseInfo->picture,
-                        'emailVerified' => $responseInfo->email ? date("Y-m-d H:i:s") : null,
-                        'Account' => [
-                            'create' => $accountData,
-                        ]
-                    ];
-
-                    $createUser = $prisma->user->create([
-                        'data' => $userData,
-                    ]);
-
-                    if (!$createUser) {
-                        exit("Error occurred. Please try again.");
-                    }
-                }
+                $this->saveAuthInfo($responseInfo, $accountData);
 
                 $userToAuthenticate = [
                     'name' => $responseInfo->name,

package/dist/src/app/index.php

@@ -29,7 +29,7 @@
                     <p class="mx-auto max-w-[700px] text-gray-500 md:text-xl dark:text-gray-400">
                         The Next Generation ORM for PHP
                     </p>
-                    <a class="inline-flex h-10 items-center justify-center rounded-md bg-gray-900 px-8 text-sm font-medium text-gray-50 shadow transition-colors hover:bg-gray-900/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950 disabled:pointer-events-none disabled:opacity-50 dark:bg-gray-50 dark:text-gray-900 dark:hover:bg-gray-50/90 dark:focus-visible:ring-gray-300" href="https://prismaphp.tsnc.tech/docs?doc=get-started">
+                    <a class="inline-flex h-10 items-center justify-center rounded-md bg-gray-900 px-8 text-sm font-medium text-gray-50 shadow transition-colors hover:bg-gray-900/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-950 disabled:pointer-events-none disabled:opacity-50 dark:bg-gray-50 dark:text-gray-900 dark:hover:bg-gray-50/90 dark:focus-visible:ring-gray-300" href="https://prismaphp.tsnc.tech/docs?doc=get-started" target="_blank">
                         Get Started
                     </a>
                 </div>

package/dist/tsconfig.json

@@ -105,5 +105,7 @@
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
-  }
+  },
+  "include": [],
+  "exclude": ["node_modules"]
 }

package/package.json

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