temporary disable link registration, methods rename, undo prettify in lib/firebase.js
This commit is contained in:
Omer Levy
parent
5728fa76bc
commit
d4a1304bea
|
|
@ -33,8 +33,8 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
|
||||
public RNFirebaseLinks(ReactApplicationContext reactContext) {
|
||||
super(reactContext);
|
||||
getReactApplicationContext().addActivityEventListener(this);
|
||||
registerLinksHandler();
|
||||
//getReactApplicationContext().addActivityEventListener(this);
|
||||
//registerLinksHandler();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -93,13 +93,12 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
try {
|
||||
Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(parameters);
|
||||
|
||||
DynamicLink.Builder builder = setDynamicLinkBuilderFromMap(m);
|
||||
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) {
|
||||
} catch (Exception ex) {
|
||||
Log.e(TAG, "create dynamic link failure " + ex.getMessage());
|
||||
promise.reject("links/failure", ex.getMessage(), ex);
|
||||
}
|
||||
|
|
@ -110,7 +109,7 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
try {
|
||||
Map<String, Object> m = Utils.recursivelyDeconstructReadableMap(parameters);
|
||||
|
||||
DynamicLink.Builder builder = setDynamicLinkBuilderFromMap(m);
|
||||
DynamicLink.Builder builder = getDynamicLinkBuilderFromMap(m);
|
||||
|
||||
Task<ShortDynamicLink> shortLinkTask = getShortDynamicLinkTask(builder, m)
|
||||
.addOnCompleteListener(new OnCompleteListener<ShortDynamicLink>() {
|
||||
|
|
@ -121,13 +120,12 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
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());
|
||||
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);
|
||||
}
|
||||
|
|
@ -137,17 +135,16 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
Map<String, Object> suffixParameters = (Map<String, Object>) m.get("suffix");
|
||||
if (suffixParameters != null) {
|
||||
String option = (String) suffixParameters.get("option");
|
||||
if (option.equals("SHORT")) {
|
||||
if ("SHORT".equals(option)) {
|
||||
return builder.buildShortDynamicLink(ShortDynamicLink.Suffix.SHORT);
|
||||
}
|
||||
else if (option.equals("UNGUESSABLE")) {
|
||||
} else if ("UNGUESSABLE".equals(option)) {
|
||||
return builder.buildShortDynamicLink(ShortDynamicLink.Suffix.UNGUESSABLE);
|
||||
}
|
||||
}
|
||||
return builder.buildShortDynamicLink();
|
||||
}
|
||||
|
||||
private DynamicLink.Builder setDynamicLinkBuilderFromMap(final Map<String, Object> m) {
|
||||
private DynamicLink.Builder getDynamicLinkBuilderFromMap(final Map<String, Object> m) {
|
||||
DynamicLink.Builder parametersBuilder = FirebaseDynamicLinks.getInstance().createDynamicLink();
|
||||
|
||||
try {
|
||||
|
|
@ -156,9 +153,7 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
|
||||
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());
|
||||
|
|
@ -212,19 +207,6 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
}
|
||||
}
|
||||
|
||||
// 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) {
|
||||
|
|
@ -243,56 +225,4 @@ public class RNFirebaseLinks extends ReactContextBaseJavaModule implements Activ
|
|||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
RCT_EXPORT_MODULE();
|
||||
|
||||
RCT_EXPORT_METHOD(createDynamicLink: (NSDictionary *) metadata resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
|
||||
FIRDynamicLinkComponents *components = [self setDynamicLinkBuilderFromMap:metadata];
|
||||
FIRDynamicLinkComponents *components = [self getDynamicLinkComponentsFromMetadata:metadata];
|
||||
|
||||
if (components == nil) {
|
||||
reject(@"links/failure", @"error", nil);
|
||||
|
|
@ -19,7 +19,7 @@ RCT_EXPORT_METHOD(createDynamicLink: (NSDictionary *) metadata resolver:(RCTProm
|
|||
}
|
||||
|
||||
RCT_EXPORT_METHOD(createShortDynamicLink: (NSDictionary *) metadata resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
|
||||
FIRDynamicLinkComponents *components = [self setDynamicLinkBuilderFromMap:metadata];
|
||||
FIRDynamicLinkComponents *components = [self getDynamicLinkComponentsFromMetadata:metadata];
|
||||
|
||||
[components shortenWithCompletion:^(NSURL *_Nullable shortURL,
|
||||
NSArray *_Nullable warnings,
|
||||
|
|
@ -35,7 +35,7 @@ RCT_EXPORT_METHOD(createShortDynamicLink: (NSDictionary *) metadata resolver:(RC
|
|||
}
|
||||
|
||||
|
||||
- (FIRDynamicLinkComponents *)setDynamicLinkBuilderFromMap:(NSDictionary *)metadata {
|
||||
- (FIRDynamicLinkComponents *)getDynamicLinkComponentsFromMetadata:(NSDictionary *)metadata {
|
||||
NSURL *link = [NSURL URLWithString:metadata[@"link"]];
|
||||
FIRDynamicLinkComponents *components =
|
||||
[FIRDynamicLinkComponents componentsWithLink:link domain:metadata[@"dynamicLinkDomain"]];
|
||||
|
|
|
|||
179
lib/firebase.js
179
lib/firebase.js
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue