From f9d2bb87999d16304cedcd66d4314202a5b20b28 Mon Sep 17 00:00:00 2001 From: Lakhan Samani Date: Wed, 28 Jul 2021 11:58:52 +0530 Subject: [PATCH] fix: add env support for fb & twitter secrets (#34) --- server/constants/constants.go | 48 +++++++++++++++++++---------------- server/env.go | 6 +++-- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/server/constants/constants.go b/server/constants/constants.go index c09411b..68a8495 100644 --- a/server/constants/constants.go +++ b/server/constants/constants.go @@ -1,28 +1,32 @@ package constants var ( - ROOT_SECRET = "" - ENV = "" - DATABASE_TYPE = "" - DATABASE_URL = "" - SMTP_HOST = "" - SMTP_PORT = "" - SENDER_EMAIL = "" - SENDER_PASSWORD = "" - JWT_TYPE = "" - JWT_SECRET = "" - FRONTEND_URL = "" - SERVER_URL = "" - PORT = "8080" - REDIS_URL = "" - IS_PROD = false - COOKIE_NAME = "" - GOOGLE_CLIENT_ID = "" - GOOGLE_CLIENT_SECRET = "" - GITHUB_CLIENT_ID = "" - GITHUB_CLIENT_SECRET = "" - // FACEBOOK_CLIENT_ID = "" - // FACEBOOK_CLIENT_SECRET = "" + ROOT_SECRET = "" + ENV = "" + DATABASE_TYPE = "" + DATABASE_URL = "" + SMTP_HOST = "" + SMTP_PORT = "" + SENDER_EMAIL = "" + SENDER_PASSWORD = "" + JWT_TYPE = "" + JWT_SECRET = "" + FRONTEND_URL = "" + SERVER_URL = "" + PORT = "8080" + REDIS_URL = "" + IS_PROD = false + COOKIE_NAME = "" FORGOT_PASSWORD_URI = "" VERIFY_EMAIL_URI = "" + + // OAuth login + GOOGLE_CLIENT_ID = "" + GOOGLE_CLIENT_SECRET = "" + GITHUB_CLIENT_ID = "" + GITHUB_CLIENT_SECRET = "" + FACEBOOK_CLIENT_ID = "" + FACEBOOK_CLIENT_SECRET = "" + TWITTER_CLIENT_ID = "" + TWITTER_CLIENT_SECRET = "" ) diff --git a/server/env.go b/server/env.go index e7f692f..7f3d377 100644 --- a/server/env.go +++ b/server/env.go @@ -50,8 +50,10 @@ func InitEnv() { constants.GOOGLE_CLIENT_SECRET = os.Getenv("GOOGLE_CLIENT_SECRET") constants.GITHUB_CLIENT_ID = os.Getenv("GITHUB_CLIENT_ID") constants.GITHUB_CLIENT_SECRET = os.Getenv("GITHUB_CLIENT_SECRET") - // FACEBOOK_CLIENT_ID = os.Getenv("FACEBOOK_CLIENT_ID") - // FACEBOOK_CLIENT_SECRET = os.Getenv("FACEBOOK_CLIENT_SECRET") + constants.FACEBOOK_CLIENT_ID = os.Getenv("FACEBOOK_CLIENT_ID") + constants.FACEBOOK_CLIENT_SECRET = os.Getenv("FACEBOOK_CLIENT_SECRET") + constants.TWITTER_CLIENT_ID = os.Getenv("TWITTER_CLIENT_ID") + constants.TWITTER_CLIENT_SECRET = os.Getenv("TWITTER_CLIENT_SECRET") constants.FORGOT_PASSWORD_URI = strings.TrimPrefix(os.Getenv("FORGOT_PASSWORD_URI"), "/") constants.VERIFY_EMAIL_URI = strings.TrimPrefix(os.Getenv("VERIFY_EMAIL_URI"), "/") if constants.ROOT_SECRET == "" {