From f1825ae75ed6ffed70c4749f0acfbe2c552af5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Thu, 9 Jul 2020 21:17:21 +0200
Subject: [PATCH 1/2] Fix token refresh

---
 .../peertube/adapter/ServerListAdapter.java   |  7 +++++++
 .../network/AccessTokenAuthenticator.java     | 21 ++++++++++++++++++-
 .../peertube/network/RetrofitInstance.java    |  2 +-
 .../schueller/peertube/network/Session.java   |  6 ++++++
 .../peertube/service/LoginService.java        | 10 ++++-----
 app/src/main/res/values/strings.xml           |  2 ++
 6 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
index 1e8ba2f..bfb48b4 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
@@ -37,6 +37,7 @@ import net.schueller.peertube.R;
 
 import net.schueller.peertube.database.Server;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.network.Session;
 import net.schueller.peertube.service.LoginService;
 
 
@@ -89,6 +90,12 @@ public class ServerListAdapter extends RecyclerView.Adapter<ServerListAdapter.Se
             editor.putString(mInflater.getContext().getString(R.string.pref_api_base_key), serverUrl);
             editor.apply();
 
+            // Logout if logged in
+            Session session = Session.getInstance();
+            if (session.isLoggedIn()) {
+                session.invalidate();
+            }
+
             // attempt authentication if we have a username
             if (!TextUtils.isEmpty(getServerAtPosition(position).getUsername())) {
                 LoginService.Authenticate(
diff --git a/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java b/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java
index f877efc..7db6753 100644
--- a/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java
+++ b/app/src/main/java/net/schueller/peertube/network/AccessTokenAuthenticator.java
@@ -1,5 +1,7 @@
 package net.schueller.peertube.network;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -10,6 +12,8 @@ import okhttp3.Route;
 
 public class AccessTokenAuthenticator implements Authenticator {
 
+    private static final String TAG = "ATAuthenticator";
+
     public AccessTokenAuthenticator() {
     }
 
@@ -18,6 +22,7 @@ public class AccessTokenAuthenticator implements Authenticator {
     public Request authenticate(Route route, @NonNull Response response) {
         Session session = Session.getInstance();
 
+        // check if we are using tokens
         final String accessToken = session.getToken();
         if (!isRequestWithAccessToken(response) || accessToken == null) {
             return null;
@@ -26,12 +31,26 @@ public class AccessTokenAuthenticator implements Authenticator {
             final String newAccessToken = session.getToken();
             // Access token is refreshed in another thread.
             if (!accessToken.equals(newAccessToken)) {
+                Log.v(TAG, "Access token is refreshed in another thread");
                 return newRequestWithAccessToken(response.request(), newAccessToken);
             }
 
+            // do we have a refresh token?
+            if (session.getRefreshToken() == null) {
+                Log.v(TAG, "No refresh token available");
+                return null;
+            }
+
+            Log.v(TAG, "refresh token: " + session.getRefreshToken());
+
             // Need to refresh an access token
+            Log.v(TAG, "Need to refresh an access token");
             final String updatedAccessToken = session.refreshAccessToken();
-            return newRequestWithAccessToken(response.request(), updatedAccessToken);
+            if (updatedAccessToken != null) {
+                return newRequestWithAccessToken(response.request(), updatedAccessToken);
+            }
+            Log.v(TAG, "Refresh failed");
+            return null;
         }
     }
 
diff --git a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java b/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
index a1a6aa9..740f0ae 100644
--- a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
+++ b/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
@@ -33,7 +33,7 @@ public class RetrofitInstance {
             OkHttpClient.Builder okhttpClientBuilder = new OkHttpClient.Builder();
 
             okhttpClientBuilder.addInterceptor(new AuthorizationInterceptor());
-            //okhttpClientBuilder.authenticator(new AccessTokenAuthenticator());
+            okhttpClientBuilder.authenticator(new AccessTokenAuthenticator());
 
             retrofit = new retrofit2.Retrofit.Builder()
                     .client(okhttpClientBuilder.build())
diff --git a/app/src/main/java/net/schueller/peertube/network/Session.java b/app/src/main/java/net/schueller/peertube/network/Session.java
index 015ef31..b0ce7a0 100644
--- a/app/src/main/java/net/schueller/peertube/network/Session.java
+++ b/app/src/main/java/net/schueller/peertube/network/Session.java
@@ -87,6 +87,11 @@ public class Session {
 
     }
 
+    public String getRefreshToken() {
+        return sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_refresh), null);
+
+    }
+
     public String refreshAccessToken() {
 
         refreshToken();
@@ -107,6 +112,7 @@ public class Session {
         editor.putString(context.getString(R.string.pref_auth_password), null);
         editor.putString(context.getString(R.string.pref_auth_username), null);
         editor.putString(context.getString(R.string.pref_token_access), null);
+        editor.putString(context.getString(R.string.pref_token_refresh), null);
 
         editor.commit();
     }
diff --git a/app/src/main/java/net/schueller/peertube/service/LoginService.java b/app/src/main/java/net/schueller/peertube/service/LoginService.java
index 628d5be..fbc3a31 100644
--- a/app/src/main/java/net/schueller/peertube/service/LoginService.java
+++ b/app/src/main/java/net/schueller/peertube/service/LoginService.java
@@ -89,7 +89,7 @@ public class LoginService {
 
                                 assert token != null;
                                 editor.putString(context.getString(R.string.pref_token_access), token.getAccessToken());
-                                editor.putString(context.getString(R.string.pref_token_refresh), token.getExpiresIn());
+                                editor.putString(context.getString(R.string.pref_token_refresh), token.getRefreshToken());
                                 editor.putString(context.getString(R.string.pref_token_type), token.getTokenType());
                                 editor.apply();
 
@@ -162,18 +162,18 @@ public class LoginService {
 
                     assert token != null;
                     editor.putString(context.getString(R.string.pref_token_access), token.getAccessToken());
-                    editor.putString(context.getString(R.string.pref_token_refresh), token.getExpiresIn());
+                    editor.putString(context.getString(R.string.pref_token_refresh), token.getRefreshToken());
                     editor.putString(context.getString(R.string.pref_token_type), token.getTokenType());
                     editor.apply();
 
                     Log.wtf(TAG, "Logged in");
 
-                    Toast.makeText(context, context.getString(R.string.authentication_login_success), Toast.LENGTH_LONG).show();
+                    Toast.makeText(context, context.getString(R.string.authentication_token_refresh_success), Toast.LENGTH_LONG).show();
 
 
                 } else {
                     Log.wtf(TAG, response.toString());
-                    Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
+                    Toast.makeText(context, context.getString(R.string.authentication_token_refresh_failed), Toast.LENGTH_LONG).show();
 
                 }
             }
@@ -181,7 +181,7 @@ public class LoginService {
             @Override
             public void onFailure(@NonNull Call<Token> call2, @NonNull Throwable t2) {
                 Log.wtf("err", t2.fillInStackTrace());
-                Toast.makeText(context, context.getString(R.string.authentication_login_failed), Toast.LENGTH_LONG).show();
+                Toast.makeText(context, context.getString(R.string.authentication_token_refresh_failed), Toast.LENGTH_LONG).show();
 
             }
         });
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc8e6df..b7ed2ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -358,6 +358,8 @@
 
     <string name="menu_video_options_quality_automated">Automated</string>
     <string name="pref_title_buildtime">Build Time</string>
+    <string name="authentication_token_refresh_failed">Token refresh failed</string>
+    <string name="authentication_token_refresh_success">Token refresh successful</string>
 
 
 </resources>
\ No newline at end of file

From fc5a5652691029ee706ecbe5e4e1f9af03ad12af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Fri, 10 Jul 2020 21:44:46 +0200
Subject: [PATCH 2/2] Release

---
 CHANGELOG.md     | 3 +++
 app/build.gradle | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90e501a..4b9fd25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 1.0.47 Tag: v1.0.47 (2020-07-10)
+ * Authentication refresh
+
 ### Version 1.0.46 Tag: v1.0.46 (2020-07-08)
  * Revert broken auth
 
diff --git a/app/build.gradle b/app/build.gradle
index e398ba5..ca28fbb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1046
-        versionName "1.0.46"
+        versionCode 1047
+        versionName "1.0.47"
         buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ext {