From 2da532d2213c5145aa64061872abfa5a565e3dca Mon Sep 17 00:00:00 2001
From: Justin Hernandez <justin.hernandez@self.xyz>
Date: Thu, 5 Jun 2025 00:09:17 -0500
Subject: [PATCH] SEL-346: fix android cloud backup (#589)

* setup google web client id

* update env sample

* setup new env

* remove old keystore

* new debug keystore

* update podfile lock
---
 app/android/app/debug.keystore      | Bin 2257 -> 2794 bytes
 app/env.sample                      |   5 ++++-
 app/ios/Podfile.lock                |  21 ++++++++++++++-------
 app/src/utils/cloudBackup/google.ts |   3 +++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/android/app/debug.keystore b/app/android/app/debug.keystore
index 364e105ed39fbfd62001429a68140672b06ec0de..343e2f76d8b31313314fd54c756410a16afc0271 100644
GIT binary patch
literal 2794
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
VZio+sAWnh=WSQs2BL6R<{sk_73K0MR

literal 2257
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
EA81kH<^TWy

diff --git a/app/env.sample b/app/env.sample
index 7409c0a1a..d4d8d78d6 100644
--- a/app/env.sample
+++ b/app/env.sample
@@ -1,3 +1,6 @@
+ENABLE_DEBUG_LOGS=
+GOOGLE_SIGNIN_WEB_CLIENT_ID=
+IS_TEST_BUILD=
+MIXPANEL_NFC_PROJECT_TOKEN=
 SEGMENT_KEY=
 SENTRY_DSN=
-IS_TEST_BUILD=
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 7d245abb0..6e4edb64d 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -159,12 +159,16 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
+  - Mixpanel-swift (5.0.0):
+    - Mixpanel-swift/Complete (= 5.0.0)
+  - Mixpanel-swift/Complete (5.0.0)
   - nanopb (2.30910.0):
     - nanopb/decode (= 2.30910.0)
     - nanopb/encode (= 2.30910.0)
   - nanopb/decode (2.30910.0)
   - nanopb/encode (2.30910.0)
   - NFCPassportReader (2.1.1):
+    - Mixpanel-swift (~> 5.0.0)
     - OpenSSL-Universal (= 1.1.1900)
   - OpenSSL-Universal (1.1.1900)
   - PromisesObjC (2.4.0)
@@ -1832,7 +1836,8 @@ DEPENDENCIES:
   - GoogleUtilities
   - lottie-ios
   - lottie-react-native (from `../../node_modules/lottie-react-native`)
-  - NFCPassportReader (from `https://github.com/zk-passport/NFCPassportReader`, commit `e3e869b14fb7fb2417928079db3967f203523580`)
+  - Mixpanel-swift (~> 5.0.0)
+  - NFCPassportReader (from `https://github.com/seshanthS/NFCPassportReader`, commit `d365b2366d87a1cbe6d16c249ff709d63f6b6f61`)
   - QKMRZScanner
   - RCT-Folly (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1935,6 +1940,7 @@ SPEC REPOS:
     - GTMAppAuth
     - GTMSessionFetcher
     - lottie-ios
+    - Mixpanel-swift
     - nanopb
     - OpenSSL-Universal
     - PromisesObjC
@@ -1959,8 +1965,8 @@ EXTERNAL SOURCES:
   lottie-react-native:
     :path: "../../node_modules/lottie-react-native"
   NFCPassportReader:
-    :commit: e3e869b14fb7fb2417928079db3967f203523580
-    :git: https://github.com/zk-passport/NFCPassportReader
+    :commit: d365b2366d87a1cbe6d16c249ff709d63f6b6f61
+    :git: https://github.com/seshanthS/NFCPassportReader
   RCT-Folly:
     :podspec: "../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTDeprecation:
@@ -2122,8 +2128,8 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   NFCPassportReader:
-    :commit: e3e869b14fb7fb2417928079db3967f203523580
-    :git: https://github.com/zk-passport/NFCPassportReader
+    :commit: d365b2366d87a1cbe6d16c249ff709d63f6b6f61
+    :git: https://github.com/seshanthS/NFCPassportReader
   SwiftQRScanner:
     :commit: fddcabcb431cd6110cea0394660082661dbafa7e
     :git: https://github.com/vinodiOS/SwiftQRScanner
@@ -2150,8 +2156,9 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   lottie-ios: a881093fab623c467d3bce374367755c272bdd59
   lottie-react-native: 3ffec00c889acded6057766c99adf8eaced7790c
+  Mixpanel-swift: e9bef28a9648faff384d5ba6f48ecc2787eb24c0
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
-  NFCPassportReader: e931c61c189e08a4b4afa0ed4014af19eab2f129
+  NFCPassportReader: 48873f856f91215dbfa1eaaec20eae639672862e
   OpenSSL-Universal: 84efb8a29841f2764ac5403e0c4119a28b713346
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   QKMRZParser: 6b419b6f07d6bff6b50429b97de10846dc902c29
@@ -2240,6 +2247,6 @@ SPEC CHECKSUMS:
   SwiftyTesseract: 1f3d96668ae92dc2208d9842c8a59bea9fad2cbb
   Yoga: b05994d1933f507b0a28ceaa4fdb968dc18da178
 
-PODFILE CHECKSUM: 2b4d221f59ee4daed11d52338f4dd84d2081bcc6
+PODFILE CHECKSUM: 2aeaac8e39fecbe94c8068edf25b014650520069
 
 COCOAPODS: 1.16.2
diff --git a/app/src/utils/cloudBackup/google.ts b/app/src/utils/cloudBackup/google.ts
index 4d7e58324..81fb90a57 100644
--- a/app/src/utils/cloudBackup/google.ts
+++ b/app/src/utils/cloudBackup/google.ts
@@ -1,3 +1,4 @@
+import { GOOGLE_SIGNIN_WEB_CLIENT_ID } from '@env';
 import {
   GoogleSignin,
   isErrorWithCode,
@@ -6,6 +7,8 @@ import {
 
 GoogleSignin.configure({
   scopes: ['https://www.googleapis.com/auth/drive.appdata'],
+  webClientId: GOOGLE_SIGNIN_WEB_CLIENT_ID,
+  offlineAccess: true,
 });
 
 export async function googleSignIn() {