Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Changes for Google sign in

This commit is contained in:
Hillel Coren 2021-08-10 09:20:32 +03:00
parent 05fc8caf64
commit cde74e702d
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle.dev
View File

@ -38,7 +38,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.invoiceninja.app" applicationId "com.invoiceninja.app"
minSdkVersion 18 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName

3
android/app/build.gradle.prod
View File

@ -23,6 +23,7 @@ if (flutterVersionName == null) {
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
def keystorePropertiesFile = rootProject.file("key.properties") def keystorePropertiesFile = rootProject.file("key.properties")
@ -42,7 +43,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.invoiceninja.app" applicationId "com.invoiceninja.app"
minSdkVersion 18 minSdkVersion 19
targetSdkVersion 29 targetSdkVersion 29
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName

10
lib/utils/oauth.dart
View File

@ -24,7 +24,10 @@ class GoogleOAuth {
if (account != null) { if (account != null) {
account.authentication.then((GoogleSignInAuthentication value) { account.authentication.then((GoogleSignInAuthentication value) {
callback(value.idToken, value.accessToken); callback(
value.idToken ?? '',
value.accessToken ?? '',
);
}); });
return true; return true;
@ -38,7 +41,10 @@ class GoogleOAuth {
final account = await _googleSignIn.signIn(); final account = await _googleSignIn.signIn();
if (account != null) { if (account != null) {
account.authentication.then((GoogleSignInAuthentication value) { account.authentication.then((GoogleSignInAuthentication value) {
callback(value.idToken, value.accessToken); callback(
value.idToken ?? '',
value.accessToken ?? '',
);
}); });
return true; return true;

1
pubspec.foss.yaml
View File

@ -64,7 +64,6 @@ dependencies:
# quick_actions: ^0.2.1 # quick_actions: ^0.2.1
# idb_shim: ^1.11.1+1 # idb_shim: ^1.11.1+1
# firebase_auth: 0.15.2 #https://github.com/FirebaseExtended/flutterfire/issues/2433#issuecomment-622438185
# google_sign_in: ^5.0.7 # google_sign_in: ^5.0.7
# contacts_service: ^0.6.1 # contacts_service: ^0.6.1

1
pubspec.yaml
View File

@ -64,7 +64,6 @@ dependencies:
# quick_actions: ^0.2.1 # quick_actions: ^0.2.1
# idb_shim: ^1.11.1+1 # idb_shim: ^1.11.1+1
# firebase_auth: 0.15.2 #https://github.com/FirebaseExtended/flutterfire/issues/2433#issuecomment-622438185
google_sign_in: ^5.0.7 google_sign_in: ^5.0.7
contacts_service: ^0.6.1 contacts_service: ^0.6.1