Skip to content

Remove google_sign_in_dartio #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilsreichardt merged 3 commits into from
Dec 25, 2023
Merged

Remove google_sign_in_dartio #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
921d9af
Remove `google_sign_in_dartio`
nilsreichardt Dec 15, 2023
4481205
Merge remote-tracking branch 'origin/main' into remove-google-sign-da…
nilsreichardt Dec 25, 2023
304ad42
Pub get
nilsreichardt Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand Down Expand Up @@ -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)",
Expand All @@ -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)",
Expand Down
4 changes: 4 additions & 0 deletions app/macos/Runner/DebugProfile.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion app/macos/Runner/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions app/macos/Runner/Release.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 0 additions & 16 deletions app/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions lib/authentification/authentification_base/lib/src/google/google_sign_in_logic.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand Down
80 changes: 0 additions & 80 deletions lib/authentification/authentification_base/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/authentification/authentification_base/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
80 changes: 0 additions & 80 deletions lib/authentification/authentification_qrcode/pubspec.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.