Fix Google login

Freegle · Jul 27, 2019 · ffd632f · ffd632f
1 parent ab8adcf
commit ffd632f
Show file tree

Hide file tree

Showing 5 changed files with 1,015 additions and 297 deletions.
diff --git a/dev/webpack.appfd.config.js b/dev/webpack.appfd.config.js
@@ -37,8 +37,8 @@ module.exports = new Config().extend({
         return config;
     }
   }).merge({
-  //mode: 'development',
-  mode: 'production',
+  mode: 'development',
+  //mode: 'production',
   // CC devtool: 'source-map',
   entry: [join(ROOT, 'client/appfd.js')],
   module: {
@@ -73,7 +73,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/user_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('1.4.16, 18 July 2019'),
+      APP_VERSION: JSON.stringify('1.4.17, 27 July 2019'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),

diff --git a/http/js/iznik/google.js b/http/js/iznik/google.js
@@ -126,6 +126,7 @@ define([
                     console.log("Google error:" + msg, { typ: 1 })
                 }
             );
+            console.log("Google after call")
         },
 
         noop: function (authResult) {

diff --git a/mobile/freegle/android/config.xml b/mobile/freegle/android/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="544" id="org.ilovefreegle.direct" version="1.4.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="544" id="org.ilovefreegle.direct" version="1.4.17" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Freegle</name>
     <description>Offer and request free items on your local Freegle reuse group</description>
     <author />
@@ -68,13 +68,13 @@
     </platform>
     <plugin name="cordova-plugin-camera" spec="^4.0.3" />
     <hook src="scripts/before_build.sh" type="before_build" />
-    <plugin name="phonegap-plugin-push" spec="https://github.com/phonegap/phonegap-plugin-push.git">
-        <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="17.0.+" />
+    <plugin name="cordova-plugin-geolocation" spec="^4.0.1" />
+    <plugin name="cordova-plugin-googleplus" spec="^8.0.0">
+        <variable name="PLAY_SERVICES_VERSION" value="15.0.1" />
     </plugin>
-    <plugin name="cordova-plugin-googleplus" spec="https://github.com/EddyVerbruggen/cordova-plugin-googleplus">
-        <variable name="PLAY_SERVICES_VERSION" value="11.8.0" />
+    <plugin name="phonegap-plugin-push" spec="^2.2.3">
+        <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
+        <variable name="FCM_VERSION" value="15.0.1" />
     </plugin>
-    <plugin name="cordova-plugin-geolocation" spec="^4.0.1" />
     <engine name="android" spec="^8.0.0" />
 </widget>
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,6 +126,7 @@ define([ @@
                         console.log("Google error:" + msg, { typ: 1 })
                     }
                 );
+                console.log("Google after call")
             },
             noop: function (authResult) {
@@ Expand Down @@