From 86567005cd336e902c2678a865cb566aa07f3b12 Mon Sep 17 00:00:00 2001
From: Julius Heitkoetter <juliush@mit.edu>
Date: Tue, 28 Nov 2023 10:44:57 -0500
Subject: [PATCH] added secrets for login

---
 .github/workflows/dev-ci-cd.yaml |  8 ++++++--
 deploy/dev/dev-compose.yaml      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-ci-cd.yaml b/.github/workflows/dev-ci-cd.yaml
index 76d79b5..b79e4b9 100644
--- a/.github/workflows/dev-ci-cd.yaml
+++ b/.github/workflows/dev-ci-cd.yaml
@@ -52,8 +52,12 @@ jobs:
           /bin/bash ${workspace}/deploy/create_secret.sh hf_token.txt ${{ secrets.HF_TOKEN }}
           /bin/bash ${workspace}/deploy/create_secret.sh pg_password.txt ${{ secrets.DEV_PG_PASSWORD }}
           /bin/bash ${workspace}/deploy/create_secret.sh grafana_password.txt ${{ secrets.DEV_GRAFANA_PG_PASSWORD }}
-          /bin/bash ${workspace}/deploy/create_secret.sh a2rchi_ssl_certificate.txt "$(echo {{ secrets.A2RCHI_SSL_CERTIFICATE }} | base64 -d)"
-          /bin/bash ${workspace}/deploy/create_secret.sh a2rchi_ssl_certificate_key.txt "$(echo {{ secrets.A2RCHI_SSL_CERTIFICATE_KEY }} | base64 -d)"
+          /bin/bash ${workspace}/deploy/create_secret.sh a2rchi_ssl_certificate.txt ${{ secrets.A2RCHI_SSL_CERTIFICATE }}
+          /bin/bash ${workspace}/deploy/create_secret.sh a2rchi_ssl_certificate_key.txt ${{ secrets.A2RCHI_SSL_CERTIFICATE_KEY }}
+          /bin/bash ${workspace}/deploy/create_secret.sh mit_client_id.txt ${{ secrets.DEV_MIT_CLIENT_ID }}
+          /bin/bash ${workspace}/deploy/create_secret.sh mit_client_secret.txt ${{ secrets.DEV_MIT_CLIENT_SECRET }}
+          /bin/bash ${workspace}/deploy/create_secret.sh google_client_id.txt ${{ secrets.DEV_GOOGLE_CLIENT_ID }}
+          /bin/bash ${workspace}/deploy/create_secret.sh google_client_secret.txt ${{ secrets.DEV_GOOGLE_CLIENT_SECRET }}
 
       # create env file to set tag(s) for docker-compose
       - name: Create Env File
diff --git a/deploy/dev/dev-compose.yaml b/deploy/dev/dev-compose.yaml
index 9d3bc46..20cb177 100644
--- a/deploy/dev/dev-compose.yaml
+++ b/deploy/dev/dev-compose.yaml
@@ -64,10 +64,20 @@ services:
       POSTGRES_PASSWORD_FILE: /run/secrets/pg_password
       A2RCHI_SSL_CERTIFICATE_FILE: /run/secrets/a2rchi_ssl_certicate
       A2RCHI_SSL_CERTIFICATE_KEY_FILE: /run/secrets/a2rchi_ssl_certicate_key
+      MIT_CLIENT_ID_FILE: /run/secrets/mit_client_id
+      MIT_CLIENT_SECRET_FILE: /run/secrets/mit_client_secret
+      GOOGLE_CLIENT_ID_FILE: /run/secrets/google_client_id
+      GOOGLE_CLIENT_SECRET_FILE: /run/secrets/google_client_secret
     secrets:
       - openai_api_key
       - hf_token
       - pg_password
+      - a2rchi_ssl_certicate
+      - a2rchi_ssl_certicate_key
+      - mit_client_id
+      - mit_client_secret
+      - google_client_id
+      - google_client_secret
     volumes:
       - a2rchi-dev-data:/root/data/
     logging:
@@ -265,3 +275,11 @@ secrets:
     file: secrets/a2rchi_ssl_certicate.txt
   a2rchi_ssl_certicate_key:
     file: secrets/a2rchi_ssl_certicate_key.txt
+  mit_client_id:
+    file: secrets/mit_client_id.txt
+  mit_client_secret:
+    file: secrets/mit_client_secret.txt
+  google_client_id:
+    file: secrets/google_client_id.txt
+  google_client_secret:
+    file: secrets/google_client_secret.txt