Merge branch 'login-bug' into 'main'

Login bug

See merge request walljm/dynamicbible!29

src/android/app/google-services.json

@@ -22,6 +22,14 @@
             "certificate_hash": "61703efe57998735ca5d22fec522d099cea1e83c"
           }
         },
+        {
+          "client_id": "200739882604-h8r8otm9rlfseul40hd69k0jl6pf8g4h.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "walljm.dynamicbible",
+            "certificate_hash": "18dd331a0946bc10b985e31d1882b398ae9fd0d1"
+          }
+        },
         {
           "client_id": "200739882604-vl9sdm2o394c9v8dlnt6j41ng99bfdc4.apps.googleusercontent.com",
           "client_type": 1,

src/android/app/src/main/assets/capacitor.config.json

@@ -12,7 +12,7 @@
 				"profile",
 				"email"
 			],
-			"serverClientId": "200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com",
+			"clientId": "200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com",
 			"forceCodeForRefreshToken": true
 		}
 	},

src/android/app/src/main/res/values/strings.xml

@@ -4,5 +4,4 @@
     <string name="title_activity_main">Dynamic Bible</string>
     <string name="package_name">walljm.dynamicbible</string>
     <string name="custom_url_scheme">walljm.dynamicbible</string>
-    <string name="server_client_id">200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com</string>
 </resources>

src/capacitor.config.json

@@ -9,7 +9,7 @@
     },
     "GoogleAuth": {
       "scopes": ["profile", "email"],
-      "serverClientId": "200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com",
+      "clientId": "200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com",
       "forceCodeForRefreshToken": true
     }
   },

src/ios/App/DynamicBible.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:App.xcodeproj">
-   </FileRef>
-</Workspace>

src/ios/App/Podfile.lock

@@ -49,6 +49,6 @@ SPEC CHECKSUMS:
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
 
-PODFILE CHECKSUM: b6d853cb950b649c4b027ee971ff363e5a963452
+PODFILE CHECKSUM: ef7e0fa555a35bc098cb53d9f170d080cea276c2
 
 COCOAPODS: 1.15.2