Rework authentication

build.gradle

@@ -15,7 +15,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'io.github.openfeign:feign-core:11.1'
     compile 'io.github.openfeign:feign-httpclient:11.1'
-    compile 'io.github.openfeign:feign-jackson-jaxb:11.1'
+    compile 'io.github.openfeign:feign-jackson:11.1'
 
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'

settings.gradle

@@ -1,2 +1 @@
-rootProject.name = 'AcproTasks'
-
+rootProject.name = 'AcproTasks'

src/main/java/com/armstrongconsulting/acprotasks/AcproRepository.java

@@ -1,11 +1,12 @@
 package com.armstrongconsulting.acprotasks;
 
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.armstrongconsulting.acprotasks.client.AcproConnector;
+import com.armstrongconsulting.acprotasks.client.model.ItemsContainer;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.tasks.Task;
 import com.intellij.tasks.TaskRepositoryType;
@@ -13,14 +14,12 @@ import com.intellij.tasks.impl.BaseRepository;
 import com.intellij.util.xmlb.annotations.Tag;
 
 import feign.FeignException;
+import lombok.extern.slf4j.Slf4j;
 
 @Tag(AcproRepositoryType.NAME)
+@Slf4j
 public class AcproRepository extends BaseRepository
 {
-    private final Logger logger = LoggerFactory.getLogger(AcproRepository.class);
-
-    private String apiKey = null;
-
     public AcproRepository(TaskRepositoryType type)
     {
         super(type);
@@ -29,7 +28,8 @@ public class AcproRepository extends BaseRepository
     public AcproRepository(AcproRepository other)
     {
         super(other);
-        this.apiKey = other.apiKey;
+        setRepositoryType(other.getRepositoryType());
+        setApiKey(other.getApiKey());
     }
 
     public AcproRepository()
@@ -52,14 +52,22 @@ public class AcproRepository extends BaseRepository
     public Task[] getIssues(@Nullable String query, int offset, int limit, boolean withClosed,
         @NotNull ProgressIndicator cancelled) throws Exception
     {
-        if (apiKey == null)
+        if (StringUtils.isBlank(query))
+        {
+            return new Task[0];
+        }
+
+        ItemsContainer response = AcproConnector.getClient(this).getItems(query, offset, limit);
+        Task[] result = new Task[0];
+        if (response.getItems() != null && response.getItems().getItem() != null)
         {
-            apiKey = AcproConnector.getClient(getUrl()).getApiKey(getUsername(), getPassword(), 28800);
+            result = response.getItems().getItem().stream().map(AcproTask::new).toArray(Task[]::new);
         }
-        return new Task[0];/*AcproConnector.getClient(getUrl()).getItems(query, offset, limit, apiKey).stream().peek(a -> logger.warn(a.toString())).map(AcproTask::new)
-            .toArray(AcproTask[]::new);*/
+        return result;
     }
 
+    private final AcproRepository self = this;
+
     @Override
     public @Nullable CancellableConnection createCancellableConnection()
     {
@@ -68,22 +76,20 @@ public class AcproRepository extends BaseRepository
             @Override
             protected void doTest() throws Exception
             {
+                // do login and set apiKey
                 try
                 {
-                    if (apiKey != null)
-                    {
-                        return;
-                    }
-
-                    apiKey = AcproConnector.getClient(getUrl()).getApiKey(getUsername(), getPassword(), 28800);
+                    setApiKey(
+                        AcproConnector.getClient(self).getApiKey(getUsername(), getPassword()));
+                    log.warn("Fetched api key: {}", getApiKey());
                 }
                 catch (FeignException.Unauthorized e)
                 {
-                    throw new RuntimeException("Wrong username or password");
+                    throw new RuntimeException("Failed to authenticate", e);
                 }
-                catch (FeignException.FeignClientException e)
+                catch (FeignException e)
                 {
-                    throw new RuntimeException("Connection failed");
+                    throw new RuntimeException("Failed to connect to server", e);
                 }
             }
 
@@ -95,9 +101,13 @@ public class AcproRepository extends BaseRepository
         };
     }
 
-    @Override
-    public void initializeRepository()
+    public String getApiKey()
+    {
+        return PropertiesComponent.getInstance().getValue("api_key");
+    }
+
+    public void setApiKey(String apiKey)
     {
-        logger.info("Initialize repository");
+        PropertiesComponent.getInstance().setValue("api_key", apiKey);
     }
 }

src/main/java/com/armstrongconsulting/acprotasks/client/AcproClient.java

@@ -1,6 +1,6 @@
 package com.armstrongconsulting.acprotasks.client;
 
-import com.armstrongconsulting.acprotasks.client.model.Items;
+import com.armstrongconsulting.acprotasks.client.model.ItemsContainer;
 
 import feign.Headers;
 import feign.Param;
@@ -9,11 +9,10 @@ import feign.RequestLine;
 @Headers("Accept: application/json")
 public interface AcproClient
 {
-    @RequestLine("GET /api_key?user={user}&password={password}&expires_after_seconds={expires_after_seconds}")
-    String getApiKey(@Param("user") String user, @Param("password") String password,
-        @Param("expires_after_seconds") Integer timeToLive);
+    @RequestLine("GET /api_key?user={user}&password={password}")
+    String getApiKey(@Param("user") String user, @Param("password") String password);
 
-    @RequestLine("GET /items?q=title:{title}&start={offset}&count={limit}&api_key={apiKey}")
-    Items getItems(@Param("title") String titleContains, @Param("offset") Integer offset,
-        @Param("limit") Integer limit, @Param("apiKey") String apiKey);
+    @RequestLine("GET /items?q=title:{title}&start={offset}&count={limit}")
+    ItemsContainer getItems(@Param("title") String titleContains, @Param("offset") Integer offset,
+        @Param("limit") Integer limit);
 }

