Tweaks due to Issue GoogleCloudPlatform#1100 (GoogleCloudPlatform#1899)

engelke · web-flow · commit 93c3656c5198 · 2018-12-06T13:25:12.000-08:00
* Tweaks to Issue GoogleCloudPlatform#1100 * Updated to current Firebase
diff --git a/appengine/standard/firebase/firenotes/backend/app.yaml b/appengine/standard/firebase/firenotes/backend/app.yaml
@@ -10,3 +10,4 @@ handlers:
 env_variables:
   # Replace with your Firebase project ID.
   FIREBASE_PROJECT_ID: '<PROJECT_ID>'
+  GAE_USE_SOCKETS_HTTPLIB : 'true'
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
+Flask==0.12.4
 pyjwt==1.6.4
 flask-cors==3.0.7
 google-auth==1.6.1
diff --git a/appengine/standard/firebase/firenotes/frontend/index.html b/appengine/standard/firebase/firenotes/frontend/index.html
@@ -7,11 +7,10 @@
 <html>
 <head>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/3.2.1/firebase.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/3.1.0/firebase-app.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/3.1.0/firebase-auth.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.js"></script>
-  <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.css">
+  <script src="https://www.gstatic.com/firebasejs/5.6.0/firebase-app.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/5.6.0/firebase-auth.js"></script>
+  <script src="https://cdn.firebase.com/libs/firebaseui/3.4.1/firebaseui.js"></script>
+  <link type="text/css" rel="stylesheet" href="https://cdn.firebase.com/libs/firebaseui/3.4.1/firebaseui.css">
   <link rel="stylesheet" type="text/css" href="style.css">
   <script src="/main.js"></script>
   <title>Firenotes</title>
diff --git a/appengine/standard/firebase/firenotes/frontend/main.js b/appengine/standard/firebase/firenotes/frontend/main.js
@@ -50,7 +50,7 @@ $(function(){
         personal welcome message. Otherwise, use the user's email. */
         var welcomeName = name ? name : user.email;
 
-        user.getToken().then(function(idToken) {
+        user.getIdToken().then(function(idToken) {
           userIdToken = idToken;
 
           /* Now that the user is authenicated, fetch the notes. */

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Flask==1.0.2`
	`1`	`+Flask==0.12.4`
`2`	`2`	`pyjwt==1.6.4`
`3`	`3`	`flask-cors==3.0.7`
`4`	`4`	`google-auth==1.6.1`