Update environment variables for cloud integration in Docker configurations

- Added GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET to both docker-compose files for cloud support.
- Included GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET in the environment variables.
- Updated the auth.ts file to enable social login providers for cloud deployments.

client/src/app/login/page.tsx

@@ -85,12 +85,13 @@ export default function Page() {
               <div className="grid gap-2">
                 <div className="flex items-center">
                   <Label htmlFor="password">Password</Label>
-                  <a
+                  {/* todo: add forgot password */}
+                  {/* <a
                     href="#"
                     className="ml-auto inline-block text-sm underline-offset-4 hover:underline"
                   >
                     Forgot your password?
-                  </a>
+                  </a> */}
                 </div>
                 <Input
                   id="password"

docker-compose.dev.yml

@@ -72,7 +72,14 @@ services:
       - BASE_URL=${BASE_URL}
       - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
       - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
+      # below is only for rybbit cloud
       - CLOUD=${CLOUD}
+      - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
+      - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
+      - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET}
     depends_on:
       clickhouse:
         condition: service_healthy

docker-compose.yml

@@ -68,9 +68,14 @@ services:
       - POSTGRES_PASSWORD=frog
       - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET}
       - BASE_URL=${BASE_URL}
+      # below is only for rybbit cloud
+      - CLOUD=${CLOUD}
       - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
       - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
-      - CLOUD=${CLOUD}
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
+      - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET}
     depends_on:
       clickhouse:
         condition: service_healthy

server/src/lib/auth.ts

@@ -78,20 +78,22 @@ export function initAuth(allowedOrigins: string[]) {
       // Disable email verification for now
       requireEmailVerification: false,
     },
-    // socialProviders: {
+    socialProviders: IS_CLOUD
-    //   google: {
+      ? {
-    //     clientId: process.env.GOOGLE_CLIENT_ID!,
+          google: {
-    //     clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+            clientId: process.env.GOOGLE_CLIENT_ID!,
-    //   },
+            clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
-    //   github: {
+          },
-    //     clientId: process.env.GITHUB_CLIENT_ID!,
+          github: {
-    //     clientSecret: process.env.GITHUB_CLIENT_SECRET!,
+            clientId: process.env.GITHUB_CLIENT_ID!,
-    //   },
+            clientSecret: process.env.GITHUB_CLIENT_SECRET!,
-    //   twitter: {
+          },
-    //     clientId: process.env.TWITTER_CLIENT_ID!,
+          // twitter: {
-    //     clientSecret: process.env.TWITTER_CLIENT_SECRET!,
+          //   clientId: process.env.TWITTER_CLIENT_ID!,
-    //   },
+          //   clientSecret: process.env.TWITTER_CLIENT_SECRET!,
-    // },
+          // },
+        }
+      : {},
     deleteUser: {
       enabled: true,
     },