maybe working?

Author: sspickle

.flaskenv

@@ -2,6 +2,6 @@ FLASK_APP=main.py
 FLASK_ENV=development
 FLASK_RUN_HOST=localhost
 FLASK_RUN_PORT=8080
-GLOWSCRIPT_RUNNING_LOCALLY=true
-DATASTORE_EMULATOR_HOST=localhost:8081
+GLOWSCRIPT_RUNNING_LOCALLY=false
+#DATASTORE_EMULATOR_HOST=localhost:8081
 CLIENT_SECRET_VERSION=1

app.yaml

@@ -1,4 +1,4 @@
-runtime: python38
+runtime: python310
 
 handlers:
 

ide/auth.py

@@ -89,7 +89,7 @@ def get_base_url():
     """
     Get the base_url from the datastore
     """
-    return getSetting('auth_base_url')
+    return getSetting('auth_base_url', default='http://localhost:8080')
 #
 # Robust way to check for running locally. Also easy to modify.
 #
@@ -121,7 +121,7 @@ def fillCache(self):
             from google.cloud import secretmanager
             secrets = secretmanager.SecretManagerServiceClient()
             secret_path = f"projects/{GOOGLE_PROJECT_ID}/secrets/OAUTH_CLIENT_SECRETS/versions/{CLIENT_SECRET_VERSION}"
-            theSecret = secrets.access_secret_version(secret_path).payload.data.decode("utf-8")
+            theSecret = secrets.access_secret_version(name=secret_path).payload.data.decode("utf-8")
             client_secrets = json.loads(theSecret)
             CLIENT_ID = client_secrets.get("FN_CLIENT_ID")
             CLIENT_SECRET = client_secrets.get("FN_CLIENT_SECRET")
@@ -217,7 +217,7 @@ def auth():
 
     oauth = authNamespace.get('oauth') or fillAuthNamespace()
     token = oauth.google.authorize_access_token()
-    user = oauth.google.parse_id_token(token)
+    user = token['userinfo']
 
     if check_auth_host_for_preview(auth_host): # are we in a preview version?
         if user.get('email') not in get_preview_users():  # only finish login for these guys

ide/routes.py

@@ -183,7 +183,7 @@ def lib_static(filename):
     cache_timeout = None
     if is_running_locally():
         cache_timeout=0
-    return flask.send_from_directory('../lib', filename, cache_timeout=cache_timeout)
+    return flask.send_from_directory('../lib', filename, max_age=cache_timeout)
 
 @app.route('/package/<path:filename>')
 def package_static(filename):

requirements.txt

@@ -1,46 +1,43 @@
-astroid==2.4.2
-Authlib==0.15.2
-cachetools==4.1.1
-certifi==2022.12.07
-cffi==1.14.1
-chardet==3.0.4
-click==7.1.2
-cryptography==39.0.1
+async-timeout==4.0.2
+Authlib==1.2.0
+blinker==1.6.2
+cachetools==5.3.0
+certifi==2023.5.7
+cffi==1.15.1
+charset-normalizer==3.1.0
+click==8.1.3
+cryptography==40.0.2
 Flask==2.3.2
-google-api-core==1.22.0
-google-api-python-client==1.10.0
-google-auth==1.20.0
-google-auth-httplib2==0.0.4
-google-cloud-core==1.5.0
-google-cloud-datastore==1.13.2
-google-cloud-logging==2.0.2
-google-cloud-ndb==1.4.2
-google-cloud-secret-manager==1.0.0
-googleapis-common-protos==1.52.0
-grpc-google-iam-v1==0.12.3
-grpcio==1.30.0
-httplib2==0.19.0
-idna==2.10
-isort==4.3.21
-itsdangerous==1.1.0
-Jinja2==2.11.3
-lazy-object-proxy==1.4.3
-MarkupSafe==1.1.1
-mccabe==0.6.1
-proto-plus==1.13.0
-protobuf==3.20.2
-pyasn1==0.4.8
-pyasn1-modules==0.2.8
-pycparser==2.20
-pylint==2.5.3
-python-dotenv==0.14.0
-pytz==2020.1
-redis==3.5.3
-requests==2.25.1
-rsa==4.7
-six==1.15.0
-toml==0.10.1
-uritemplate==3.0.1
-urllib3==1.26.5
-Werkzeug==1.0.1
-wrapt==1.12.1
+google-api-core==2.11.0
+google-api-python-client==2.86.0
+google-auth==2.18.0
+google-auth-httplib2==0.1.0
+google-cloud-core==2.3.2
+google-cloud-datastore==2.15.2
+google-cloud-ndb==2.1.1
+google-cloud-secret-manager==2.16.1
+googleapis-common-protos==1.59.0
+grpc-google-iam-v1==0.12.6
+grpcio==1.54.2
+grpcio-status==1.54.2
+httplib2==0.22.0
+idna==3.4
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.2
+proto-plus==1.22.2
+protobuf==4.23.0
+pyasn1==0.5.0
+pyasn1-modules==0.3.0
+pycparser==2.21
+pymemcache==4.0.0
+pyparsing==3.0.9
+python-dotenv==1.0.0
+pytz==2023.3
+redis==4.5.5
+requests==2.30.0
+rsa==4.9
+six==1.16.0
+uritemplate==4.1.1
+urllib3==1.26.15
+Werkzeug==2.3.4