Merge pull request #536 from mangalap123/develop

Fix Subscribe Changes Form -- Updated to Cred File

Author: MooseQuest

habitat/hooks/run

@@ -1,5 +1,7 @@
 #!/bin/sh
 export HOME="/hab/svc/chime/config"
+# export the parameters file path
+export PARAMETERS="${pkg_prefix}/defaults/webapp.cfg"
 cd "/hab/svc/chime"
 
 if [ "$(whoami)" = "root" ]; then

habitat/plan.sh

@@ -67,6 +67,7 @@ do_build() {
 
 do_install() {
   cp -pr ${PLAN_CONTEXT}/../src/* "${pkg_prefix}/"
+  cp -pr ${PLAN_CONTEXT}/../deafults/webapp.cfg "${pkg_prefix}/defaults/"
   return $?
 }
 

src/penn_chime/view/spreadsheet.py

@@ -7,8 +7,8 @@ def __init__(self, st_obj, secret):
         # use creds to create a client to interact with the Google Drive API
         self.scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
         #secret = 'client_secret.json'
-        self.creds = ServiceAccountCredentials.from_json(secret)
-        #self.creds = ServiceAccountCredentials.from_json_keyfile_name(secret, self.scope)
+        #self.creds = ServiceAccountCredentials.from_json_keyfile_dict(secret)
+        self.creds = ServiceAccountCredentials.from_json_keyfile_name(secret, self.scope)
         self.client = gspread.authorize(self.creds)
 
 

src/penn_chime/view/st_display.py

@@ -444,9 +444,15 @@ def subscribe(st_obj):
     affiliation = st_obj.text_input (label="Enter Affiliation", value="", key="na_upper_2")
     if st_obj.button (label="Submit", key="ta_submit_1"):
         row = [email, name, affiliation]
-        send_subscription_to_google_sheet(st_obj, row)
+        send_subscription_to_google_sheet_secret_json(st_obj, row)
 
-def send_subscription_to_google_sheet(st_obj, row):
+def send_subscription_to_google_sheet_secret_json(st_obj, row):
+    json_secret = "/mnt/google-api-creds/client_secret.json"
+    #print(json_secret)
+    spr = spreadsheet (st_obj, json_secret)
+    spr.writeToSheet("CHIME Form Submissions", row)
+
+def send_subscription_to_google_sheet_secret_dict(st_obj, row):
     json_secret = readGoogleApiSecretsDict()
     #print(json_secret)
     spr = spreadsheet(st_obj, json_secret)