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

[Fix]Handle incorrect 404 responses; add a delay after creates and retries on 404 of new ids #2059

Merged
merged 6 commits into from
Apr 22, 2024
Merged

[Fix]Handle incorrect 404 responses; add a delay after creates and retries on 404 of new ids #2059

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83fa82b
create test to prove we don't wait after create
jkasten2 Apr 17, 2024
59fd1df
Add opRepoPostCreateDelay
jkasten2 Apr 17, 2024
5ffa8a3
Retry on 404/410 within short window after create
jkasten2 Apr 17, 2024
fb10758
correct applyToRecordId for login operation
jkasten2 Apr 18, 2024
1c2bf82
prevent adding executionInterval & postCreateDelay
jkasten2 Apr 18, 2024
a9dfc09
only consider retrying on 404, don't include 410
jkasten2 Apr 19, 2024
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
Prev Previous commit
only consider retrying on 404, don't include 410 
If the backend returns 410 then it indicates it knows it existed at one
point and it is deleted now. Where a 404 is more abstract.
  • Loading branch information
@jkasten2
jkasten2 committed Apr 19, 2024
commit a9dfc0933993563fe40d860bea744aef630c82cf
4 changes: 2 additions & 2 deletions ...n/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ internal class IdentityOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
NetworkUtils.ResponseStatusType.MISSING -> {
if (_newRecordState.isInMissingRetryWindow(lastOperation.onesignalId)) {
if (ex.statusCode == 404 && _newRecordState.isInMissingRetryWindow(lastOperation.onesignalId)) {
return ExecutionResponse(ExecutionResult.FAIL_RETRY)
jinliu9508 marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down Expand Up @@ -109,7 +109,7 @@ internal class IdentityOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
NetworkUtils.ResponseStatusType.MISSING -> {
return if (_newRecordState.isInMissingRetryWindow(lastOperation.onesignalId)) {
return if (ex.statusCode == 404 && _newRecordState.isInMissingRetryWindow(lastOperation.onesignalId)) {
ExecutionResponse(ExecutionResult.FAIL_RETRY)
} else {
// This means either the User or the Alias was already
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/onesignal/user/internal/operations/impl/executors/RefreshUserOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ internal class RefreshUserOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
NetworkUtils.ResponseStatusType.MISSING -> {
if (_newRecordState.isInMissingRetryWindow(op.onesignalId)) {
if (ex.statusCode == 404 && _newRecordState.isInMissingRetryWindow(op.onesignalId)) {
return ExecutionResponse(ExecutionResult.FAIL_RETRY)
}
val operations = _buildUserService.getRebuildOperationsIfCurrentUser(op.appId, op.onesignalId)
Expand Down
12 changes: 9 additions & 3 deletions ...va/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ internal class SubscriptionOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
NetworkUtils.ResponseStatusType.MISSING -> {
if (_newRecordState.isInMissingRetryWindow(createOperation.onesignalId)) {
if (ex.statusCode == 404 && _newRecordState.isInMissingRetryWindow(createOperation.onesignalId)) {
return ExecutionResponse(ExecutionResult.FAIL_RETRY)
}
val operations = _buildUserService.getRebuildOperationsIfCurrentUser(createOperation.appId, createOperation.onesignalId)
Expand Down Expand Up @@ -183,7 +183,8 @@ internal class SubscriptionOperationExecutor(
NetworkUtils.ResponseStatusType.RETRYABLE ->
ExecutionResponse(ExecutionResult.FAIL_RETRY)
NetworkUtils.ResponseStatusType.MISSING -> {
if (listOf(
if (ex.statusCode == 404 &&
listOf(
lastOperation.onesignalId,
lastOperation.subscriptionId,
).any { _newRecordState.isInMissingRetryWindow(it) }
Expand Down Expand Up @@ -262,7 +263,12 @@ internal class SubscriptionOperationExecutor(

return when (responseType) {
NetworkUtils.ResponseStatusType.MISSING -> {
if (listOf(op.onesignalId, op.subscriptionId).any { _newRecordState.isInMissingRetryWindow(it) }) {
if (ex.statusCode == 404 &&
listOf(
op.onesignalId,
op.subscriptionId,
).any { _newRecordState.isInMissingRetryWindow(it) }
) {
ExecutionResponse(ExecutionResult.FAIL_RETRY)
} else {
// if the subscription is missing, we are good!
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/onesignal/user/internal/operations/impl/executors/UpdateUserOperationExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ internal class UpdateUserOperationExecutor(
NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
NetworkUtils.ResponseStatusType.MISSING -> {
if (_newRecordState.isInMissingRetryWindow(onesignalId)) {
if (ex.statusCode == 404 && _newRecordState.isInMissingRetryWindow(onesignalId)) {
return ExecutionResponse(ExecutionResult.FAIL_RETRY)
}
val operations = _buildUserService.getRebuildOperationsIfCurrentUser(appId, onesignalId)
Expand Down
Loading