prepping for pull request

APandamonium1 · Aug 28, 2024 · 3b1a6ed · 3b1a6ed
1 parent cf264fc
commit 3b1a6ed
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/EduSync.exe b/EduSync.exe
diff --git a/database.go b/database.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"strings"
 
 	firebase "firebase.google.com/go"
@@ -16,16 +17,16 @@ import (
 var firebaseClient *db.Client
 
 func SessionCookie() (string, error) {
-	sessionCookieStore := goDotEnvVariable("SESSION_COOKIE_STORE")
-	if sessionCookieStore == "" {
-		return sessionCookieStore, fmt.Errorf("SESSION_COOKIE_STORE is not set in the environment variables")
-	}
-
-	// sessionCookieStore, found := os.LookupEnv("COOKIESTORE")
-	// if !found {
-	// 	log.Fatalf("COOKIESTORE is not set in the environment variables")
+	// sessionCookieStore := goDotEnvVariable("SESSION_COOKIE_STORE")
+	// if sessionCookieStore == "" {
+	// 	return sessionCookieStore, fmt.Errorf("SESSION_COOKIE_STORE is not set in the environment variables")
 	// }
 
+	sessionCookieStore, found := os.LookupEnv("COOKIESTORE")
+	if !found {
+		log.Fatalf("COOKIESTORE is not set in the environment variables")
+	}
+
 	return sessionCookieStore, nil
 }
 

diff --git a/firebase.go b/firebase.go
@@ -30,17 +30,17 @@ func goDotEnvVariable(key string) string {
 func initializeFirebase() error {
 	ctx := context.Background()
 
-	// databaseURL, found := os.LookupEnv("DATABASE_URL")
-	// if !found {
-	// 	log.Fatalf("DATABASE_URL is not set in the environment variables")
-	// }
-	// opt := option.WithCredentialsFile("edusync-7bd5e-firebase-adminsdk-x49uh-af084a6314.json")
-
-	databaseURL := goDotEnvVariable("DATABASE_URL")
-	if databaseURL == "" {
-		return fmt.Errorf("DATABASE_URL is not set in the environment variables")
+	databaseURL, found := os.LookupEnv("DATABASE_URL")
+	if !found {
+		log.Fatalf("DATABASE_URL is not set in the environment variables")
 	}
-	opt := option.WithCredentialsFile("edusync-test-firebase-adminsdk-hk5kl-9af0162b09.json")
+	opt := option.WithCredentialsFile("edusync-7bd5e-firebase-adminsdk-x49uh-af084a6314.json")
+
+	// databaseURL := goDotEnvVariable("DATABASE_URL")
+	// if databaseURL == "" {
+	// 	return fmt.Errorf("DATABASE_URL is not set in the environment variables")
+	// }
+	// opt := option.WithCredentialsFile("edusync-test-firebase-adminsdk-hk5kl-9af0162b09.json")
 
 	conf := &firebase.Config{DatabaseURL: databaseURL}
 

diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/sessions v1.3.0
+	github.com/joho/godotenv v1.5.1
 	github.com/markbates/goth v1.80.0
 	golang.org/x/oauth2 v0.21.0
 	google.golang.org/api v0.189.0

diff --git a/go.sum b/go.sum
@@ -81,6 +81,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.3.0 h1:XYlkq7KcpOB2ZhHBPv5WpjMIxrQosiZanfoy1HLZFzg=
 github.com/gorilla/sessions v1.3.0/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/markbates/goth v1.80.0 h1:NnvatczZDzOs1hn9Ug+dVYf2Viwwkp/ZDX5K+GLjan8=
 github.com/markbates/goth v1.80.0/go.mod h1:4/GYHo+W6NWisrMPZnq0Yr2Q70UntNLn7KXEFhrIdAY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=