Merge branch 'feature/notification-deeplinking' into 'master'

Feature/notification deeplinking

Closes #73

See merge request !208

__tests__/actions/__snapshots__/deepLinking.spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`deeplinking actions should create an action to notify of a new deeplink 1`] = `
+exports[`deeplinking actions should create an action to notify of a new deeplink that should leave the app 1`] = `
 Object {
   "payload": Object {
+    "stayInApp": false,
+    "url": "http://example.org",
+  },
+  "type": "DEEPLINKING_DEEPLINK",
+}
+`;
+
+exports[`deeplinking actions should create an action to notify of a new deeplink that should stay in the app 1`] = `
+Object {
+  "payload": Object {
+    "stayInApp": true,
     "url": "http://example.org",
   },
   "type": "DEEPLINKING_DEEPLINK",

__tests__/actions/deepLinking.spec.js

@@ -5,7 +5,11 @@ describe('deeplinking actions', () => {
     expect(actions.DEEPLINK).toEqual('DEEPLINKING_DEEPLINK');
   });
 
-  it('should create an action to notify of a new deeplink', () => {
+  it('should create an action to notify of a new deeplink that should stay in the app', () => {
     expect(actions.deepLink('http://example.org')).toMatchSnapshot();
   });
-});
\ No newline at end of file
+
+  it('should create an action to notify of a new deeplink that should leave the app', () => {
+    expect(actions.deepLink('http://example.org', false)).toMatchSnapshot();
+  });
+});

__tests__/assets/locales/__snapshots__/index.js.spec.js.snap

@@ -3,6 +3,10 @@
 exports[`translations should expose the translations 1`] = `
 Object {
   "nl": Object {
+    "app/App": Object {
+      "Dismiss": "Sluiten",
+      "Open": "Openen",
+    },
     "components/errorScreen/ErrorScreen": Object {
       "Try again later.": "Probeer het later opnieuw.",
     },

app/actions/deepLinking.js

 export const DEEPLINK = 'DEEPLINKING_DEEPLINK';
 
-export function deepLink(url) {
+export function deepLink(url, stayInApp = true) {
   return {
     type: DEEPLINK,
-    payload: { url },
+    payload: { url, stayInApp },
   };
 }

app/app.js

@@ -4,12 +4,13 @@ import {
 } from 'react-native';
 import { applyMiddleware, createStore } from 'redux';
 import { Provider } from 'react-redux';
-import { I18nextProvider } from 'react-i18next';
+import { I18nextProvider, translate } from 'react-i18next';
 import createSagaMiddleware from 'redux-saga';
 import firebase from 'react-native-firebase';
 import locale from 'react-native-locale-detector';
 import Moment from 'moment';
 import 'moment/locale/nl';
+import PropTypes from 'prop-types';
 
 import reducers from './reducers';
 
@@ -48,14 +49,35 @@ class Main extends Component {
       store.dispatch(register());
     });
     this.notificationListener = firebase.notifications().onNotification((notification) => {
-      Alert.alert(notification.title, notification.body, [
-        { text: 'OK' },
-      ]);
+      let buttons;
+      if (notification.data.url) {
+        buttons = [
+          { text: this.props.t('Dismiss') },
+          {
+            text: this.props.t('Open'),
+            onPress: () => store.dispatch(
+              deepLinkingActions.deepLink(notification.data.url, false),
+            ),
+          },
+        ];
+      } else {
+        buttons = [
+          { text: 'OK' },
+        ];
+      }
+
+      Alert.alert(notification.title, notification.body, buttons);
     });
+
+    this.notificationOpenedListener = firebase.notifications()
+      .onNotificationOpened(this.handleOpenNotification);
+
+    firebase.notifications().getInitialNotification().then(this.handleOpenNotification);
   }
 
   componentWillUnmount() {
     this.notificationListener();
+    this.notificationOpenedListener();
     this.onTokenRefreshListener();
     Linking.removeEventListener('url', this.handleOpenURL);
   }
@@ -74,6 +96,15 @@ class Main extends Component {
     store.dispatch(deepLinkingActions.deepLink(event.url));
   };
 
+  handleOpenNotification = (notificationOpen) => {
+    if (notificationOpen) {
+      const notification = notificationOpen.notification;
+      if (notification.data.url) {
+        store.dispatch(deepLinkingActions.deepLink(notification.data.url, false));
+      }
+    }
+  };
+
   render() {
     return (
       <I18nextProvider i18n={i18n}>
@@ -89,4 +120,8 @@ class Main extends Component {
   }
 }
 
-export default Main;
+Main.propTypes = {
+  t: PropTypes.func.isRequired,
+};
+
+export default translate('app/App')(Main);

app/assets/locales/index.js

@@ -13,6 +13,7 @@ files['app/ui/screens/events/EventScreenNL'] = require('./nl/app/ui/screens/even
 files['app/ui/components/standardHeader/StandardHeaderNL'] = require('./nl/app/ui/components/standardHeader/StandardHeader.json');
 files['app/ui/components/errorScreen/ErrorScreenNL'] = require('./nl/app/ui/components/errorScreen/ErrorScreen.json');
 files['app/ui/components/sidebar/SidebarNL'] = require('./nl/app/ui/components/sidebar/Sidebar.json');
+files['app/AppNL'] = require('./nl/app.json');
 
 export default {
   nl: {
@@ -30,5 +31,6 @@ export default {
     'components/standardHeader/StandardHeader': files['app/ui/components/standardHeader/StandardHeaderNL'],
     'components/errorScreen/ErrorScreen': files['app/ui/components/errorScreen/ErrorScreenNL'],
     'components/sidebar/Sidebar': files['app/ui/components/sidebar/SidebarNL'],
+    'app/App': files['app/AppNL'],
   },
 };

app/assets/locales/nl/app.json

+{
+  "Dismiss": "Sluiten",
+  "Open": "Openen"
+}
\ No newline at end of file

app/sagas/deepLinking.js

+import { Linking } from 'react-native';
 import {
   put, take, takeEvery, select,
 } from 'redux-saga/effects';
@@ -35,7 +36,7 @@ export const parseURL = (url) => {
 
 
 const deepLink = function* deepLink(action) {
-  const { url } = action.payload;
+  const { url, stayInApp } = action.payload;
 
   if (!url) {
     return;
@@ -74,6 +75,10 @@ const deepLink = function* deepLink(action) {
       return;
     }
   }
+
+  if (!stayInApp) {
+    Linking.openURL(url);
+  }
 };
 
 const deepLinkingSaga = function* deepLinkingSaga() {