Skip to content

Clean the state store file when we have an error to avoid recurring #362

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

Open
rmendonca wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Clean the state store file when we have an error to avoid recurring #362

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
1d4a128
"Clean the state store file when we have an error to avoid recurring …
rmendonca Jan 21, 2025
27a84a4
"Clean the state store file when we have an error to avoid recurring …
rmendonca Jan 21, 2025
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: 7 additions & 0 deletions library/src/main/java/com/okta/oidc/clients/AuthAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.okta.oidc.net.request.TokenRequest;
import com.okta.oidc.net.request.web.AuthorizeRequest;
import com.okta.oidc.net.request.web.WebRequest;
import com.okta.oidc.net.response.TokenResponse;
import com.okta.oidc.net.response.web.AuthorizeResponse;
import com.okta.oidc.net.response.web.WebResponse;
import com.okta.oidc.storage.OktaRepository;
Expand Down Expand Up @@ -158,6 +159,12 @@ public TokenRequest tokenExchange(AuthorizeResponse response,
.createRequest();
}

protected void clear() {
mOktaState.delete(ProviderConfiguration.RESTORE.getKey());
mOktaState.delete(TokenResponse.RESTORE.getKey());
mOktaState.delete(WebRequest.RESTORE.getKey());
}

protected void resetCurrentState() {
mCancel.set(false);
mOktaState.setCurrentState(IDLE);
Expand Down
3 changes: 3 additions & 0 deletions library/src/main/java/com/okta/oidc/clients/SyncAuthClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,13 @@ public Result signIn(String sessionToken, @Nullable AuthenticationPayload payloa
mOktaState.save(tokenResponse);
return Result.success();
} catch (AuthorizationException e) {
clear();
return Result.error(e);
} catch (IOException e) {
clear();
return Result.cancel();
} catch (Exception e) {
clear();
return Result.error(new AuthorizationException(OTHER.code, e.getMessage(), e));
} finally {
resetCurrentState();
Expand Down