Page MenuHomePhabricator
Differential D3547

[server] Add baseRoutePath to app URL config JSON
ClosedPublic
Actions

Authored by ashoat on Mar 29 2022, 3:22 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 31, 12:46 PM
Unknown Object (File)
Mon, Mar 31, 7:23 AM
Unknown Object (File)
Sun, Mar 30, 9:47 AM
Unknown Object (File)
Sun, Mar 30, 4:21 AM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:35 PM
Unknown Object (File)
Thu, Mar 13, 2:31 PM
View All Files
Subscribers
• abosh
• adrian
• benschac
• karol

Details

Reviewers
varun
atul
tomek
Commits
rCOMM453a8a435a27: [server] Add baseRoutePath to app URL config JSON
Summary

Just basePath (external) isn't enough – to properly detect what external URL triggered the request, we need to check if the internal URL starts with a particular baseRoutePath. We also need this in order to find/replace the internal URL so we can get the external URL.

Test Plan

This diff was tested in combination with the following diffs. On its own, it just changes a type

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
server/
src/
utils/
5 lines

Diff 10795

View Options

server/src/utils/urls.js

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesimport type {
EventSubscription, EventSubscription,
KeyboardEvent, KeyboardEvent,
} from '../types/react-native.js'; } from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js'; import type { ImageStyle } from '../types/styles.js';
import { import {
runTiming, runTiming,
ratchetAlongWithKeyboardHeight, ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js'; } from '../utils/animation-utils.js';
import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import { import {
type StateContainer, type StateContainer,
type StateChange, type StateChange,
setStateForContainer, setStateForContainer,
} from '../utils/state-container.js'; } from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js'; import EthereumLogo from '../vectors/ethereum-logo.react.js';
let initialAppLoad = true; let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Linestype Props = {
+cookie: ?string, +cookie: ?string,
+urlPrefix: string, +urlPrefix: string,
+loggedIn: boolean, +loggedIn: boolean,
+dimensions: DerivedDimensionsInfo, +dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle, +splashStyle: ImageStyle,
+styles: typeof unboundStyles, +styles: typeof unboundStyles,
// Redux dispatch functions // Redux dispatch functions
+dispatch: Dispatch, +dispatch: Dispatch,
// Keyserver olm sessions functions
+initialNotificationsEncryptedMessage: () => Promise<string>,
}; };
type State = { type State = {
+mode: LoggedOutMode, +mode: LoggedOutMode,
+nextMode: LoggedOutMode, +nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>, +logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>, +registerState: StateContainer<RegisterState>,
}; };
class LoggedOutModal extends React.PureComponent<Props, State> { class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines if (!__DEV__) {
const actionSource = loggedIn const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie ? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux; : logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials( const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch, dispatch,
cookie, cookie,
urlPrefix, urlPrefix,
actionSource, actionSource,
this.props.initialNotificationsEncryptedMessage,
); );
if ( if (
sessionChange && sessionChange &&
sessionChange.cookie && sessionChange.cookie &&
sessionChange.cookie.startsWith('user=') sessionChange.cookie.startsWith('user=')
) { ) {
// success! we can expect subsequent actions to fix up the state // success! we can expect subsequent actions to fix up the state
return; return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie); const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix); const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn); const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector); const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector); const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const dispatch = useDispatch(); const dispatch = useDispatch();
const callInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage();
return ( return (
<LoggedOutModal <LoggedOutModal
{...props} {...props}
isForeground={isForeground} isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded} persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded} rehydrateConcluded={rehydrateConcluded}
cookie={cookie} cookie={cookie}
urlPrefix={urlPrefix} urlPrefix={urlPrefix}
loggedIn={loggedIn} loggedIn={loggedIn}
dimensions={dimensions} dimensions={dimensions}
splashStyle={splashStyle} splashStyle={splashStyle}
styles={styles} styles={styles}
dispatch={dispatch} dispatch={dispatch}
initialNotificationsEncryptedMessage={
callInitialNotificationsEncryptedMessage
}
/> />
); );
}); });
export default ConnectedLoggedOutModal; export default ConnectedLoggedOutModal;