kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-01-12 09:23:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[auth][ios][android] ActionCodeInfo now correctly has an operation property (incorrectly set to actionType formerly) - fixes #1423

Browse Source
This commit is contained in:
Salakar
2018-09-26 08:02:59 +01:00
parent a8900ee7cf
commit f1a85a06f8
4 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java
View File

@@ -1225,7 +1225,7 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
break;
}
writableMap.putString("actionType", actionType);
writableMap.putString("operation", actionType);
promise.resolve(writableMap);
} else {

2
ios/RNFirebase/auth/RNFirebaseAuth.m
View File

@@ -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);
}

60
src/index.d.ts vendored
View File

@@ -18,40 +18,24 @@ declare module 'react-native-firebase' {
// type AdmobModule = FirebaseModuleAndStatics<RNFirebase.admob.AdMob>;
type AnalyticsModule = FirebaseModuleAndStatics<RNFirebase.Analytics>;
type AuthModule = FirebaseModuleAndStatics<
RNFirebase.auth.Auth,
RNFirebase.auth.AuthStatics
>;
type AuthModule = FirebaseModuleAndStatics<RNFirebase.auth.Auth,
RNFirebase.auth.AuthStatics>;
type ConfigModule = FirebaseModuleAndStatics<RNFirebase.config.Config>;
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<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 IidModule = FirebaseModuleAndStatics<RNFirebase.iid.InstanceId>;
// type InvitesModule = FirebaseModuleAndStatics<RNFirebase.invites.Invites>;
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<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 PerfModule = FirebaseModuleAndStatics<RNFirebase.perf.Perf>;
type StorageModule = FirebaseModuleAndStatics<RNFirebase.storage.Storage>;
// type UtilsModule: FirebaseModuleAndStatics<RNFirebase.utils.Utils>;
@@ -596,9 +580,11 @@ declare module 'react-native-firebase' {
val(): any;
}
interface ThenableReference<T> extends Promise<T> {}
interface ThenableReference<T> extends Promise<T> {
}
interface ThenableReference<T> extends Reference {}
interface ThenableReference<T> 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 {
@@ -2775,9 +2761,11 @@ declare module 'react-native-firebase/database' {
export type Reference = RNFirebase.database.Reference;
export type DatabaseStatics = RNFirebase.database.DatabaseStatics;
interface ThenableReference<T> extends Promise<T> {}
interface ThenableReference<T> extends Promise<T> {
}
interface ThenableReference<T> extends RNFirebase.database.Reference {}
interface ThenableReference<T> extends RNFirebase.database.Reference {
}
}
declare module 'react-native-firebase/auth' {

7
src/modules/auth/types.js
View File

@@ -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 = {