Remove google_sign_in_dartio (#1198)

The `google_sign_in` package supports since v6.2.0 Google Sign In for macOS (flutter/packages#5600). Therefore, the no need for the `google_sign_in_dartio` package anymore. Additionally, this PR adds Google Sign In for our dev environment (besides prod). Closes #1178
SharezoneApp · Dec 25, 2023 · bc3f187 · bc3f187
1 parent fee42b9
commit bc3f187
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 187 deletions.
diff --git a/app/macos/Runner.xcodeproj/project.pbxproj b/app/macos/Runner.xcodeproj/project.pbxproj
@@ -505,6 +505,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.366164701221-fdv476f10fl969nd65dv97tfajqb9jr1";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -584,6 +585,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.366164701221-fdv476f10fl969nd65dv97tfajqb9jr1";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -662,6 +664,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.366164701221-fdv476f10fl969nd65dv97tfajqb9jr1";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -740,6 +743,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.730263787697-r3ubdsbn4l752elbpnh6nu2tpiqq439p";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -872,6 +876,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.730263787697-r3ubdsbn4l752elbpnh6nu2tpiqq439p";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -897,6 +902,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = AJ3PMPVZ7H;
+				GOOGLE_SIGN_IN_URL = "com.googleusercontent.apps.730263787697-r3ubdsbn4l752elbpnh6nu2tpiqq439p";
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/app/macos/Runner/DebugProfile.entitlements b/app/macos/Runner/DebugProfile.entitlements
@@ -20,5 +20,9 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+        <string>$(AppIdentifierPrefix)com.google.GIDSignIn</string>
+    </array>
 </dict>
 </plist>
diff --git a/app/macos/Runner/Info.plist b/app/macos/Runner/Info.plist
@@ -25,7 +25,7 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.googleusercontent.apps.730263787697-c31kujlb53ajmm7jvuu2042t2m0nv5at</string>
+				<string>$(GOOGLE_SIGN_IN_URL)</string>
 			</array>
 		</dict>
 	</array>

diff --git a/app/macos/Runner/Release.entitlements b/app/macos/Runner/Release.entitlements
@@ -18,5 +18,9 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+        <string>$(AppIdentifierPrefix)com.google.GIDSignIn</string>
+    </array>
 </dict>
 </plist>
diff --git a/app/pubspec.lock b/app/pubspec.lock
diff --git a/lib/authentification/authentification_base/lib/src/google/google_sign_in_logic.dart b/lib/authentification/authentification_base/lib/src/google/google_sign_in_logic.dart
@@ -9,12 +9,7 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/foundation.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-import 'package:google_sign_in_dartio/google_sign_in_dartio.dart';
 import 'package:sharezone_common/api_errors.dart';
-import 'package:platform_check/platform_check.dart';
-
-const _desktopGoogleSignInClientID =
-    '730263787697-c31kujlb53ajmm7jvuu2042t2m0nv5at';
 
 class GoogleSignInLogic {
   final GoogleSignIn _googleSignIn;
@@ -28,10 +23,6 @@ class GoogleSignInLogic {
   }
 
   Future<AuthCredential> _getCredentials() async {
-    if (PlatformCheck.isDesktop) {
-      await GoogleSignInDart.register(clientId: _desktopGoogleSignInClientID);
-    }
-
     final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
     if (googleUser == null) throw NoGoogleSignAccountSelected();
 

diff --git a/lib/authentification/authentification_base/pubspec.lock b/lib/authentification/authentification_base/pubspec.lock
diff --git a/lib/authentification/authentification_base/pubspec.yaml b/lib/authentification/authentification_base/pubspec.yaml
@@ -30,7 +30,6 @@ dependencies:
   streaming_shared_preferences: ^2.0.0
   user:
     path: ../../user
-  google_sign_in_dartio: ^0.3.0
   cloud_firestore: ^4.8.5
   firebase_auth: ^4.7.3
   google_sign_in: ^6.1.6

diff --git a/lib/authentification/authentification_qrcode/pubspec.lock b/lib/authentification/authentification_qrcode/pubspec.lock