Adding current URL for the return in the extension URLs.

Author: krulis-martin

src/components/layout/Sidebar/Sidebar.js

@@ -53,7 +53,10 @@ const extensionClickHandler = lruMemoize(fetchExtensionUrl => ev => {
     const extension = ev.currentTarget.dataset.extension;
     const instance = ev.currentTarget.dataset.instance;
     const locale = ev.currentTarget.dataset.locale;
-    fetchExtensionUrl(extension, instance, locale).then(({ value: url }) => window.location.assign(url));
+    const returnUrl = window.location.href;
+    fetchExtensionUrl(extension, instance, locale, returnUrl).then(
+      ({ value: url }) => url && window.location.assign(url)
+    );
   }
 });
 

src/containers/SidebarContainer/SidebarContainer.js

@@ -16,6 +16,7 @@ export default connect(
     notifications: notificationsSelector(state),
   }),
   dispatch => ({
-    fetchExtensionUrl: (extension, instance, locale) => dispatch(fetchExtensionUrl(extension, instance, locale)),
+    fetchExtensionUrl: (extension, instance, locale, returnUrl = '') =>
+      dispatch(fetchExtensionUrl(extension, instance, locale, returnUrl)),
   })
 )(Sidebar);

src/redux/modules/app.js

@@ -22,11 +22,11 @@ export const setLang = createAction(actionTypes.SET_LANG, lang => ({
 export const newPendingFetchOperation = createAction(actionTypes.NEW_PENDING_FETCH_OPERATION);
 export const completedFetchOperation = createAction(actionTypes.COMPLETED_FETCH_OPERATION);
 
-export const fetchExtensionUrl = (extension, instance, locale) =>
+export const fetchExtensionUrl = (extension, instance, locale, returnUrl = '') =>
   createApiAction({
     type: actionTypes.EXTENSION_URL,
     method: 'GET',
-    endpoint: `/extensions/${extension}/${instance}?locale=${locale}`,
+    endpoint: `/extensions/${encodeURIComponent(extension)}/${encodeURIComponent(instance)}?locale=${encodeURIComponent(locale)}&return=${encodeURIComponent(returnUrl)}`,
     meta: { extension, instance, locale },
   });