Skip to content

Commit

Permalink
A bit more ground work for temp accounts.
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrant committed Sep 13, 2024
1 parent bcbc54b commit f60f9cd
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions app/src/main/java/org/wikipedia/auth/AccountUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ import android.os.Build
import androidx.core.os.bundleOf
import org.wikipedia.R
import org.wikipedia.WikipediaApp
import org.wikipedia.dataclient.SharedPreferenceCookieManager
import org.wikipedia.json.JsonUtil
import org.wikipedia.login.LoginResult
import org.wikipedia.util.UriUtil
import org.wikipedia.util.log.L.d
import org.wikipedia.util.log.L.logRemoteErrorIfProd
import java.util.*

object AccountUtil {
private const val CENTRALAUTH_USER_COOKIE_NAME = "centralauth_User"

fun updateAccount(response: AccountAuthenticatorResponse?, result: LoginResult) {
if (createAccount(result.userName!!, result.password!!)) {
Expand All @@ -31,6 +34,9 @@ object AccountUtil {
val isLoggedIn: Boolean
get() = account() != null

val isTemporaryAccount: Boolean
get() = account() == null && getUserNameFromCookie().isNotEmpty()

val userName: String
get() = account()?.name.orEmpty()

Expand Down Expand Up @@ -88,6 +94,18 @@ object AccountUtil {
return WikipediaApp.instance.getString(R.string.account_type)
}

fun getUserNameFromCookie(): String {
return UriUtil.decodeURL(SharedPreferenceCookieManager.instance.getCookieValueByName(CENTRALAUTH_USER_COOKIE_NAME).orEmpty().trim())
}

fun getUserNameExpiryFromCookie(): Long {
return SharedPreferenceCookieManager.instance.getCookieExpiryByName(CENTRALAUTH_USER_COOKIE_NAME)
}

fun isUserNameTemporary(userName: String): Boolean {
return userName.startsWith("~")
}

private fun createAccount(userName: String, password: String): Boolean {
var account = account()
if (account == null || account.name.isNullOrEmpty() || account.name != userName) {
Expand Down

0 comments on commit f60f9cd

Please sign in to comment.