Skip to content

[WIP] Pusher undefined authtoken #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sketchydroide wants to merge 2 commits into from
Closed

[WIP] Pusher undefined authtoken #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6340967
testing
sketchydroide Sep 11, 2020
48978b9
Merge branch 'master' into afonseca_pusher_undefined_authtoken
sketchydroide Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/Expensify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const propTypes = {
};

const defaultProps = {
redirectTo: '',
redirectTo: ROUTES.HOME,
};

class Expensify extends Component {
Expand Down Expand Up @@ -76,9 +76,22 @@ class Expensify extends Component {
<View style={styles.genericView} />
);
}

console.log(`this.state.authToken: ${this.state.authToken}`);
if (this.state.authToken === undefined) {
console.log('will got to login');
return (
<Router>
<Redirect to={ROUTES.SIGNIN} />
<Route path={[ROUTES.SIGNIN]} render={this.recordCurrentRoute} component={SignInPage} />
</Router>
);
}

console.log('will got to home page before' + this.props.redirectTo);
const redirectTo = !this.state.authToken ? ROUTES.SIGNIN : this.props.redirectTo;
console.log('will got to home page after' + redirectTo);
return (

// TODO: Mobile does not support Beforeunload
// <Beforeunload onBeforeunload={ActiveClientManager.removeClient}>
<Router>
Expand Down
1 change: 1 addition & 0 deletions src/lib/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ function updateReportWithNewAction(reportID, reportAction) {
* Initialize our pusher subscriptions to listen for new report comments
*/
function subscribeToReportCommentEvents() {
console.log(`private-user-accountID-${currentUserAccountID}`);
const pusherChannelName = `private-user-accountID-${currentUserAccountID}`;
if (Pusher.isSubscribed(pusherChannelName) || Pusher.isAlreadySubscribing(pusherChannelName)) {
return;
Expand Down