From 921d9af46d3320142c627eff782cc52da8cd2f94 Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Fri, 15 Dec 2023 21:11:38 +0100 Subject: [PATCH 1/2] Remove `google_sign_in_dartio` --- app/macos/Runner.xcodeproj/project.pbxproj | 6 ++ app/macos/Runner/DebugProfile.entitlements | 4 + app/macos/Runner/Info.plist | 2 +- app/macos/Runner/Release.entitlements | 4 + app/pubspec.lock | 16 ---- .../lib/src/google/google_sign_in_logic.dart | 9 --- .../authentification_base/pubspec.lock | 80 ------------------- .../authentification_base/pubspec.yaml | 1 - .../authentification_qrcode/pubspec.lock | 80 ------------------- 9 files changed, 15 insertions(+), 187 deletions(-) diff --git a/app/macos/Runner.xcodeproj/project.pbxproj b/app/macos/Runner.xcodeproj/project.pbxproj index 60dfeea88..9315f2f1e 100644 --- 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 index 28709fc06..6e2b2b966 100644 --- a/app/macos/Runner/DebugProfile.entitlements +++ b/app/macos/Runner/DebugProfile.entitlements @@ -20,5 +20,9 @@ com.apple.security.network.server + keychain-access-groups + + $(AppIdentifierPrefix)com.google.GIDSignIn + diff --git a/app/macos/Runner/Info.plist b/app/macos/Runner/Info.plist index c588360a5..89a0ead5c 100644 --- a/app/macos/Runner/Info.plist +++ b/app/macos/Runner/Info.plist @@ -25,7 +25,7 @@ Editor CFBundleURLSchemes - com.googleusercontent.apps.730263787697-c31kujlb53ajmm7jvuu2042t2m0nv5at + $(GOOGLE_SIGN_IN_URL) diff --git a/app/macos/Runner/Release.entitlements b/app/macos/Runner/Release.entitlements index 599535e8e..44135816d 100644 --- a/app/macos/Runner/Release.entitlements +++ b/app/macos/Runner/Release.entitlements @@ -18,5 +18,9 @@ com.apple.security.network.server + keychain-access-groups + + $(AppIdentifierPrefix)com.google.GIDSignIn + diff --git a/app/pubspec.lock b/app/pubspec.lock index e5584e83f..6eec2a451 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1078,14 +1078,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.19" - google_sign_in_dartio: - dependency: transitive - description: - name: google_sign_in_dartio - sha256: f4a1f2217d9ae10b07a5423e073e6af318adc378b11e8074bd74d5665a9c39d9 - url: "https://pub.dev" - source: hosted - version: "0.3.0" google_sign_in_ios: dependency: transitive description: @@ -1170,14 +1162,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.15.4" - html_unescape: - dependency: transitive - description: - name: html_unescape - sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" - url: "https://pub.dev" - source: hosted - version: "2.0.0" http: dependency: "direct main" description: 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 index b9c311865..8d4178250 100644 --- 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 _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 index 3a706c9da..bf4fcef99 100644 --- a/lib/authentification/authentification_base/pubspec.lock +++ b/lib/authentification/authentification_base/pubspec.lock @@ -386,14 +386,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.18" - google_sign_in_dartio: - dependency: "direct main" - description: - name: google_sign_in_dartio - sha256: f4a1f2217d9ae10b07a5423e073e6af318adc378b11e8074bd74d5665a9c39d9 - url: "https://pub.dev" - source: hosted - version: "0.3.0" google_sign_in_ios: dependency: transitive description: @@ -418,14 +410,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.2+1" - html_unescape: - dependency: transitive - description: - name: html_unescape - sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" - url: "https://pub.dev" - source: hosted - version: "2.0.0" http: dependency: transitive description: @@ -769,70 +753,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - url_launcher: - dependency: transitive - description: - name: url_launcher - sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 - url: "https://pub.dev" - source: hosted - version: "6.2.2" - url_launcher_android: - dependency: transitive - description: - name: url_launcher_android - sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" - url: "https://pub.dev" - source: hosted - version: "6.2.0" - url_launcher_ios: - dependency: transitive - description: - name: url_launcher_ios - sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 - url: "https://pub.dev" - source: hosted - version: "6.2.1" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 - url: "https://pub.dev" - source: hosted - version: "3.1.1" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 - url: "https://pub.dev" - source: hosted - version: "3.1.0" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - url_launcher_web: - dependency: transitive - description: - name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" - url: "https://pub.dev" - source: hosted - version: "2.2.2" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 - url: "https://pub.dev" - source: hosted - version: "3.1.1" user: dependency: "direct main" description: diff --git a/lib/authentification/authentification_base/pubspec.yaml b/lib/authentification/authentification_base/pubspec.yaml index b1927a24e..da4b9a348 100644 --- a/lib/authentification/authentification_base/pubspec.yaml +++ b/lib/authentification/authentification_base/pubspec.yaml @@ -28,7 +28,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 index f493fd3cf..c25ec7307 100644 --- a/lib/authentification/authentification_qrcode/pubspec.lock +++ b/lib/authentification/authentification_qrcode/pubspec.lock @@ -425,14 +425,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.18" - google_sign_in_dartio: - dependency: transitive - description: - name: google_sign_in_dartio - sha256: f4a1f2217d9ae10b07a5423e073e6af318adc378b11e8074bd74d5665a9c39d9 - url: "https://pub.dev" - source: hosted - version: "0.3.0" google_sign_in_ios: dependency: transitive description: @@ -457,14 +449,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.2+1" - html_unescape: - dependency: transitive - description: - name: html_unescape - sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3" - url: "https://pub.dev" - source: hosted - version: "2.0.0" http: dependency: transitive description: @@ -832,70 +816,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - url_launcher: - dependency: transitive - description: - name: url_launcher - sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 - url: "https://pub.dev" - source: hosted - version: "6.2.2" - url_launcher_android: - dependency: transitive - description: - name: url_launcher_android - sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" - url: "https://pub.dev" - source: hosted - version: "6.2.0" - url_launcher_ios: - dependency: transitive - description: - name: url_launcher_ios - sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 - url: "https://pub.dev" - source: hosted - version: "6.2.1" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 - url: "https://pub.dev" - source: hosted - version: "3.1.1" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 - url: "https://pub.dev" - source: hosted - version: "3.1.0" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - url_launcher_web: - dependency: transitive - description: - name: url_launcher_web - sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" - url: "https://pub.dev" - source: hosted - version: "2.2.2" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 - url: "https://pub.dev" - source: hosted - version: "3.1.1" user: dependency: transitive description: From 304ad42f8ef05bfe039dead42f91f80e4feb3932 Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Mon, 25 Dec 2023 15:11:13 +0100 Subject: [PATCH 2/2] Pub get --- lib/authentification/authentification_base/pubspec.lock | 7 +++++++ lib/authentification/authentification_qrcode/pubspec.lock | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/authentification/authentification_base/pubspec.lock b/lib/authentification/authentification_base/pubspec.lock index bf4fcef99..9bc4855ed 100644 --- a/lib/authentification/authentification_base/pubspec.lock +++ b/lib/authentification/authentification_base/pubspec.lock @@ -410,6 +410,13 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.2+1" + helper_functions: + dependency: "direct main" + description: + path: "../../helper_functions" + relative: true + source: path + version: "0.0.1" http: dependency: transitive description: diff --git a/lib/authentification/authentification_qrcode/pubspec.lock b/lib/authentification/authentification_qrcode/pubspec.lock index c25ec7307..a86274b34 100644 --- a/lib/authentification/authentification_qrcode/pubspec.lock +++ b/lib/authentification/authentification_qrcode/pubspec.lock @@ -449,6 +449,13 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.2+1" + helper_functions: + dependency: transitive + description: + path: "../../helper_functions" + relative: true + source: path + version: "0.0.1" http: dependency: transitive description: