e02d105 · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

hack in activate routing

e02d105Liam Fitzgerald7 years ago

src/Bridge.js+3−1

compare with master

unifiedsplit

@@ -42,6 +42,8 @@ function useInitialRoutes() {

42 const [hasDisclaimed] = useHasDisclaimed();

43 const hasImpliedTicket = !!useImpliedTicket();

45+ const isActivateUrl = window.location.pathname === '/activate';

46+

45 if (IS_STUBBED) {

47 if (IS_STUBBED) {

46 return [

48 return [

47 { key: ROUTE_NAMES.LOGIN },

49 { key: ROUTE_NAMES.LOGIN },

@@ -50,7 +52,7 @@ function useInitialRoutes() {

50 ];

52 ];

51 }

53 }

53− if (hasImpliedTicket) {

55+ if (hasImpliedTicket || isActivateUrl) {

54 return [{ key: ROUTE_NAMES.ACTIVATE }];

56 return [{ key: ROUTE_NAMES.ACTIVATE }];

55 }

57 }

src/views/Activate.js+8−1

@@ -1,4 +1,4 @@

1−import React from 'react';

1+import React, { useEffect } from 'react';

3import useRouter from 'lib/useRouter';

4import { LocalRouterProvider } from 'lib/LocalRouter';

@@ -30,6 +30,13 @@ export default function Activate() {

30 initialRoutes: [{ key: NAMES.CODE }],

31 });

33+ useEffect(() => {

34+ // remove potential /activate path on unmount

35+ return () => {

36+ window.history.replaceState(null, null, '');

37+ };

38+ }, []);

39+

33 // when we know the derived point, ensure we have the data to display it

40 // when we know the derived point, ensure we have the data to display it

34 useSyncKnownPoints(

41 useSyncKnownPoints(

35 [state.derivedPoint.getOrElse(null)].filter(p => p !== null)

42 [state.derivedPoint.getOrElse(null)].filter(p => p !== null)