src/main/java/com/armstrongconsulting/acprotasks/client/AcproConnector.java

@@ -1,30 +1,128 @@
 package com.armstrongconsulting.acprotasks.client;
 
-import com.sun.istack.NotNull;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import com.armstrongconsulting.acprotasks.AcproRepository;
 
 import feign.Feign;
 import feign.Logger;
+import feign.Response;
+import feign.RetryableException;
+import feign.Retryer;
+import feign.codec.ErrorDecoder;
 import feign.httpclient.ApacheHttpClient;
-import feign.jackson.jaxb.JacksonJaxbJsonDecoder;
-import feign.jackson.jaxb.JacksonJaxbJsonEncoder;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import lombok.extern.slf4j.Slf4j;
 
 public class AcproConnector
 {
     private static AcproClient client;
 
-    public static AcproClient getClient(@NotNull String url)
+    public static AcproClient getClient(@NotNull AcproRepository repository)
     {
         if (client != null)
         {
             return client;
         }
 
-        return Feign.builder()
+        client = Feign.builder()
             .client(new ApacheHttpClient())
-            .encoder(new JacksonJaxbJsonEncoder())
-            .decoder(new JacksonJaxbJsonDecoder())
-            .logger(new Logger.JavaLogger(AcproClient.class))
+            .encoder(new JacksonEncoder())
+            .decoder((response, type) -> {
+                if (type.equals(String.class))
+                {
+                    return IOUtils.toString(response.body().asInputStream(), StandardCharsets.UTF_8.name());
+                }
+                else
+                {
+                    return new JacksonDecoder().decode(response, type);
+                }
+            })
+            .logger(new Logger()
+            {
+                @Override
+                protected void log(String configKey, String format, Object... args)
+                {
+                    System.out.println(String.format(format, args));
+                }
+            })
             .logLevel(Logger.Level.FULL)
-            .target(AcproClient.class, url);
+            .requestInterceptor(
+                requestTemplate -> {
+                    if (!StringUtils.isBlank(repository.getApiKey()))
+                    {
+                        requestTemplate.query("api_key", repository.getApiKey());
+                    }
+                })
+            .errorDecoder(new CustomErrorDecoder())
+            .retryer(new ReauthenticateRetryer(repository))
+            .target(AcproClient.class, repository.getUrl());
+
+        return client;
+    }
+
+    private AcproConnector()
+    {
+    }
+
+    @Slf4j
+    private static class CustomErrorDecoder implements ErrorDecoder
+    {
+        @Override
+        public Exception decode(String methodKey, Response response)
+        {
+            if (response.status() == 401 && !response.request().url().contains("/api_key"))
+            {
+                log.warn("Login expired. Throwing retryable exception.");
+                throw new RetryableException(response.status(), response.reason(), response.request().httpMethod(),
+                    new Date(), response.request());
+            }
+            return new ErrorDecoder.Default().decode(methodKey, response);
+        }
+    }
+
+    @Slf4j
+    private static class ReauthenticateRetryer implements Retryer
+    {
+        private final AcproRepository repository;
+        private boolean retried;
+
+        ReauthenticateRetryer(AcproRepository repository)
+        {
+            this.repository = repository;
+            this.retried = false;
+        }
+
+        ReauthenticateRetryer(ReauthenticateRetryer other)
+        {
+            this.repository = other.repository;
+            this.retried = other.retried;
+        }
+
+        @Override
+        public void continueOrPropagate(RetryableException e)
+        {
+            log.warn("Retrying");
+
+            if (retried)
+            {
+                throw e;
+            }
+
+            repository.setApiKey(client.getApiKey(repository.getUsername(), repository.getPassword()));
+            this.retried = true;
+        }
+
+        @Override
+        public Retryer clone()
+        {
+            return new ReauthenticateRetryer(this);
+        }
     }
 }

src/main/java/com/armstrongconsulting/acprotasks/client/model/Item.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import lombok.ToString;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "actualHours",
@@ -26,6 +28,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
     "unreadByAssignee",
     "urgency"
 })
+@ToString
 public class Item
 {
     @JsonProperty("actualHours")
@@ -294,4 +297,4 @@ public class Item
     {
         this.urgency = urgency;
     }
-}
+}

src/main/java/com/armstrongconsulting/acprotasks/client/model/Items.java

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import lombok.ToString;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
     "@rows",
@@ -14,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
     "@totalNumRows",
     "item"
 })
+@ToString
 public class Items
 {
     @JsonProperty("@rows")

src/main/java/com/armstrongconsulting/acprotasks/client/model/ItemsContainer.java

@@ -0,0 +1,30 @@
+package com.armstrongconsulting.acprotasks.client.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import lombok.ToString;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "items"
+})
+@ToString
+public class ItemsContainer
+{
+    @JsonProperty("items")
+    private Items items;
+
+    @JsonProperty("items")
+    public Items getItems()
+    {
+        return items;
+    }
+
+    @JsonProperty("items")
+    public void setItems(Items items)
+    {
+        this.items = items;
+    }
+}