Skip to content

Fix: Django session handling #232

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
Blue-B-code wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: Django session handling #232

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
9 changes: 9 additions & 0 deletions app/src/main/java/org/openimis/imispolicies/Global.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.openimis.imispolicies.network.util.PersistentCookieJar;
import org.openimis.imispolicies.repository.LoginRepository;
import org.openimis.imispolicies.tools.Log;
import org.openimis.imispolicies.util.StreamUtils;
Expand Down Expand Up @@ -99,6 +100,7 @@ public class Global extends Application {
private String AppDirectory;
private Map<String,
String> SubDirectories;
private PersistentCookieJar cookieJar;
private volatile LoginRepository loginRepository;
public static Global getGlobal() {
return GlobalContext;
Expand All @@ -116,6 +118,13 @@ public void onCreate() {
initSharedPrefsInts();
}

public void setCookieJar(PersistentCookieJar jar) {
this.cookieJar = jar;
}

public PersistentCookieJar getCookieJar() {
return cookieJar;
}
protected boolean isRunningTest() {
try {
Class.forName("org.robolectric.RobolectricTestRunner");
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/org/openimis/imispolicies/network/okhttp/AuthorizationInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import androidx.annotation.NonNull;

import org.apache.commons.lang3.StringUtils;
import org.openimis.imispolicies.Global;
import org.openimis.imispolicies.MainActivity;
import org.openimis.imispolicies.repository.LoginRepository;

Expand All @@ -12,6 +13,7 @@
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;

public class AuthorizationInterceptor implements Interceptor {
private static final String USER_AGENT = "mobile_app";
Expand All @@ -38,8 +40,14 @@ public Response intercept(@NonNull Chain chain) throws IOException {
builder.addHeader("X-Csrftoken", csrfToken);
}
Response response = chain.proceed(builder.build());
if (response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
ResponseBody body = response.peekBody(Long.MAX_VALUE);
String bodyString = body.string();
if (bodyString.contains("'csrftoken'") || response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
repository.saveFhirToken(null, null, null);
repository.saveCsrfToken(null);
if (Global.getGlobal().getCookieJar() != null) {
Global.getGlobal().getCookieJar().clear();
}
MainActivity.SetLoggedIn();
}
return response;
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/org/openimis/imispolicies/network/util/OkHttpUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package org.openimis.imispolicies.network.util;

import static android.content.Context.MODE_PRIVATE;

import static org.openimis.imispolicies.Global.PREF_NAME;

import android.annotation.SuppressLint;
import android.content.SharedPreferences;

import androidx.annotation.NonNull;

Expand Down Expand Up @@ -30,6 +35,10 @@ public static OkHttpClient getDefaultOkHttpClient() {
synchronized (OkHttpUtils.class) {
if (client == null) {
OkHttpClient.Builder builder = new OkHttpClient.Builder();
PersistentCookieJar cookieJar =
new PersistentCookieJar(Global.getGlobal().getSharedPreferences(PREF_NAME, MODE_PRIVATE));
Global.getGlobal().setCookieJar(cookieJar);
builder.cookieJar(cookieJar);
HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
interceptor.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.BASIC);
builder.addInterceptor(interceptor);
Expand Down
63 changes: 63 additions & 0 deletions app/src/main/java/org/openimis/imispolicies/network/util/PersistentCookieJar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package org.openimis.imispolicies.network.util;

import android.content.SharedPreferences;

import androidx.annotation.NonNull;

import okhttp3.Cookie;
import okhttp3.CookieJar;
import okhttp3.HttpUrl;

import java.util.ArrayList;
import java.util.List;

public class PersistentCookieJar implements CookieJar {

private final SharedPreferences prefs;

public PersistentCookieJar(SharedPreferences prefs) {
this.prefs = prefs;
}

@Override
public void saveFromResponse(@NonNull HttpUrl url, List<Cookie> cookies) {

for (Cookie cookie : cookies) {
if ("openimis_session".equals(cookie.name())) {

prefs.edit()
.putString("session_value", cookie.value())
.putLong("session_expiry", cookie.expiresAt())
.apply();
}
}
}

@NonNull
@Override
public List<Cookie> loadForRequest(HttpUrl url) {

String value = prefs.getString("session_value", null);
long expiry = prefs.getLong("session_expiry", -1);

if (value == null || expiry == -1) {
return new ArrayList<>();
}

Cookie cookie = new Cookie.Builder()
.name("openimis_session")
.value(value)
.domain(url.host())
.path("/")
.expiresAt(expiry)
.build();

List<Cookie> cookies = new ArrayList<>();
cookies.add(cookie);
return cookies;
}

public void clear() {
prefs.edit().clear().apply();
}
}
22 changes: 20 additions & 2 deletions app/src/main/java/org/openimis/imispolicies/repository/LoginRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.openimis.imispolicies.repository;

import static android.content.Context.MODE_PRIVATE;
import static org.openimis.imispolicies.Global.PREF_NAME;

import android.content.Context;
import android.content.SharedPreferences;
import android.util.Base64;
Expand All @@ -13,6 +16,7 @@
import org.openimis.imispolicies.BuildConfig;
import org.openimis.imispolicies.Global;
import org.openimis.imispolicies.Token;
import org.openimis.imispolicies.network.util.PersistentCookieJar;
import org.openimis.imispolicies.tools.Log;

import java.util.Date;
Expand All @@ -37,7 +41,7 @@ public LoginRepository(@NonNull Context context) {

public LoginRepository(@NonNull Context context, boolean isPaymentEnabled) {
this.isPaymentEnabled = isPaymentEnabled;
prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
prefs = context.getSharedPreferences(PREFS_NAME, MODE_PRIVATE);
if (!prefs.getBoolean(HAS_MIGRATED, false)) {
migrateOldTokens();
}
Expand Down Expand Up @@ -167,7 +171,21 @@ public boolean isLoggedIn() {
if (isPaymentEnabled && getRestToken() == null) {
return false;
}
return getFhirToken() != null;

PersistentCookieJar cookieJar = Global.getGlobal().getCookieJar();
long expiry = Global.getGlobal().getSharedPreferences(PREF_NAME, MODE_PRIVATE)
.getLong("session_expiry", 0);

boolean isLoggedIn = getFhirToken() != null
&& expiry > System.currentTimeMillis();

if (!isLoggedIn) {
if (cookieJar != null) {
cookieJar.clear();
}
}

return isLoggedIn;
}

public void logout() {
Expand Down
Loading