Skip to content

fix: Display unauthorization error while loading events #2110

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
merged 1 commit into from
Jul 12, 2019
Merged

fix: Display unauthorization error while loading events #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.fossasia.openevent.general.order.OrderService
import org.fossasia.openevent.general.ticket.Ticket
import org.fossasia.openevent.general.ticket.TicketService
import org.fossasia.openevent.general.utils.HttpErrors
import retrofit2.HttpException
import timber.log.Timber

const val ORDER_STATUS_PENDING = "pending"
Expand Down Expand Up @@ -175,8 +176,9 @@ class AttendeeViewModel(
}, {
mutableProgress.value = false
if (createAttendeeIterations + 1 == totalAttendee)
if (it.message.equals(HttpErrors.CONFLICT)) {
mutableTicketSoldOut.value = true
if (it is HttpException) {
if (it.code() == HttpErrors.CONFLICT)
mutableTicketSoldOut.value = true
} else {
mutableMessage.value = resource.getString(R.string.create_attendee_fail_message)
Timber.d(it, "Failed")
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import org.fossasia.openevent.general.data.Resource
import org.fossasia.openevent.general.event.paging.EventsDataSourceFactory
import org.fossasia.openevent.general.notification.NotificationService
import org.fossasia.openevent.general.search.location.SAVED_LOCATION
import org.fossasia.openevent.general.utils.HttpErrors
import org.fossasia.openevent.general.utils.extensions.withDefaultSchedulers
import retrofit2.HttpException
import timber.log.Timber

const val NEW_NOTIFICATIONS = "newNotifications"
Expand Down Expand Up @@ -134,10 +136,28 @@ class EventsViewModel(
}
}
}, {
if (it is HttpException) {
if (authHolder.isLoggedIn() && it.code() == HttpErrors.UNAUTHORIZED) {
logoutAndRefresh()
}
}
Timber.e(it, "Error fetching notifications")
})
}

private fun logoutAndRefresh() {
compositeDisposable += authService.logout()
.withDefaultSchedulers()
.subscribe({
loadLocationEvents()
syncNotifications()
}, {
mutableProgress.value = false
Timber.e(it, "Error while logout")
mutableMessage.value = resource.getString(R.string.error)
})
}

fun checkAndReset(token: String, newPassword: String) {
val resetRequest = RequestPasswordReset(PasswordReset(token, newPassword))
if (authHolder.isLoggedIn()) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/fossasia/openevent/general/utils/AppLinkUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ object AppLinkUtils {
}

fun handleIntent(intent: Intent?, navController: NavController) {
val uri = intent?.data.toString()
val data = getData(uri) ?: return
val uri = intent?.data ?: return
val data = getData(uri.toString()) ?: return
val bundle = Bundle()
bundle.putString(data.argumentKey, data.argumentValue)
navController.navigate(data.destinationId, bundle)
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/fossasia/openevent/general/utils/HttpErrors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.fossasia.openevent.general.utils

object HttpErrors {
const val CONFLICT = "HTTP 409 CONFLICT"
const val CONFLICT = 409
const val UNAUTHORIZED = 401
}