🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update environment variables for cloud integration in Docker configurations
Bill Yangb34aff115338
diff --git a/client/src/app/login/page.tsx b/client/src/app/login/page.tsxindex 66c98ed3c..ddf9cd9f6 100644--- a/client/src/app/login/page.tsx+++ b/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 */}+ {/* <ahref="#"className="ml-auto inline-block text-sm underline-offset-4 hover:underline">Forgot your password?- </a>+ </a> */}</div><Inputid="password"diff --git a/docker-compose.dev.yml b/docker-compose.dev.ymlindex 79271273d..df3c73c13 100644--- a/docker-compose.dev.yml+++ b/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_healthydiff --git a/docker-compose.yml b/docker-compose.ymlindex 39c1478ab..e5e5a31c9 100644--- a/docker-compose.yml+++ b/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_healthydiff --git a/server/src/lib/auth.ts b/server/src/lib/auth.tsindex d0290a584..9bdd17891 100644--- a/server/src/lib/auth.ts+++ b/server/src/lib/auth.ts@@ -78,20 +78,22 @@ export function initAuth(allowedOrigins: string[]) {// Disable email verification for nowrequireEmailVerification: false,},- // socialProviders: {- // google: {- // clientId: process.env.GOOGLE_CLIENT_ID!,- // clientSecret: process.env.GOOGLE_CLIENT_SECRET!,- // },- // github: {- // clientId: process.env.GITHUB_CLIENT_ID!,- // clientSecret: process.env.GITHUB_CLIENT_SECRET!,- // },- // twitter: {- // clientId: process.env.TWITTER_CLIENT_ID!,- // clientSecret: process.env.TWITTER_CLIENT_SECRET!,- // },- // },+ socialProviders: IS_CLOUD+ ? {+ google: {+ clientId: process.env.GOOGLE_CLIENT_ID!,+ clientSecret: process.env.GOOGLE_CLIENT_SECRET!,+ },+ github: {+ clientId: process.env.GITHUB_CLIENT_ID!,+ clientSecret: process.env.GITHUB_CLIENT_SECRET!,+ },+ // twitter: {+ // clientId: process.env.TWITTER_CLIENT_ID!,+ // clientSecret: process.env.TWITTER_CLIENT_SECRET!,+ // },+ }+ : {},deleteUser: {enabled: true,},