Page MenuHomePhabricator
Differential D3553

[server] Use baseRoutePath in getAppURLFactsFromRequestURL
ClosedPublic
Actions

Authored by ashoat on Mar 29 2022, 3:26 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 10:27 PM
Unknown Object (File)
Mon, Mar 31, 3:08 PM
Unknown Object (File)
Sun, Mar 30, 6:38 AM
Unknown Object (File)
Sun, Mar 30, 4:17 AM
Unknown Object (File)
Wed, Mar 19, 3:24 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
View All Files
Subscribers
• abosh
• adrian
• benschac
• karol

Details

Reviewers
varun
atul
tomek
Commits
rCOMM8b43f2e9f4b9: [server] Use baseRoutePath in getAppURLFactsFromRequestURL
Summary

baseRoutePath is the internal one, and req.url represents Node's internal path. basePath refers to the public (Apache) path.

Depends on D3552

Test Plan
  1. We tested the landing page, the SquadCal app, and the Comm app
  2. We made sure we tried configs where baseRoutePath !== basePath
  3. We also checked view-source to make sure things were set correctly
  4. We made sure there were no errors in the browser console
  5. We played around with the site, logging in and navigating and making sure things worked correctly
  6. We tried loading a specific URL for a specific chat directly

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
server/
src/
utils/
2 lines

Diff 10838

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;