Fix config and google login issue

config/core-config.go

@@ -25,6 +25,7 @@ var (
 	JwtValidity         int
 	JwtIssuer           string
 	AllowedOrigin		string
+	Port                string
 )
 
 func findAndLoadEnv(envFile string) {
@@ -99,6 +100,9 @@ func loadConfig() {
 	TokenExpiration = getEnvInt("TokenExpiration")
 
 	AllowedOrigin = getEnvVar("ALLOWED_ORIGINS")
+
+	Port = getEnvVar("PORT")
+	JwtValidity = getEnvInt("JWT_VALIDITY_IN_HOURS")
 }
 
 func getEnvVar(key string) string {

controllers/auth.go

@@ -20,8 +20,8 @@ import (
 var (
 	googleOAuthConfig *oauth2.Config
 	googleConfigMu    sync.Mutex
-    domain = config.Domain
-    authRedirectUrl = config.AuthRedirectUrl
+	domain            = config.Domain
+	authRedirectUrl   = config.AuthRedirectUrl
 )
 
 func getGoogleOAuthConfig() *oauth2.Config {
@@ -30,9 +30,9 @@ func getGoogleOAuthConfig() *oauth2.Config {
 
 	if googleOAuthConfig == nil {
 		googleOAuthConfig = &oauth2.Config{
-			ClientID:     config.AuthRedirectUrl,
-			ClientSecret: config.GoogleClientId,
-			RedirectURL: config.GoogleRedirectUrl,
+			ClientID:     config.GoogleClientId,
+			ClientSecret: config.GoogleClientSecret,
+			RedirectURL:  config.GoogleRedirectUrl,
 			Scopes: []string{
 				"https://www.googleapis.com/auth/userinfo.email",
 				"https://www.googleapis.com/auth/userinfo.profile",

environments/test.env

@@ -1,6 +1,6 @@
 ENV="test"
 JWT_SECRET="secret"
-JWT_VALIDITY_IN_DAYS=7
+JWT_VALIDITY_IN_HOURS=24
 JWT_ISSUER="tiny-site-backend"
 
 DOMAIN="localhost"
@@ -16,4 +16,5 @@ GOOGLE_REDIRECT_URL="http://localhost:8000/v1/auth/google/callback"
 
 Max_Url_Count=10
 TokenExpiration=3600
-ALLOWED_ORIGINS=*
+ALLOWED_ORIGINS=*
+PORT=8000

main.go

@@ -2,10 +2,9 @@ package main
 
 import (
 	"flag"
-	"log"
-	"os"
 
 	"github.com/Real-Dev-Squad/tiny-site-backend/config"
+	"github.com/Real-Dev-Squad/tiny-site-backend/logger"
 	"github.com/Real-Dev-Squad/tiny-site-backend/routes"
 	"github.com/Real-Dev-Squad/tiny-site-backend/utils"
 )
@@ -14,11 +13,11 @@ func main() {
 	dsn := config.DbUrl
 	db, err := utils.SetupDBConnection(dsn)
 	if err != nil {
-		log.Fatalf("failed to connect to the database: %v", err)
+		logger.Fatal("failed to connect to the database:", err)
 	}
 
 
-	port := os.Getenv("PORT")
+	port := config.Port
 	if port == "" {
 		port = "8080"
 	}

utils/jwt.go

@@ -2,8 +2,6 @@ package utils
 
 import (
 	"errors"
-	"os"
-	"strconv"
 	"time"
 
 	"github.com/Real-Dev-Squad/tiny-site-backend/config"
@@ -18,11 +16,7 @@ func GenerateToken(user *models.User) (string, error) {
 	issuer := config.JwtIssuer
 	key := []byte(config.JwtSecret)
 
-	tokenValidityInHours, err := strconv.ParseInt(os.Getenv("JWT_VALIDITY_IN_HOURS"), 10, 64)
-	if err != nil {
-		return "", err
-	}
-
+	tokenValidityInHours := config.JwtValidity
 
 	tokenExpiryTime := time.Now().Add(time.Duration(tokenValidityInHours) * time.Hour).UTC().Format(time.RFC3339)