Skip to content

Fix link to oldDot #5359

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

Merged
tgolen merged 3 commits into from
Sep 21, 2021
Merged

Fix link to oldDot #5359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13458ff
Fix link to oldDot
iwiznia Sep 20, 2021
14e8622
Pass email in query string
cead22 Sep 20, 2021
bb91eb8
Encode email
cead22 Sep 21, 2021
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
4 changes: 2 additions & 2 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ const CONST = {
PRIVACY_URL: 'https://use.expensify.com/privacy',
LICENSES_URL: 'https://use.expensify.com/licenses',
PLAY_STORE_URL: 'https://play.google.com/store/apps/details?id=com.expensify.chat&hl=en',
ADD_SECONDARY_LOGIN_URL: '/settings?param={%22section%22:%22account%22}',
MANAGE_CARDS_URL: '/domain_companycards',
ADD_SECONDARY_LOGIN_URL: 'settings?param={%22section%22:%22account%22}',
MANAGE_CARDS_URL: 'domain_companycards',
FEES_URL: 'https://use.expensify.com/fees',
CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid',
STAGING_SECURE_URL: 'https://staging-secure.expensify.com/',
Expand Down
8 changes: 4 additions & 4 deletions src/libs/API.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,11 @@ function GetAccountStatus(parameters) {
}

/**
* Returns a validate code for this account
* Returns a short lived authToken for this account
* @returns {Promise}
*/
function GetAccountValidateCode() {
const commandName = 'GetAccountValidateCode';
function GetShortLivedAuthToken() {
const commandName = 'GetShortLivedAuthToken';
return Network.post(commandName);
}

Expand Down Expand Up @@ -1086,7 +1086,7 @@ export {
DeleteLogin,
Get,
GetAccountStatus,
GetAccountValidateCode,
GetShortLivedAuthToken,
GetIOUReport,
GetPolicyList,
GetPolicySummaryList,
Expand Down
6 changes: 2 additions & 4 deletions src/libs/actions/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ function setLocale(locale) {
* @param {string} url relative URL starting with `/` to open in expensify.com
*/
function openSignedInLink(url = '') {
API.GetAccountValidateCode().then((response) => {
const exitToURL = url ? `?exitTo=${url}` : '';
const validateCodeUrl = `v/${currentUserAccountID}/${response.validateCode}${exitToURL}`;

@tgolen tgolen Sep 20, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come there is no more exitTo param?

@iwiznia iwiznia Sep 21, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The exitTo was there for the validate page to redirect to the page we wanted after validating. Now, we don't need it because we send users directly to the page we want, without any intermediary pages

@tgolen tgolen Sep 21, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks!

Linking.openURL(CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + validateCodeUrl);
API.GetShortLivedAuthToken().then((response) => {
Linking.openURL(`${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${response.authToken}&email=${encodeURIComponent(response.email)}`);
});
}

Expand Down