From f1a85a06f84c0b879d9fdcd52479fd8179504037 Mon Sep 17 00:00:00 2001 From: Salakar Date: Wed, 26 Sep 2018 08:02:59 +0100 Subject: [PATCH] [auth][ios][android] ActionCodeInfo now correctly has an `operation` property (incorrectly set to `actionType` formerly) - fixes #1423 --- .../firebase/auth/RNFirebaseAuth.java | 2 +- ios/RNFirebase/auth/RNFirebaseAuth.m | 2 +- src/index.d.ts | 82 ++++++++----------- src/modules/auth/types.js | 7 +- 4 files changed, 43 insertions(+), 50 deletions(-) diff --git a/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java b/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java index f6edd7ff..8099c647 100644 --- a/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java +++ b/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java @@ -1225,7 +1225,7 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule { break; } - writableMap.putString("actionType", actionType); + writableMap.putString("operation", actionType); promise.resolve(writableMap); } else { diff --git a/ios/RNFirebase/auth/RNFirebaseAuth.m b/ios/RNFirebase/auth/RNFirebaseAuth.m index dd30cb23..12144791 100644 --- a/ios/RNFirebase/auth/RNFirebaseAuth.m +++ b/ios/RNFirebase/auth/RNFirebaseAuth.m @@ -759,7 +759,7 @@ RCT_EXPORT_METHOD(checkActionCode: [data setValue:[NSNull null] forKey:@"fromEmail"]; } - NSDictionary *result = @{@"data": data, @"actionType": actionType}; + NSDictionary *result = @{@"data": data, @"operation": actionType}; resolve(result); } diff --git a/src/index.d.ts b/src/index.d.ts index a5a63f6a..359de163 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -18,40 +18,24 @@ declare module 'react-native-firebase' { // type AdmobModule = FirebaseModuleAndStatics; type AnalyticsModule = FirebaseModuleAndStatics; - type AuthModule = FirebaseModuleAndStatics< - RNFirebase.auth.Auth, - RNFirebase.auth.AuthStatics - >; + type AuthModule = FirebaseModuleAndStatics; type ConfigModule = FirebaseModuleAndStatics; - type CrashlyticsModule = FirebaseModuleAndStatics< - RNFirebase.crashlytics.Crashlytics - >; - type DatabaseModule = FirebaseModuleAndStatics< - RNFirebase.database.Database, - RNFirebase.database.DatabaseStatics - >; - type FirestoreModule = FirebaseModuleAndStatics< - RNFirebase.firestore.Firestore, - RNFirebase.firestore.FirestoreStatics - >; - type FunctionsModule = FirebaseModuleAndStatics< - RNFirebase.functions.Functions, - RNFirebase.functions.FunctionsStatics - >; + type CrashlyticsModule = FirebaseModuleAndStatics; + type DatabaseModule = FirebaseModuleAndStatics; + type FirestoreModule = FirebaseModuleAndStatics; + type FunctionsModule = FirebaseModuleAndStatics; type IidModule = FirebaseModuleAndStatics; // type InvitesModule = FirebaseModuleAndStatics; - type LinksModule = FirebaseModuleAndStatics< - RNFirebase.links.Links, - RNFirebase.links.LinksStatics - >; - type MessagingModule = FirebaseModuleAndStatics< - RNFirebase.messaging.Messaging, - RNFirebase.messaging.MessagingStatics - >; - type NotificationsModule = FirebaseModuleAndStatics< - RNFirebase.notifications.Notifications, - RNFirebase.notifications.NotificationsStatics - >; + type LinksModule = FirebaseModuleAndStatics; + type MessagingModule = FirebaseModuleAndStatics; + type NotificationsModule = FirebaseModuleAndStatics; type PerfModule = FirebaseModuleAndStatics; type StorageModule = FirebaseModuleAndStatics; // type UtilsModule: FirebaseModuleAndStatics; @@ -596,9 +580,11 @@ declare module 'react-native-firebase' { val(): any; } - interface ThenableReference extends Promise {} + interface ThenableReference extends Promise { + } - interface ThenableReference extends Reference {} + interface ThenableReference extends Reference { + } interface Reference extends database.Query { child(path: string): database.Reference; @@ -898,7 +884,7 @@ declare module 'react-native-firebase' { email?: string; fromEmail?: string; }; - operation: 'PASSWORD_RESET' | 'VERIFY_EMAIL' | 'RECOVER_EMAIL'; + operation: 'PASSWORD_RESET' | 'VERIFY_EMAIL' | 'RECOVER_EMAIL' | 'EMAIL_SIGNIN' | 'ERROR'; } interface ConfirmationResult { @@ -2751,7 +2737,7 @@ declare module 'react-native-firebase' { } declare module 'react-native-firebase/storage' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Storage = RNFirebase.storage.Storage; export type Reference = RNFirebase.storage.Reference; export type FullMetadata = RNFirebase.storage.FullMetadata; @@ -2764,7 +2750,7 @@ declare module 'react-native-firebase/storage' { } declare module 'react-native-firebase/database' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Database = RNFirebase.database.Database; export type RnReference = RNFirebase.database.RnReference; export type QueryEventType = RNFirebase.database.QueryEventType; @@ -2775,13 +2761,15 @@ declare module 'react-native-firebase/database' { export type Reference = RNFirebase.database.Reference; export type DatabaseStatics = RNFirebase.database.DatabaseStatics; - interface ThenableReference extends Promise {} + interface ThenableReference extends Promise { + } - interface ThenableReference extends RNFirebase.database.Reference {} + interface ThenableReference extends RNFirebase.database.Reference { + } } declare module 'react-native-firebase/auth' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type AuthResult = RNFirebase.auth.AuthResult; export type AuthProvider = RNFirebase.auth.AuthProvider; export type Auth = RNFirebase.auth.Auth; @@ -2789,18 +2777,18 @@ declare module 'react-native-firebase/auth' { } declare module 'react-native-firebase/messaging' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Messaging = RNFirebase.messaging.Messaging; export type RemoteMessage = RNFirebase.messaging.RemoteMessage; } declare module 'react-native-firebase/iid' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type InstanceId = RNFirebase.iid.InstanceId; } declare module 'react-native-firebase/notifications' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type AndroidNotifications = RNFirebase.notifications.AndroidNotifications; export type Notifications = RNFirebase.notifications.Notifications; export type Notification = RNFirebase.notifications.Notification; @@ -2812,18 +2800,18 @@ declare module 'react-native-firebase/notifications' { } declare module 'react-native-firebase/config' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type ConfigSnapshot = RNFirebase.config.ConfigSnapshot; export type Config = RNFirebase.config.Config; } declare module 'react-native-firebase/crashlytics' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Crashlytics = RNFirebase.crashlytics.Crashlytics; } declare module 'react-native-firebase/links' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Links = RNFirebase.links.Links; export type DynamicLink = RNFirebase.links.DynamicLink; export type AnalyticsParameters = RNFirebase.links.AnalyticsParameters; @@ -2835,7 +2823,7 @@ declare module 'react-native-firebase/links' { } declare module 'react-native-firebase/functions' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type HttpsErrorCode = RNFirebase.functions.HttpsErrorCode; export type FunctionsErrorCode = RNFirebase.functions.FunctionsErrorCode; export type HttpsCallableResult = RNFirebase.functions.HttpsCallableResult; @@ -2844,7 +2832,7 @@ declare module 'react-native-firebase/functions' { } declare module 'react-native-firebase/firestore' { - import { RNFirebase } from 'react-native-firebase'; + import {RNFirebase} from 'react-native-firebase'; export type Firestore = RNFirebase.firestore.Firestore; export type FirestoreStatics = RNFirebase.firestore.FirestoreStatics; export type CollectionReference = RNFirebase.firestore.CollectionReference; diff --git a/src/modules/auth/types.js b/src/modules/auth/types.js index 30f4776b..ca2976a9 100644 --- a/src/modules/auth/types.js +++ b/src/modules/auth/types.js @@ -19,7 +19,12 @@ export type ActionCodeInfo = { email?: string, fromEmail?: string, }, - operation: 'PASSWORD_RESET' | 'VERIFY_EMAIL' | 'RECOVER_EMAIL', + operation: + | 'PASSWORD_RESET' + | 'VERIFY_EMAIL' + | 'RECOVER_EMAIL' + | 'EMAIL_SIGNIN' + | 'ERROR', }; export type ActionCodeSettings = {