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

Use new API command LogOut #9602

Merged
merged 14 commits into from
Jul 8, 2022
Merged

Use new API command LogOut #9602

Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6d4f537
Use new API endpoint LogOut
Beamanator Jun 28, 2022
d3af164
Add missing comma
Beamanator Jun 28, 2022
06fb754
Remove whitespace
Beamanator Jun 29, 2022
c32335f
Prevent auth attempt if no creds stored
Beamanator Jun 29, 2022
c7fdd60
Reset authenticate code
Beamanator Jun 29, 2022
c71ee24
Send authToken with command
Beamanator Jun 29, 2022
ebf9fdf
Merge branch 'main' of github.com:Expensify/App into beaman-refactorA…
Beamanator Jul 1, 2022
45ecc5d
Make sure timing still works
Beamanator Jul 1, 2022
24043b9
Merge branch 'main' of github.com:Expensify/App into beaman-refactorA…
Beamanator Jul 4, 2022
d576088
Merge branch 'main' of github.com:Expensify/App into beaman-refactorA…
Beamanator Jul 5, 2022
7630b25
Always call LogOut, consolidate onyx sets
Beamanator Jul 5, 2022
a5207b1
Merge branch 'main' of github.com:Expensify/App into beaman-refactorA…
Beamanator Jul 5, 2022
b2c3451
Merge branch 'main' of github.com:Expensify/App into beaman-refactorA…
Beamanator Jul 6, 2022
9f77bfa
Clean up empty var check
Beamanator Jul 6, 2022
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
33 changes: 22 additions & 11 deletions src/libs/actions/Session/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import * as ValidationUtils from '../../ValidationUtils';
import * as Authentication from '../../Authentication';
import * as ErrorUtils from '../../ErrorUtils';
import * as Welcome from '../Welcome';
import * as API from '../../API';
import * as NetworkStore from '../../Network/NetworkStore';

let credentials = {};
Onyx.connect({
Expand Down Expand Up @@ -72,25 +74,34 @@ function createAccount(login) {
*/
function signOut() {
Log.info('Flushing logs before signing out', true, {}, true);
Timing.clearData();

if (credentials && credentials.autoGeneratedLogin) {
// Clean up the login that we created
DeprecatedAPI.DeleteLogin({
const optimisticData = [
{
onyxMethod: 'set',
key: ONYXKEYS.SESSION,
value: null,
},
{
onyxMethod: 'set',
key: ONYXKEYS.CREDENTIALS,
value: null,
},
];
API.write('LogOut', {
// Send current authToken because we will immediately clear it once triggering this command
authToken: NetworkStore.getAuthToken(),
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB, maybe kind of rare that this would happen - but feels like something that API should deal with by caching the authToken before setting optimisticData.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I definitely think it's rare, but it's necessary for this case (took me a while to debug & figure out this was the cause of some annoying issues)

I like the idea of the API caching the authToken before setting optimisticData, but maybe only if there's other instances where that's needed? Like in other Authenticate refactors 'n such.

partnerUserID: credentials.autoGeneratedLogin,
partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
shouldRetry: false,
})
.then((response) => {
if (response.jsonCode === CONST.JSON_CODE.SUCCESS) {
return;
}

Onyx.merge(ONYXKEYS.SESSION, {error: response.message});
});
}, {optimisticData});
return;
}

Onyx.set(ONYXKEYS.SESSION, null);
Onyx.set(ONYXKEYS.CREDENTIALS, null);
Timing.clearData();
}

function signOutAndRedirectToSignIn() {
Expand Down