From 3a4c7ce09777f4524b13ed1d41380dd66ef536c3 Mon Sep 17 00:00:00 2001 From: Ldoppea Date: Thu, 14 Sep 2023 11:52:16 +0200 Subject: [PATCH 1/2] feat: Remove appinvite service declaration from google-services We don't use appinvite service so there is no need to have it in the declaration file Also this would reduce file complexity because, when exported from Firebase console, android config file can contain appinvite for wrong ios project now that we have multiple project (cozy, mabulle etc) --- android/app/src/dev/google-services.json | 12 +----------- android/app/src/prod/google-services.json | 12 +----------- .../cozy/android/app/src/dev/google-services.json | 12 +----------- .../cozy/android/app/src/prod/google-services.json | 12 +----------- .../mabulle/android/app/src/dev/google-services.json | 12 +----------- .../android/app/src/prod/google-services.json | 12 +----------- 6 files changed, 6 insertions(+), 66 deletions(-) diff --git a/android/app/src/dev/google-services.json b/android/app/src/dev/google-services.json index 331986e96..519c51f5e 100644 --- a/android/app/src/dev/google-services.json +++ b/android/app/src/dev/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyClgjlflp--SRsu6u0-r_GbZAueNqCtvEQ" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "761843577340-hm8np6faes10qh07u9g2ga1bf4vaer6h.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" diff --git a/android/app/src/prod/google-services.json b/android/app/src/prod/google-services.json index 5c9d91ff1..f9d0e6533 100644 --- a/android/app/src/prod/google-services.json +++ b/android/app/src/prod/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyBnwMivfVMpmgBTeDqgeznYW52k8ddy3yo" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "69589465874-vgk2mu3b9q2k9nqmo3nm8t5s1l89iur7.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" diff --git a/white_label/brands/cozy/android/app/src/dev/google-services.json b/white_label/brands/cozy/android/app/src/dev/google-services.json index 331986e96..519c51f5e 100644 --- a/white_label/brands/cozy/android/app/src/dev/google-services.json +++ b/white_label/brands/cozy/android/app/src/dev/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyClgjlflp--SRsu6u0-r_GbZAueNqCtvEQ" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "761843577340-hm8np6faes10qh07u9g2ga1bf4vaer6h.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" diff --git a/white_label/brands/cozy/android/app/src/prod/google-services.json b/white_label/brands/cozy/android/app/src/prod/google-services.json index 5c9d91ff1..f9d0e6533 100644 --- a/white_label/brands/cozy/android/app/src/prod/google-services.json +++ b/white_label/brands/cozy/android/app/src/prod/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyBnwMivfVMpmgBTeDqgeznYW52k8ddy3yo" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "69589465874-vgk2mu3b9q2k9nqmo3nm8t5s1l89iur7.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" diff --git a/white_label/brands/mabulle/android/app/src/dev/google-services.json b/white_label/brands/mabulle/android/app/src/dev/google-services.json index e37aaa31c..d21ae801b 100644 --- a/white_label/brands/mabulle/android/app/src/dev/google-services.json +++ b/white_label/brands/mabulle/android/app/src/dev/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyClgjlflp--SRsu6u0-r_GbZAueNqCtvEQ" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "761843577340-hm8np6faes10qh07u9g2ga1bf4vaer6h.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" diff --git a/white_label/brands/mabulle/android/app/src/prod/google-services.json b/white_label/brands/mabulle/android/app/src/prod/google-services.json index 01fb0a791..19b2adf83 100644 --- a/white_label/brands/mabulle/android/app/src/prod/google-services.json +++ b/white_label/brands/mabulle/android/app/src/prod/google-services.json @@ -22,17 +22,7 @@ { "current_key": "AIzaSyBnwMivfVMpmgBTeDqgeznYW52k8ddy3yo" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "69589465874-vgk2mu3b9q2k9nqmo3nm8t5s1l89iur7.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } + ] } ], "configuration_version": "1" From 308ccf4f4239d8a27b789e1b555c25a9978bd49d Mon Sep 17 00:00:00 2001 From: Ldoppea Date: Thu, 14 Sep 2023 11:54:45 +0200 Subject: [PATCH 2/2] feat: Set final google service configuration for MaBulle For unknown reason, iOS `plist` does not contain any CLIENT_ID when exporting MaBulle configuration from firebase console This seems not to be used so let's keep it as is --- .../brands/mabulle/android/app/src/dev/google-services.json | 2 +- .../mabulle/android/app/src/prod/google-services.json | 2 +- white_label/brands/mabulle/ios/Dev/GoogleService-Info.plist | 6 +----- .../brands/mabulle/ios/Prod/GoogleService-Info.plist | 6 +----- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/white_label/brands/mabulle/android/app/src/dev/google-services.json b/white_label/brands/mabulle/android/app/src/dev/google-services.json index d21ae801b..849a6f7de 100644 --- a/white_label/brands/mabulle/android/app/src/dev/google-services.json +++ b/white_label/brands/mabulle/android/app/src/dev/google-services.json @@ -7,7 +7,7 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:761843577340:android:ec1c61aa097e0eeac8c279", + "mobilesdk_app_id": "1:761843577340:android:75d759499a99816dc8c279", "android_client_info": { "package_name": "io.cozy.flagship.mobile.mabulle" } diff --git a/white_label/brands/mabulle/android/app/src/prod/google-services.json b/white_label/brands/mabulle/android/app/src/prod/google-services.json index 19b2adf83..5f4adae4e 100644 --- a/white_label/brands/mabulle/android/app/src/prod/google-services.json +++ b/white_label/brands/mabulle/android/app/src/prod/google-services.json @@ -7,7 +7,7 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:69589465874:android:6723756bf1524edc7c91cb", + "mobilesdk_app_id": "1:69589465874:android:1ee487cfc4fb99467c91cb", "android_client_info": { "package_name": "io.cozy.flagship.mobile.mabulle" } diff --git a/white_label/brands/mabulle/ios/Dev/GoogleService-Info.plist b/white_label/brands/mabulle/ios/Dev/GoogleService-Info.plist index a978dc658..7de9a5001 100644 --- a/white_label/brands/mabulle/ios/Dev/GoogleService-Info.plist +++ b/white_label/brands/mabulle/ios/Dev/GoogleService-Info.plist @@ -2,10 +2,6 @@ - CLIENT_ID - 761843577340-acal9b6vbnsrlk6t74vebb07uo8sms7t.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.761843577340-acal9b6vbnsrlk6t74vebb07uo8sms7t API_KEY AIzaSyCmgnkRkAccVd0F2GIhrgcLBUKpdMC8EDw GCM_SENDER_ID @@ -29,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:761843577340:ios:6f7644543f2cdf50c8c279 + 1:761843577340:ios:9e612a4aadb27225c8c279 diff --git a/white_label/brands/mabulle/ios/Prod/GoogleService-Info.plist b/white_label/brands/mabulle/ios/Prod/GoogleService-Info.plist index 5d5fc3788..2ffc0340c 100644 --- a/white_label/brands/mabulle/ios/Prod/GoogleService-Info.plist +++ b/white_label/brands/mabulle/ios/Prod/GoogleService-Info.plist @@ -2,10 +2,6 @@ - CLIENT_ID - 69589465874-g8lbe8lbua69cslqau62hpo1q9krjuf5.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.69589465874-g8lbe8lbua69cslqau62hpo1q9krjuf5 API_KEY AIzaSyBzWAIoT0_E0Ayj_54566JwWr2l4W6KUHE GCM_SENDER_ID @@ -29,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:69589465874:ios:260c4d525cdcbbb97c91cb + 1:69589465874:ios:5d3558c61b4b06297c91cb