OpenConceptLab/ocl_issues#2219 | can exchange with v2

Author: snyaggarwal

src/common/utils.js

@@ -1027,11 +1027,23 @@ export const isV3URL = url => {
   return false
 }
 
+export const isV2URL = url => {
+  if(!url)
+    return false
+  if(url.startsWith('http://localhost:4000'))
+    return true
+  if(!url.includes('.openconceptlab.org'))
+    return false
+  if(url.startsWith('https://app.'))
+    return true
+  return false
+}
+
 export const isRedirectingToLoginViaReferrer = location => {
   const { search, hash } = location
   const queryParams = new URLSearchParams(search)
   const referrer = queryParams.get('referrer')
   const parts = hash.split('?')
   let params = new URLSearchParams(parts[1])
-  return referrer && isV3URL(referrer) && params.get('auth') === 'true'
+  return referrer && (isV3URL(referrer) || isV2URL(referrer)) && params.get('auth') === 'true'
 }

src/components/app/App.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { Route, Switch, withRouter } from 'react-router-dom';
 import {
-  recordGAPageView, isLoggedIn, getLoginURL, isV3URL, isRedirectingToLoginViaReferrer
+  recordGAPageView, isLoggedIn, getLoginURL, isV3URL, isV2URL, isRedirectingToLoginViaReferrer
 } from '../../common/utils';
 import Error404 from '../errors/Error404';
 import Error403 from '../errors/Error403';
@@ -70,7 +70,7 @@ const App = props => {
     const referrer = queryParams.get('referrer')
     if(isLoggedIn()) {
       window.location.hash = '#'  + pathname
-    } else if(referrer && isV3URL(referrer) && !isLoggedIn()) {
+    } else if(referrer && (isV3URL(referrer) || isV2URL(referrer)) && !isLoggedIn()) {
       const parts = hash.split('?')
       let params = new URLSearchParams(parts[1])
       if(params.get('auth') === 'true') {