Merge pull request #75 from WolfeLogix/FireStore-Test

Refactor credentials system

Author: parishwolfe

.github/workflows/deployment.yaml

@@ -65,6 +65,6 @@ jobs:
             --region "${{ secrets.GCP_REGION }}" \
             --allow-unauthenticated \
             --project "${{ secrets.GCP_PROJECT_ID }}" \
-            --update-secrets="PRINTIFY_API_KEY=PRINTIFY_API_KEY:latest,OPENAI_API_KEY=OPENAI_API_KEY:latest,GH_PAT=GH_PAT:latest,GH_UPLOAD_REPO=GH_UPLOAD_REPO:latest,GH_CONTENT_PREFIX=GH_CONTENT_PREFIX:latest,API_KEY=API_KEY:latest,SHOPIFY_API_KEY=SHOPIFY_API_KEY:latest,SHOPIFY_API_ACCESS_TOKEN=SHOPIFY_API_ACCESS_TOKEN:latest,SHOPIFY_SHOP_NAME=SHOPIFY_SHOP_NAME:latest,FIRESTORE_USER=FIRESTORE_USER:latest"
+            --update-secrets="PRINTIFY_API_KEY=PRINTIFY_API_KEY:latest,OPENAI_API_KEY=OPENAI_API_KEY:latest,GH_PAT=GH_PAT:latest,GH_UPLOAD_REPO=GH_UPLOAD_REPO:latest,GH_CONTENT_PREFIX=GH_CONTENT_PREFIX:latest,API_KEY=API_KEY:latest,SHOPIFY_API_KEY=SHOPIFY_API_KEY:latest,SHOPIFY_API_ACCESS_TOKEN=SHOPIFY_API_ACCESS_TOKEN:latest,SHOPIFY_SHOP_NAME=SHOPIFY_SHOP_NAME:latest"
         env:
           CLOUD_RUN_SERVICE: ${{ github.event.repository.name }}

app/database/firebase.py

@@ -10,23 +10,10 @@ def __init__(self):
         """Initialize Firestore."""
         try:
             # Get the Firestore key from the environment variable
-            credentials_content = os.getenv("FIRESTORE_USER")
-            if not credentials_content:
-                raise EnvironmentError(
-                    "FIRESTORE_USER environment variable not set.")
-
-            # Determine if it's a JSON string or a file path
-            # Likely a JSON string
-            if credentials_content.strip().startswith("{"):
-                cred_dict = json.loads(credentials_content)
-                cred = credentials.Certificate(cred_dict)
-            elif os.path.exists(credentials_content):  # It's a file path
-                cred = credentials.Certificate(credentials_content)
-            else:
-                raise ValueError(
-                    "FIRESTORE_USER environment variable contains invalid content. "
-                    "Ensure it is either a valid JSON string or a file path."
-                )
+            credentials_path = os.getenv("FIRESTORE_USER", None)
+            cred = None
+            if credentials_path:
+                cred = credentials.Certificate(credentials_path)
 
             # Initialize Firestore
             initialize_app(cred)