Merge branch 'omer_links' of github.com:rmrs/react-native-firebase into omer_links

This commit is contained in:
Omer Levy 2017-09-26 09:54:46 -04:00
commit 17558162fc
2 changed files with 152 additions and 223 deletions

View File

@ -9,6 +9,7 @@ import android.util.Log;
import java.util.Map;
import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
@ -27,14 +28,14 @@ import com.google.android.gms.tasks.OnFailureListener;
import io.invertase.firebase.Utils;
public class RNFirebaseLinks extends ReactContextBaseJavaModule implements ActivityEventListener {
public class RNFirebaseLinks extends ReactContextBaseJavaModule implements ActivityEventListener ,LifecycleEventListener {
private final static String TAG = RNFirebaseLinks.class.getCanonicalName();
private String initialLink = null;
public RNFirebaseLinks(ReactApplicationContext reactContext) {
super(reactContext);
getReactApplicationContext().addActivityEventListener(this);
registerLinksHandler();
getReactApplicationContext().addLifecycleEventListener(this);
}
@Override
@ -52,7 +53,6 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
if (activity == null) {
return;
}
FirebaseDynamicLinks.getInstance()
.getDynamicLink(activity.getIntent())
.addOnSuccessListener(activity, new OnSuccessListener<PendingDynamicLinkData>() {
@ -62,10 +62,10 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
if (pendingDynamicLinkData != null) {
Uri deepLinkUri = pendingDynamicLinkData.getLink();
String deepLink = deepLinkUri.toString();
// TODO: Validate that this is called when opening from a deep link
if (initialLink == null) {
initialLink = deepLink;
}
Log.d(TAG, "sending a dynamic_link_received event!");
Utils.sendEvent(getReactApplicationContext(), "dynamic_link_received", deepLink);
}
}
@ -84,20 +84,32 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
}
@Override
public void onNewIntent(Intent intent) {
// TODO: Do I need to re-register the links handler for each new intent?
public void onNewIntent(Intent intent) {}
@Override
public void onHostResume() {
registerLinksHandler();
}
@Override
public void onHostPause() {}
@Override
public void onHostDestroy() {
initialLink = null;
}
@ReactMethod
public void createDynamicLink(final ReadableMap parameters, final Promise promise) {
try {
DynamicLink.Builder builder = setDynamicLinkBuilderFromMap(parameters);
Uri link = builder.buildDynamicLink().getUri();
try {
Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(parameters);
Log.d(TAG, "created dynamic link: " + link.toString());
promise.resolve(link.toString());
}
catch(Exception ex) {
DynamicLink.Builder builder = getDynamicLinkBuilderFromMap(m);
Uri link = builder.buildDynamicLink().getUri();
Log.d(TAG, "created dynamic link: " + link.toString());
promise.resolve(link.toString());
} catch (Exception ex) {
Log.e(TAG, "create dynamic link failure " + ex.getMessage());
promise.reject("links/failure", ex.getMessage(), ex);
}
@ -105,49 +117,54 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
@ReactMethod
public void createShortDynamicLink(final ReadableMap parameters, final Promise promise) {
try {
DynamicLink.Builder builder = setDynamicLinkBuilderFromMap(parameters);
Task<ShortDynamicLink> shortLinkTask = builder.buildShortDynamicLink()
.addOnCompleteListener(new OnCompleteListener<ShortDynamicLink>() {
@Override
public void onComplete(@NonNull Task<ShortDynamicLink> task) {
if (task.isSuccessful()) {
Uri shortLink = task.getResult().getShortLink();
Log.d(TAG, "created short dynamic link: " + shortLink.toString());
promise.resolve(shortLink.toString());
} else {
Log.e(TAG, "create shot dynamic link failure " + task.getException().getMessage());
promise.reject("links/failure", task.getException().getMessage(), task.getException());
}
try {
Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(parameters);
DynamicLink.Builder builder = getDynamicLinkBuilderFromMap(m);
Task<ShortDynamicLink> shortLinkTask = getShortDynamicLinkTask(builder, m)
.addOnCompleteListener(new OnCompleteListener<ShortDynamicLink>() {
@Override
public void onComplete(@NonNull Task<ShortDynamicLink> task) {
if (task.isSuccessful()) {
Uri shortLink = task.getResult().getShortLink();
Log.d(TAG, "created short dynamic link: " + shortLink.toString());
promise.resolve(shortLink.toString());
} else {
Log.e(TAG, "create short dynamic link failure " + task.getException().getMessage());
promise.reject("links/failure", task.getException().getMessage(), task.getException());
}
});
}
catch(Exception ex) {
}
});
} catch (Exception ex) {
Log.e(TAG, "create short dynamic link failure " + ex.getMessage());
promise.reject("links/failure", ex.getMessage(), ex);
}
}
/**
* Converts a RN ReadableMap into a set DynamicLink.Builder instance
*
* @param parameters
* @return
*/
private DynamicLink.Builder setDynamicLinkBuilderFromMap(ReadableMap parameters) {
private Task<ShortDynamicLink> getShortDynamicLinkTask(final DynamicLink.Builder builder, final Map<String, Object> m) {
Map<String, Object> suffixParameters = (Map<String, Object>) m.get("suffix");
if (suffixParameters != null) {
String option = (String) suffixParameters.get("option");
if ("SHORT".equals(option)) {
return builder.buildShortDynamicLink(ShortDynamicLink.Suffix.SHORT);
} else if ("UNGUESSABLE".equals(option)) {
return builder.buildShortDynamicLink(ShortDynamicLink.Suffix.UNGUESSABLE);
}
}
return builder.buildShortDynamicLink();
}
private DynamicLink.Builder getDynamicLinkBuilderFromMap(final Map<String, Object> m) {
DynamicLink.Builder parametersBuilder = FirebaseDynamicLinks.getInstance().createDynamicLink();
try {
Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(parameters);
parametersBuilder.setLink(Uri.parse((String)m.get("link")));
parametersBuilder.setDynamicLinkDomain((String)m.get("dynamicLinkDomain"));
parametersBuilder.setLink(Uri.parse((String) m.get("link")));
parametersBuilder.setDynamicLinkDomain((String) m.get("dynamicLinkDomain"));
setAndroidParameters(m, parametersBuilder);
setIosParameters(m, parametersBuilder);
//setNavigationInfoParameters(m, parametersBuilder);
setSocialMetaTagParameters(m, parametersBuilder);
setAnalyticsParameters(m, parametersBuilder);
} catch (Exception e) {
Log.e(TAG, "error while building parameters " + e.getMessage());
@ -161,14 +178,14 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
if (androidParameters != null) {
DynamicLink.AndroidParameters.Builder androidParametersBuilder =
androidParameters.containsKey("androidPackageName") ?
new DynamicLink.AndroidParameters.Builder((String)androidParameters.get("androidPackageName")) :
new DynamicLink.AndroidParameters.Builder();
new DynamicLink.AndroidParameters.Builder((String) androidParameters.get("androidPackageName")) :
new DynamicLink.AndroidParameters.Builder();
if (androidParameters.containsKey("androidFallbackLink")) {
androidParametersBuilder.setFallbackUrl(Uri.parse((String)androidParameters.get("androidFallbackLink")));
androidParametersBuilder.setFallbackUrl(Uri.parse((String) androidParameters.get("androidFallbackLink")));
}
if (androidParameters.containsKey("androidMinPackageVersionCode")) {
androidParametersBuilder.setMinimumVersion(((Double)androidParameters.get("androidMinPackageVersionCode")).intValue());
androidParametersBuilder.setMinimumVersion(((Double) androidParameters.get("androidMinPackageVersionCode")).intValue());
}
parametersBuilder.setAndroidParameters(androidParametersBuilder.build());
}
@ -178,42 +195,29 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
Map<String, Object> iosParameters = (Map<String, Object>) m.get("iosInfo");
//TODO: see what happens if bundleId is missing
if (iosParameters != null && iosParameters.containsKey("iosBundleId")) {
DynamicLink.IosParameters.Builder iosParametersBuilder = new DynamicLink.IosParameters.Builder((String)iosParameters.get("iosBundleId"));
DynamicLink.IosParameters.Builder iosParametersBuilder = new DynamicLink.IosParameters.Builder((String) iosParameters.get("iosBundleId"));
if (iosParameters.containsKey("iosAppStoreId")) {
iosParametersBuilder.setAppStoreId((String)iosParameters.get("iosAppStoreId"));
iosParametersBuilder.setAppStoreId((String) iosParameters.get("iosAppStoreId"));
}
if (iosParameters.containsKey("iosCustomScheme")) {
iosParametersBuilder.setCustomScheme((String)iosParameters.get("iosCustomScheme"));
iosParametersBuilder.setCustomScheme((String) iosParameters.get("iosCustomScheme"));
}
if (iosParameters.containsKey("iosFallbackLink")) {
iosParametersBuilder.setFallbackUrl(Uri.parse((String)iosParameters.get("iosFallbackLink")));
iosParametersBuilder.setFallbackUrl(Uri.parse((String) iosParameters.get("iosFallbackLink")));
}
if (iosParameters.containsKey("iosIpadBundleId")) {
iosParametersBuilder.setIpadBundleId((String)iosParameters.get("iosIpadBundleId"));
iosParametersBuilder.setIpadBundleId((String) iosParameters.get("iosIpadBundleId"));
}
if (iosParameters.containsKey("iosIpadFallbackLink")) {
iosParametersBuilder.setIpadFallbackUrl(Uri.parse((String)iosParameters.get("iosIpadFallbackLink")));
iosParametersBuilder.setIpadFallbackUrl(Uri.parse((String) iosParameters.get("iosIpadFallbackLink")));
}
if (iosParameters.containsKey("iosMinPackageVersionCode")) {
iosParametersBuilder.setMinimumVersion((String)iosParameters.get("iosMinPackageVersionCode"));
iosParametersBuilder.setMinimumVersion((String) iosParameters.get("iosMinPackageVersionCode"));
}
parametersBuilder.setIosParameters(iosParametersBuilder.build());
}
}
// private void setNavigationInfoParameters(final Map<String, Object> m, final DynamicLink.Builder parametersBuilder) {
// Map<String, Object> navigationInfoParameters = (Map<String, Object>) m.get("navigationInfo");
// if (navigationInfoParameters != null) {
// DynamicLink.NavigationInfoParameters.Builder navigationInfoParametersBuilder =
// new DynamicLink.NavigationInfoParameters.Builder();
//
// if (navigationInfoParameters.containsKey("enableForcedRedirect")) {
// navigationInfoParametersBuilder.setForcedRedirectEnabled((boolean)navigationInfoParameters.get("enableForcedRedirect"));
// }
// parametersBuilder.setNavigationInfoParameters(navigationInfoParametersBuilder.build());
// }
// }
private void setSocialMetaTagParameters(final Map<String, Object> m, final DynamicLink.Builder parametersBuilder) {
Map<String, Object> socialMetaTagParameters = (Map<String, Object>) m.get("socialMetaTagInfo");
if (socialMetaTagParameters != null) {
@ -221,67 +225,15 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
new DynamicLink.SocialMetaTagParameters.Builder();
if (socialMetaTagParameters.containsKey("socialDescription")) {
socialMetaTagParametersBuilder.setDescription((String)socialMetaTagParameters.get("socialDescription"));
socialMetaTagParametersBuilder.setDescription((String) socialMetaTagParameters.get("socialDescription"));
}
if (socialMetaTagParameters.containsKey("socialImageLink")) {
socialMetaTagParametersBuilder.setImageUrl(Uri.parse((String)socialMetaTagParameters.get("socialImageLink")));
socialMetaTagParametersBuilder.setImageUrl(Uri.parse((String) socialMetaTagParameters.get("socialImageLink")));
}
if (socialMetaTagParameters.containsKey("socialTitle")) {
socialMetaTagParametersBuilder.setTitle((String)socialMetaTagParameters.get("socialTitle"));
socialMetaTagParametersBuilder.setTitle((String) socialMetaTagParameters.get("socialTitle"));
}
parametersBuilder.setSocialMetaTagParameters(socialMetaTagParametersBuilder.build());
}
}
private void setAnalyticsParameters (final Map<String, Object> m, final DynamicLink.Builder parametersBuilder) {
Map<String, Object> analyticsParameters = (Map<String, Object>) m.get("analyticsInfo");
if (analyticsParameters != null) {
setGoogleAnalyticsParameters(analyticsParameters, parametersBuilder);
setItunesConnectAnalyticsParameters(analyticsParameters, parametersBuilder);
}
}
private void setGoogleAnalyticsParameters(final Map<String, Object> m, final DynamicLink.Builder parametersBuilder) {
Map<String, Object> googleAnalyticsParameters = (Map<String, Object>) m.get("googlePlayAnalytics");
if (googleAnalyticsParameters != null) {
DynamicLink.GoogleAnalyticsParameters.Builder googleAnalyticsParametersBuilder =
new DynamicLink.GoogleAnalyticsParameters.Builder();
if (googleAnalyticsParameters.containsKey("utmCampaign")) {
googleAnalyticsParametersBuilder.setCampaign((String)googleAnalyticsParameters.get("utmCampaign"));
}
if (googleAnalyticsParameters.containsKey("utmContent")) {
googleAnalyticsParametersBuilder.setContent((String)googleAnalyticsParameters.get("utmContent"));
}
if (googleAnalyticsParameters.containsKey("utmMedium")) {
googleAnalyticsParametersBuilder.setMedium((String)googleAnalyticsParameters.get("utmMedium"));
}
if (googleAnalyticsParameters.containsKey("utmSource")) {
googleAnalyticsParametersBuilder.setSource((String)googleAnalyticsParameters.get("utmSource"));
}
if (googleAnalyticsParameters.containsKey("utmTerm")) {
googleAnalyticsParametersBuilder.setTerm((String)googleAnalyticsParameters.get("utmTerm"));
}
parametersBuilder.setGoogleAnalyticsParameters(googleAnalyticsParametersBuilder.build());
}
}
private void setItunesConnectAnalyticsParameters(final Map<String, Object> m, final DynamicLink.Builder parametersBuilder) {
Map<String, Object> itunesConnectAnalyticsParameters = (Map<String, Object>) m.get("itunesConnectAnalytics");
if (itunesConnectAnalyticsParameters != null) {
DynamicLink.ItunesConnectAnalyticsParameters.Builder itunesConnectAnalyticsParametersBuilder =
new DynamicLink.ItunesConnectAnalyticsParameters.Builder();
if (itunesConnectAnalyticsParameters.containsKey("at")) {
itunesConnectAnalyticsParametersBuilder.setAffiliateToken((String)itunesConnectAnalyticsParameters.get("at"));
}
if (itunesConnectAnalyticsParameters.containsKey("ct")) {
itunesConnectAnalyticsParametersBuilder.setCampaignToken((String)itunesConnectAnalyticsParameters.get("ct"));
}
if (itunesConnectAnalyticsParameters.containsKey("pt")) {
itunesConnectAnalyticsParametersBuilder.setProviderToken((String)itunesConnectAnalyticsParameters.get("pt"));
}
parametersBuilder.setItunesConnectAnalyticsParameters(itunesConnectAnalyticsParametersBuilder.build());
}
}
}

View File

@ -2,121 +2,106 @@
* @providesModule Firebase
* @flow
*/
import { NativeModules } from 'react-native'
import { NativeModules } from 'react-native';
import Log from './utils/log'
import { isObject } from './utils'
import Log from './utils/log';
import { isObject } from './utils';
// modules
import Auth, { statics as AuthStatics } from './modules/auth'
import Storage, { statics as StorageStatics } from './modules/storage'
import Database, { statics as DatabaseStatics } from './modules/database'
import Messaging, { statics as MessagingStatics } from './modules/messaging'
import Analytics from './modules/analytics'
import Crash from './modules/crash'
import RemoteConfig from './modules/config'
import Performance from './modules/perf'
import AdMob, { statics as AdMobStatics } from './modules/admob'
import Links, { statics as LinksStatics } from './modules/links'
import Auth, { statics as AuthStatics } from './modules/auth';
import Storage, { statics as StorageStatics } from './modules/storage';
import Database, { statics as DatabaseStatics } from './modules/database';
import Messaging, { statics as MessagingStatics } from './modules/messaging';
import Analytics from './modules/analytics';
import Crash from './modules/crash';
import RemoteConfig from './modules/config';
import Performance from './modules/perf';
import AdMob, { statics as AdMobStatics } from './modules/admob';
import Links, { statics as LinksStatics } from './modules/links';
const instances: Object = { default: null }
const FirebaseModule = NativeModules.RNFirebase
const instances: Object = { default: null };
const FirebaseModule = NativeModules.RNFirebase;
/**
* @class Firebase
*/
export default class Firebase {
_log: ?Object
_auth: ?Object
_store: ?Object
_storage: ?Object
_database: ?Object
_presence: ?Object
_analytics: ?Object
_constants: ?Object
_messaging: ?Object
_config: ?Object
_crash: ?Object
_perf: ?Object
_admob: ?Object
_links: ?Object
_log: ?Object;
_auth: ?Object;
_store: ?Object;
_storage: ?Object;
_database: ?Object;
_presence: ?Object;
_analytics: ?Object;
_constants: ?Object;
_messaging: ?Object;
_config: ?Object;
_crash: ?Object;
_perf: ?Object;
_admob: ?Object;
_links: ?Object;
auth: Function
crash: Function
storage: Function
database: Function
analytics: Function
messaging: Function
config: Function
perf: Function
admob: Function
links: Function
auth: Function;
crash: Function;
storage: Function;
database: Function;
analytics: Function;
messaging: Function;
config: Function;
perf: Function;
admob: Function;
links: Function;
eventHandlers: Object
debug: boolean
eventHandlers: Object;
debug: boolean;
options: {
errorOnMissingPlayServices: boolean,
debug?: boolean,
persistence?: boolean,
}
persistence?: boolean
};
/**
*
* @param options
*/
constructor(options: Object = {}) {
this.eventHandlers = {}
this.debug = options.debug || false
this.options = Object.assign(
{ errorOnMissingPlayServices: true, promptOnMissingPlayServices: true },
options
)
this.eventHandlers = {};
this.debug = options.debug || false;
this.options = Object.assign({ errorOnMissingPlayServices: true, promptOnMissingPlayServices: true }, options);
if (this.debug) {
Log.enable(this.debug)
Log.enable(this.debug);
}
this._log = new Log('firebase')
this._log = new Log('firebase');
if (!this.googleApiAvailability.isAvailable) {
if (
this.options.promptOnMissingPlayServices &&
this.googleApiAvailability.isUserResolvableError
) {
FirebaseModule.promptPlayServices()
if (this.options.promptOnMissingPlayServices && this.googleApiAvailability.isUserResolvableError) {
FirebaseModule.promptPlayServices();
} else {
const error = `Google Play Services is required to run this application but no valid installation was found (Code ${this
.googleApiAvailability.status}).`
const error = `Google Play Services is required to run this application but no valid installation was found (Code ${this.googleApiAvailability.status}).`;
if (this.options.errorOnMissingPlayServices) {
throw new Error(error)
throw new Error(error);
} else {
console.warn(error)
console.warn(error);
}
}
}
this.auth = this._staticsOrInstance('auth', AuthStatics, Auth)
this.storage = this._staticsOrInstance('storage', StorageStatics, Storage)
this.database = this._staticsOrInstance(
'database',
DatabaseStatics,
Database
)
this.messaging = this._staticsOrInstance(
'messaging',
MessagingStatics,
Messaging
)
this.analytics = this._staticsOrInstance('analytics', {}, Analytics)
this.crash = this._staticsOrInstance('crash', {}, Crash)
this.config = this._staticsOrInstance('config', {}, RemoteConfig)
this.perf = this._staticsOrInstance('perf', {}, Performance)
this.admob = this._staticsOrInstance('admob', AdMobStatics, AdMob)
this.links = this._staticsOrInstance('links', LinksStatics, Links)
this.auth = this._staticsOrInstance('auth', AuthStatics, Auth);
this.storage = this._staticsOrInstance('storage', StorageStatics, Storage);
this.database = this._staticsOrInstance('database', DatabaseStatics, Database);
this.messaging = this._staticsOrInstance('messaging', MessagingStatics, Messaging);
this.analytics = this._staticsOrInstance('analytics', {}, Analytics);
this.crash = this._staticsOrInstance('crash', {}, Crash);
this.config = this._staticsOrInstance('config', {}, RemoteConfig);
this.perf = this._staticsOrInstance('perf', {}, Performance);
this.admob = this._staticsOrInstance('admob', AdMobStatics, AdMob);
this.links = this._staticsOrInstance('links', LinksStatics, Links);
// init auth to start listeners
if (NativeModules.RNFirebaseAuth) {
this.auth()
this.auth();
}
}
@ -128,29 +113,23 @@ export default class Firebase {
*/
static initializeApp(options: Object = {}, name: string = 'default') {
if (!isObject(options)) {
throw new Error(
'Firebase.initializeApp(options <- requires a configuration object'
)
throw new Error('Firebase.initializeApp(options <- requires a configuration object');
}
if (typeof name !== 'string') {
throw new Error(
'Firebase.initializeApp(options, name <- requires a string value'
)
throw new Error('Firebase.initializeApp(options, name <- requires a string value');
}
if (name !== 'default') {
throw new Error(
'RNFirebase currently only supports one instance of firebase - the default one.'
)
throw new Error('RNFirebase currently only supports one instance of firebase - the default one.');
}
if (!instances[name]) instances[name] = new Firebase(options)
return instances[name]
if (!instances[name]) instances[name] = new Firebase(options);
return instances[name];
}
get apps(): Array<string> {
return Object.keys(instances)
return Object.keys(instances);
}
/**
@ -159,16 +138,14 @@ export default class Firebase {
*/
get googleApiAvailability(): GoogleApiAvailabilityType {
// if not available then return a fake object for ios - saves doing platform specific logic.
return (
FirebaseModule.googleApiAvailability || { isAvailable: true, status: 0 }
)
return FirebaseModule.googleApiAvailability || { isAvailable: true, status: 0 };
}
/**
* Logger
*/
get log(): Log {
return this._log
return this._log;
}
/**
@ -181,19 +158,19 @@ export default class Firebase {
*/
_staticsOrInstance(name, statics, InstanceClass): Function {
const getInstance = () => {
const internalPropName = `_${name}`
const internalPropName = `_${name}`;
// $FlowFixMe
if (!this[internalPropName]) {
// $FlowFixMe
this[internalPropName] = new InstanceClass(this)
this[internalPropName] = new InstanceClass(this);
}
// $FlowFixMe
return this[internalPropName]
}
return this[internalPropName];
};
Object.assign(getInstance, statics || {})
return getInstance
Object.assign(getInstance, statics || {});
return getInstance;
}
}