Skip to content
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

Jump to bottom

Also check for shortLivedToken when signing in with shortLivedAuthToken #14045

Merged
merged 5 commits into from
Jan 9, 2023
Merged

Also check for shortLivedToken when signing in with shortLivedAuthToken #14045

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54982b9
Also check for shortLivedToken
Jan 5, 2023
583e19b
Add comment explaining why we check for both
Jan 5, 2023
02cfd61
Merge branch 'main' into amechler-fix-old-app-transition
Jan 6, 2023
7f53a72
Add blank line to fix lint errors
Jan 6, 2023
dbdde67
add prop type for shortLivedToken
Jan 6, 2023
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
7 changes: 6 additions & 1 deletion src/pages/LogInWithShortLivedAuthTokenPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const propTypes = {
/** Short lived authToken to sign in a user */
shortLivedAuthToken: PropTypes.string,

/** Short lived authToken to sign in as a user, if they are coming from the old mobile app */
shortLivedToken: PropTypes.string,

/** The email of the transitioning user */
email: PropTypes.string,
}),
Expand All @@ -21,7 +24,9 @@ const propTypes = {
class LogInWithShortLivedAuthTokenPage extends Component {
componentDidMount() {
const email = lodashGet(this.props, 'route.params.email', '');
const shortLivedAuthToken = lodashGet(this.props, 'route.params.shortLivedAuthToken', '');

// We have to check for both shortLivedAuthToken and shortLivedToken, as the old mobile app uses shortLivedToken, and is not being actively updated.
alex-mechler marked this conversation as resolved.
Show resolved Hide resolved
const shortLivedAuthToken = lodashGet(this.props, 'route.params.shortLivedAuthToken', '') || lodashGet(this.props, 'route.params.shortLivedToken', '');
Session.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
}

Expand Down