Merge branch 'develop' into 'master'

juuh eli See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!80
2022-08-16 20:07:54 +00:00
parent 570fff1d7d 0026b788b2
commit a4ae136e1a
1 changed files with 5 additions and 1 deletions
@@ -82,7 +82,11 @@ DATABASES = {

 # Google api settings
 GROUP_KEY = os.getenv("GROUP_KEY", "")
-GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
+try:
+    GOOGLE_SERVICE_ACCOUNT = json.loads(os.getenv("GOOGLE_CREDS_JSON", "{}"))
+except:
+    GOOGLE_SERVICE_ACCOUNT = json.loads("{}")
+

 # JWT authentication
 SIMPLE_JWT = {