Skip to content

Commit

Permalink
Correctly store userIdentifier and request user identifier again if m…
Browse files Browse the repository at this point in the history 
…issing.
  • Loading branch information
@mopsalarm
mopsalarm committed Aug 19, 2017
1 parent b01419e commit 93268ae
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 42 deletions.
12 changes: 5 additions & 7 deletions api/src/main/java/com/pr0gramm/app/api/pr0gramm/Api.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ Observable<Nothing> deleteTag(
@GET("api/profile/suggest")
Call<Names> suggestUsers(@Query("prefix") String prefix);

@GET("api/user/identifier")
Observable<UserIdentifier> identifier();

@FormUrlEncoded
@POST("api/contact/send")
Observable<Nothing> contactSend(
Expand Down Expand Up @@ -667,18 +670,13 @@ interface UserInfo {

@Value.Immutable
interface UserIdentifier {
String identifier();
}

@Value.Immutable
interface UserScore {
int score();
String getIdentifier();
}

@Value.Immutable
interface ResetPasswordResponse {
@Nullable
String error();
String getError();
}

@Value.Immutable
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/pr0gramm/app/services/FavedCommentService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import com.pr0gramm.app.api.InstantTypeAdapter
import com.pr0gramm.app.api.pr0gramm.Api
import com.pr0gramm.app.feed.ContentType
import com.pr0gramm.app.feed.FeedItem
import com.pr0gramm.app.ui.dialogs.ignoreError
import com.pr0gramm.app.util.BackgroundScheduler
import com.pr0gramm.app.util.onErrorResumeEmpty
import com.pr0gramm.app.util.subscribeOnBackground
import gnu.trove.TCollections
import gnu.trove.set.TLongSet
import gnu.trove.set.hash.TLongHashSet
Expand Down Expand Up @@ -58,11 +59,10 @@ class FavedCommentService(userService: UserService, okHttpClient: OkHttpClient)
if (userHash == null)
Observable.just(emptyList())
else
api.list(userHash, ContentType.combine(ContentType.All))
.onErrorResumeEmpty()
api.list(userHash, ContentType.combine(ContentType.All)).ignoreError()
}

.subscribeOn(BackgroundScheduler.instance())
.subscribeOnBackground()
.subscribe { comments -> updateCommentIds(TLongHashSet(comments.map { it.id })) }
}

Expand Down
74 changes: 43 additions & 31 deletions app/src/main/java/com/pr0gramm/app/services/UserService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.pr0gramm.app.api.pr0gramm.Api
import com.pr0gramm.app.api.pr0gramm.LoginCookieHandler
import com.pr0gramm.app.feed.ContentType
import com.pr0gramm.app.orm.BenisRecord
import com.pr0gramm.app.ui.dialogs.ignoreError
import com.pr0gramm.app.util.*
import com.pr0gramm.app.util.AndroidUtility.checkNotMainThread
import org.joda.time.Duration.standardDays
Expand All @@ -35,6 +36,8 @@ class UserService(private val api: Api,
private val gson: Gson,
private val database: Holder<SQLiteDatabase>) {

private val logger = LoggerFactory.getLogger("UserService")

private val lock = Any()

private val fullSyncInProgress = AtomicBoolean()
Expand All @@ -44,7 +47,6 @@ class UserService(private val api: Api,
private val loginStateObservable = BehaviorSubject.create(loginState).toSerialized()

init {

// only restore user data if authorized.
if (cookieHandler.hasCookie()) {
restoreLatestUserInfo()
Expand Down Expand Up @@ -81,6 +83,13 @@ class UserService(private val api: Api,
}
}

private fun updateUniqueTokenIfNeeded(state: LoginState) {
if (state.authorized && state.uniqueToken == null) {
api.identifier().ignoreError().subscribeOnBackground().subscribe { result ->
updateUniqueToken(result.identifier)
}
}
}
private fun updateUniqueToken(uniqueToken: String?) {
if (uniqueToken == null)
return
Expand All @@ -101,12 +110,15 @@ class UserService(private val api: Api,

// update once now, and one with recent benis history later.
.flatMap { state ->
Observable.just(state)
.concatWith(Observable
.fromCallable { state.copy(benisHistory = loadBenisHistoryAsGraph(state.id)) }
.subscribeOnBackground())
val extendedState = Observable
.fromCallable { state.copy(benisHistory = loadBenisHistoryAsGraph(state.id)) }
.subscribeOnBackground()

Observable.just(state).concatWith(extendedState)
}

.doOnNext { state -> updateUniqueTokenIfNeeded(state) }

.subscribe(
{ loginState -> updateLoginState({ loginState }) },
{ error -> logger.warn("Could not restore login state: " + error) })
Expand Down Expand Up @@ -163,7 +175,7 @@ class UserService(private val api: Api,
cookieHandler.clearLoginCookie(false)

// remove sync id
preferences.edit() {
preferences.edit {
remove(KEY_LAST_LOF_OFFSET)
remove(KEY_LAST_USER_INFO)
remove(KEY_LAST_LOGIN_STATE)
Expand Down Expand Up @@ -227,7 +239,7 @@ class UserService(private val api: Api,

// store syncId for next time.
if (response.logLength() > lastLogOffset) {
preferences.edit() {
preferences.edit {
putLong(KEY_LAST_LOF_OFFSET, response.logLength())
}
}
Expand Down Expand Up @@ -271,7 +283,7 @@ class UserService(private val api: Api,
info().retry(3)
.subscribeOnBackground()
.doOnNext { info ->
val loginState = createLoginState(info)
val loginState = createLoginStateFromInfo(info)
updateLoginState { loginState }
}
.doOnTerminate({ publishSubject.onCompleted() })
Expand All @@ -288,12 +300,12 @@ class UserService(private val api: Api,
if (state.authorized) {
logger.info("persisting logins state now.")

val encoded = gson.toJson(state)
preferences.edit() {
preferences.edit {
val encoded = gson.toJson(state)
putString(KEY_LAST_LOGIN_STATE, encoded)
}
} else {
preferences.edit() {
preferences.edit {
remove(KEY_LAST_LOGIN_STATE)
}
}
Expand All @@ -304,7 +316,7 @@ class UserService(private val api: Api,

}

private fun createLoginState(info: Api.Info): LoginState {
private fun createLoginStateFromInfo(info: Api.Info): LoginState {
checkNotMainThread()

val user = info.user
Expand All @@ -317,7 +329,7 @@ class UserService(private val api: Api,
premium = isPremiumUser,
admin = userIsAdmin,
benisHistory = loadBenisHistoryAsGraph(user.id),
uniqueToken = null)
uniqueToken = loginState.uniqueToken)
}

val userIsAdmin: Boolean
Expand Down Expand Up @@ -365,9 +377,11 @@ class UserService(private val api: Api,
/**
* Returns an observable that produces the unique user token, if a hash is currently
* available. This produces "null", if the user is currently not signed in.
*
* The observable will produce updated tokens on changes.
*/
fun userToken(): Observable<String> {
return loginStateObservable.take(1).map { value ->
return loginStateObservable.map { value ->
if (value.authorized) value.uniqueToken else null
}
}
Expand All @@ -379,7 +393,7 @@ class UserService(private val api: Api,
fun resetPassword(name: String, token: String, password: String): Observable<Boolean> {
return api.resetPassword(name, token, password)
.doOnNext { value -> logger.info("Response is {}", value) }
.map { response -> response.error() == null }
.map { response -> response.error == null }
}

data class LoginState(
Expand Down Expand Up @@ -412,31 +426,29 @@ class UserService(private val api: Api,
}

override fun serialize(value: LoginState, type: Type?, ctx: JsonSerializationContext?): JsonElement {
val obj = JsonObject()
obj.addProperty("id", value.id)
obj.addProperty("name", value.name)
obj.addProperty("mark", value.mark)
obj.addProperty("score", value.score)
obj.addProperty("uniqueToken", value.uniqueToken)
obj.addProperty("admin", value.admin)
obj.addProperty("premium", value.premium)
obj.addProperty("authorized", value.authorized)
return obj
return JsonObject().apply {
addProperty("id", value.id)
addProperty("name", value.name)
addProperty("mark", value.mark)
addProperty("score", value.score)
addProperty("uniqueToken", value.uniqueToken)
addProperty("admin", value.admin)
addProperty("premium", value.premium)
addProperty("authorized", value.authorized)
}
}
}


class LoginProgress(val login: Api.Login?)

companion object {
private val logger = LoggerFactory.getLogger("UserService")

private val KEY_LAST_LOF_OFFSET = "UserService.lastLogLength"
private val KEY_LAST_USER_INFO = "UserService.lastUserInfo"
private val KEY_LAST_LOGIN_STATE = "UserService.lastLoginState"
private const val KEY_LAST_LOF_OFFSET = "UserService.lastLogLength"
private const val KEY_LAST_USER_INFO = "UserService.lastUserInfo"
private const val KEY_LAST_LOGIN_STATE = "UserService.lastLoginState"

private val NOT_AUTHORIZED = LoginState(
id = -1, score = 0, mark = 0, admin = false,
premium = false, authorized = false, name = null, uniqueToken = null)

}
}

0 comments on commit 93268ae

Please sign in to comment.