From 02dace666317b51dc72062d7a061e27243d0a34d Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:07:45 -0500 Subject: [PATCH 1/9] use firebase oauth config --- android/app/google-services.json | 68 +++++++++++++++++++++++++++++++- js/apis/GoogleAuth.js | 4 +- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/android/app/google-services.json b/android/app/google-services.json index 6697f3b..86ddf1c 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1 +1,67 @@ -{"web":{"client_id":"648700523612-lm35m5d7m7k0sdutqmatbfhq2qsnd5if.apps.googleusercontent.com","project_id":"august-copilot-171122","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"U44sJzIyL0yCreGpJ1v1saNZ"}} \ No newline at end of file +{ + "project_info": { + "project_number": "648700523612", + "firebase_url": "https://august-copilot-171122.firebaseio.com", + "project_id": "august-copilot-171122", + "storage_bucket": "august-copilot-171122.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:648700523612:android:6a01cf0d8c4bf5fc", + "android_client_info": { + "package_name": "com.aretherecookies" + } + }, + "oauth_client": [ + { + "client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "648700523612-ej283bdvao87ra2c7sis40ofm00q0n86.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "648700523612-lm35m5d7m7k0sdutqmatbfhq2qsnd5if.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.aretherecookies", + "certificate_hash": "2d8bb3695a1f451c938dd3a137578bbd8cd98b3f" + } + }, + { + "client_id": "648700523612-jbif6e356rc13pbcmrmc7gk212eelgcp.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBTyMv-J2YB8GT9DkSPiPOC7F1VS2KGY1o" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/js/apis/GoogleAuth.js b/js/apis/GoogleAuth.js index 7923077..38403dd 100644 --- a/js/apis/GoogleAuth.js +++ b/js/apis/GoogleAuth.js @@ -9,6 +9,8 @@ export type GoogleUser = { }; export const authGoogle = async () => { - await GoogleSignin.configure(); + await GoogleSignin.configure({ + // webClientId: 'AIzaSyCSAnDCcLMXiMpANIQWE2VbaMc8Zlzohzs', + }); return GoogleSignin.signIn(); }; From 4998ae0ccd34c053219f6de4a58c9ffbbbf8ffe9 Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:08:03 -0500 Subject: [PATCH 2/9] versionCode 13 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c9c2f58..dbb3f26 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,7 +91,7 @@ android { applicationId "com.aretherecookies" minSdkVersion 16 targetSdkVersion 22 - versionCode 12 + versionCode 13 versionName "1.0" ndk { abiFilters "armeabi-v7a", "x86" From c95f9b9893109fa525d6f420d5013b3625220b15 Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:25:14 -0500 Subject: [PATCH 3/9] add webClientId to good signin config --- js/apis/GoogleAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/apis/GoogleAuth.js b/js/apis/GoogleAuth.js index 38403dd..2346407 100644 --- a/js/apis/GoogleAuth.js +++ b/js/apis/GoogleAuth.js @@ -10,7 +10,7 @@ export type GoogleUser = { export const authGoogle = async () => { await GoogleSignin.configure({ - // webClientId: 'AIzaSyCSAnDCcLMXiMpANIQWE2VbaMc8Zlzohzs', + webClientId: '648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com', }); return GoogleSignin.signIn(); }; From 5af20ba834f204b0ddf0bce53ca4d8cd7fe8d1f2 Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:25:28 -0500 Subject: [PATCH 4/9] versionCode 15 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index dbb3f26..a2bd66a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,7 +91,7 @@ android { applicationId "com.aretherecookies" minSdkVersion 16 targetSdkVersion 22 - versionCode 13 + versionCode 15 versionName "1.0" ndk { abiFilters "armeabi-v7a", "x86" From c55171403fd330f080394d9f6857bf33c43c4b57 Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:41:50 -0500 Subject: [PATCH 5/9] use release keystore for debug builds --- android/app/build.gradle | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a2bd66a..0130db3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,21 +106,11 @@ android { } } signingConfigs { - debug { - if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) { - storeFile file(MYAPP_RELEASE_STORE_FILE) - storePassword MYAPP_RELEASE_STORE_PASSWORD - keyAlias MYAPP_RELEASE_KEY_ALIAS - keyPassword MYAPP_RELEASE_KEY_PASSWORD - } - } release { - if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) { - storeFile file(MYAPP_RELEASE_STORE_FILE) - storePassword MYAPP_RELEASE_STORE_PASSWORD - keyAlias MYAPP_RELEASE_KEY_ALIAS - keyPassword MYAPP_RELEASE_KEY_PASSWORD - } + storeFile file(MYAPP_RELEASE_STORE_FILE) + storePassword MYAPP_RELEASE_STORE_PASSWORD + keyAlias MYAPP_RELEASE_KEY_ALIAS + keyPassword MYAPP_RELEASE_KEY_PASSWORD } } buildTypes { @@ -129,6 +119,9 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" signingConfig signingConfigs.release } + debug { + signingConfig signingConfigs.release + } } // applicationVariants are e.g. debug, release applicationVariants.all { variant -> From cb26c282163ef8b9dd9f943a9e23c668f0796f5e Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 10:42:11 -0500 Subject: [PATCH 6/9] versionCode 16 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0130db3..564f3c6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,7 +91,7 @@ android { applicationId "com.aretherecookies" minSdkVersion 16 targetSdkVersion 22 - versionCode 15 + versionCode 16 versionName "1.0" ndk { abiFilters "armeabi-v7a", "x86" From f37e919284bbdd7056d2b9cb1df39cde5d6d1b2a Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 11:45:15 -0500 Subject: [PATCH 7/9] use the android client key for google signin --- js/apis/GoogleAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/apis/GoogleAuth.js b/js/apis/GoogleAuth.js index 2346407..ce80cf1 100644 --- a/js/apis/GoogleAuth.js +++ b/js/apis/GoogleAuth.js @@ -10,7 +10,7 @@ export type GoogleUser = { export const authGoogle = async () => { await GoogleSignin.configure({ - webClientId: '648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com', + webClientId: '648700523612-812quqm392fiio9s671pi5c7mmol7bas.apps.googleusercontent.com', }); return GoogleSignin.signIn(); }; From 02384f3f0ef305231112c02a23f08bde0e241d50 Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 11:50:45 -0500 Subject: [PATCH 8/9] revert to web client token --- js/apis/GoogleAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/apis/GoogleAuth.js b/js/apis/GoogleAuth.js index ce80cf1..2346407 100644 --- a/js/apis/GoogleAuth.js +++ b/js/apis/GoogleAuth.js @@ -10,7 +10,7 @@ export type GoogleUser = { export const authGoogle = async () => { await GoogleSignin.configure({ - webClientId: '648700523612-812quqm392fiio9s671pi5c7mmol7bas.apps.googleusercontent.com', + webClientId: '648700523612-5p6rpumnhcjr4635hnsg4d7cg88ue3te.apps.googleusercontent.com', }); return GoogleSignin.signIn(); }; From ba68da3d48ba5e8d10cae333e9b5f6ecf575432b Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 27 May 2018 11:50:52 -0500 Subject: [PATCH 9/9] versionCode 18 --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 564f3c6..21ebd4d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,7 +91,7 @@ android { applicationId "com.aretherecookies" minSdkVersion 16 targetSdkVersion 22 - versionCode 16 + versionCode 18 versionName "1.0" ndk { abiFilters "armeabi-v7a", "x86"