From f7c48e61f274f303289bb39b667a0a64625d27d6 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Fri, 3 May 2024 12:03:11 +0300 Subject: [PATCH] 5/3/2 --- android/app/google-services.json | 45 ++++++++++++++++++++++++++++- android/build.gradle | 3 ++ firebase.json | 18 +----------- ios/Runner/GoogleService-Info.plist | 34 ---------------------- lib/firebase_options.dart | 35 +++++++--------------- 5 files changed, 59 insertions(+), 76 deletions(-) delete mode 100644 ios/Runner/GoogleService-Info.plist diff --git a/android/app/google-services.json b/android/app/google-services.json index f19436f..3ded064 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -14,7 +14,7 @@ }, "oauth_client": [ { - "client_id": "594687661098-2hfb9gumub3j60vb7mqtq794k8spihuh.apps.googleusercontent.com", + "client_id": "594687661098-2u640akrb3k7sak5t0nqki6f4v6hq1bq.apps.googleusercontent.com", "client_type": 3 } ], @@ -29,6 +29,49 @@ { "client_id": "594687661098-2hfb9gumub3j60vb7mqtq794k8spihuh.apps.googleusercontent.com", "client_type": 3 + }, + { + "client_id": "594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.mobileapp.store.ride" + } + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:594687661098:android:46557bd4f534b5bb595f53", + "android_client_info": { + "package_name": "com.sefer_driver" + } + }, + "oauth_client": [ + { + "client_id": "594687661098-2u640akrb3k7sak5t0nqki6f4v6hq1bq.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCyfwRXTwSTLOFQSQgN5p7QZgGJVZnEKq0" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "594687661098-2hfb9gumub3j60vb7mqtq794k8spihuh.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.mobileapp.store.ride" + } } ] } diff --git a/android/build.gradle b/android/build.gradle index e909018..216e3bd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,6 +6,9 @@ buildscript { } dependencies { + // START: FlutterFire Configuration + classpath 'com.google.gms:google-services:4.3.15' + // END: FlutterFire Configuration classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/firebase.json b/firebase.json index 2d031e0..dd162f6 100644 --- a/firebase.json +++ b/firebase.json @@ -1,17 +1 @@ -{ - "functions": [ - { - "source": "functions", - "codebase": "default", - "ignore": [ - "node_modules", - ".git", - "firebase-debug.log", - "firebase-debug.*.log" - ], - "predeploy": [ - "npm --prefix \"$RESOURCE_DIR\" run lint" - ] - } - ] -} +{"functions":[{"source":"functions","codebase":"default","ignore":["node_modules",".git","firebase-debug.log","firebase-debug.*.log"],"predeploy":["npm --prefix \"$RESOURCE_DIR\" run lint"]}],"flutter":{"platforms":{"android":{"default":{"projectId":"ride-b1bd8","appId":"1:594687661098:android:683982cbf71fa423595f53","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"ride-b1bd8","configurations":{"android":"1:594687661098:android:683982cbf71fa423595f53","ios":"1:594687661098:ios:6f69eee1449be943595f53"}}}}}} \ No newline at end of file diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist deleted file mode 100644 index 1e79c35..0000000 --- a/ios/Runner/GoogleService-Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CLIENT_ID - 594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.594687661098-8e26699cris2k3nj5msj1osi59it9kpf - API_KEY - AIzaSyCf2mW2h0HD8ZYjwh4VOa2ladw6MJkCDTM - GCM_SENDER_ID - 594687661098 - PLIST_VERSION - 1 - BUNDLE_ID - com.mobileapp.store.ride - PROJECT_ID - ride-b1bd8 - STORAGE_BUCKET - ride-b1bd8.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:594687661098:ios:6f69eee1449be943595f53 - - \ No newline at end of file diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart index 812d8f9..eb64b6f 100644 --- a/lib/firebase_options.dart +++ b/lib/firebase_options.dart @@ -1,5 +1,5 @@ // File generated by FlutterFire CLI. -// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members +// ignore_for_file: type=lint import 'package:firebase_core/firebase_core.dart' show FirebaseOptions; import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform; @@ -17,7 +17,10 @@ import 'package:flutter/foundation.dart' class DefaultFirebaseOptions { static FirebaseOptions get currentPlatform { if (kIsWeb) { - return web; + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for web - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); } switch (defaultTargetPlatform) { case TargetPlatform.android: @@ -25,7 +28,10 @@ class DefaultFirebaseOptions { case TargetPlatform.iOS: return ios; case TargetPlatform.macOS: - return macos; + throw UnsupportedError( + 'DefaultFirebaseOptions have not been configured for macos - ' + 'you can reconfigure this by running the FlutterFire CLI again.', + ); case TargetPlatform.windows: throw UnsupportedError( 'DefaultFirebaseOptions have not been configured for windows - ' @@ -43,16 +49,6 @@ class DefaultFirebaseOptions { } } - static const FirebaseOptions web = FirebaseOptions( - apiKey: 'AIzaSyAVtyV7YVMeLbwA1UlNPxV9FhCzT0kjeAE', - appId: '1:594687661098:web:8fe3c5b3cacb294c595f53', - messagingSenderId: '594687661098', - projectId: 'ride-b1bd8', - authDomain: 'ride-b1bd8.firebaseapp.com', - storageBucket: 'ride-b1bd8.appspot.com', - measurementId: 'G-7YCWM2EHD9', - ); - static const FirebaseOptions android = FirebaseOptions( apiKey: 'AIzaSyCyfwRXTwSTLOFQSQgN5p7QZgGJVZnEKq0', appId: '1:594687661098:android:683982cbf71fa423595f53', @@ -67,17 +63,8 @@ class DefaultFirebaseOptions { messagingSenderId: '594687661098', projectId: 'ride-b1bd8', storageBucket: 'ride-b1bd8.appspot.com', - iosClientId: '594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com', + iosClientId: + '594687661098-8e26699cris2k3nj5msj1osi59it9kpf.apps.googleusercontent.com', iosBundleId: 'com.mobileapp.store.ride', ); - - static const FirebaseOptions macos = FirebaseOptions( - apiKey: 'AIzaSyCf2mW2h0HD8ZYjwh4VOa2ladw6MJkCDTM', - appId: '1:594687661098:ios:e8ca02ed508d4737595f53', - messagingSenderId: '594687661098', - projectId: 'ride-b1bd8', - storageBucket: 'ride-b1bd8.appspot.com', - iosClientId: '594687661098-od4d3lpsdba79shpjmala0a3lrps4spi.apps.googleusercontent.com', - iosBundleId: 'com.mobileapp.store.ride.RunnerTests', - ); }