Merge pull request #1 from remcowesterhoud/website_support

Website support

Author: remcowesterhoud

src/main/java/com/westerhoud/osrs/taskman/TaskmanConfig.java

@@ -1,32 +1,80 @@
 package com.westerhoud.osrs.taskman;
 
+import com.westerhoud.osrs.taskman.domain.TaskSource;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.ConfigSection;
 
 @ConfigGroup("taskman")
 public interface TaskmanConfig extends Config {
-  @ConfigItem(
+
+  @ConfigSection(
+      name = "Spreadsheet",
+      description = "Spreadsheet configuration",
       position = 1,
+      closedByDefault = true)
+  String spreadsheet = "spreadsheet";
+
+  @ConfigSection(
+      name = "Website",
+      description = "Website configuration",
+      position = 2,
+      closedByDefault = true)
+  String website = "website";
+
+  @ConfigItem(
+      position = 0,
+      keyName = "taskSource",
+      name = "Task source",
+      description = "Spreadsheet or website")
+  default TaskSource taskSource() {
+    return TaskSource.SPREADSHEET;
+  }
+
+  @ConfigItem(
+      position = 3,
       keyName = "key",
       name = "Spreadsheet key",
-      description = "The key of your spreadsheet")
+      description = "The key of your spreadsheet",
+      section = spreadsheet)
   default String spreadsheetKey() {
     return "";
   }
 
   @ConfigItem(
-      position = 2,
+      position = 4,
       keyName = "passphrase",
       name = "Passphrase",
       secret = true,
-      description = "The passphrase you have added in your sheet")
+      description = "The passphrase you have added in your sheet",
+      section = spreadsheet)
   default String passphrase() {
     return "";
   }
 
   @ConfigItem(
-      position = 2,
+      position = 5,
+      keyName = "websiteUsername",
+      name = "Username",
+      description = "Website username",
+      section = website)
+  default String websiteUsername() {
+    return "username";
+  }
+
+  @ConfigItem(
+      position = 6,
+      keyName = "websitePassword",
+      name = "Password",
+      description = "Website password",
+      section = website)
+  default String websitePassword() {
+    return "password";
+  }
+
+  @ConfigItem(
+      position = 7,
       keyName = "showOverlay",
       name = "Show current task overlay",
       description = "Adds an overlay displaying the current task to the game client")

src/main/java/com/westerhoud/osrs/taskman/TaskmanPlugin.java

@@ -4,7 +4,7 @@
 import com.westerhoud.osrs.taskman.domain.AccountCredentials;
 import com.westerhoud.osrs.taskman.domain.AccountProgress;
 import com.westerhoud.osrs.taskman.domain.Task;
-import com.westerhoud.osrs.taskman.service.SheetService;
+import com.westerhoud.osrs.taskman.service.TaskService;
 import com.westerhoud.osrs.taskman.ui.CurrentTaskOverlay;
 import com.westerhoud.osrs.taskman.ui.TaskmanPluginPanel;
 import java.awt.image.BufferedImage;
@@ -36,15 +36,15 @@ public class TaskmanPlugin extends Plugin {
   @Inject private CurrentTaskOverlay currentTaskOverlay;
 
   private TaskmanPluginPanel sidePanel;
-  private SheetService sheetService;
+  private TaskService taskService;
   private NavigationButton navigationButton;
 
   @Override
   protected void startUp() throws Exception {
     // Sidebar
     final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "icon.png");
 
-    sheetService = new SheetService(okHttpClient);
+    taskService = new TaskService(okHttpClient);
 
     sidePanel = new TaskmanPluginPanel(this);
     navigationButton =
@@ -66,29 +66,38 @@ protected void shutDown() throws Exception {
   }
 
   public Task getCurrentTask() throws Exception {
-    final Task task = sheetService.getCurrentTask(getCredentials().getIdentifier());
+    final Task task = taskService.getCurrentTask(getCredentials());
     currentTaskOverlay.setTask(task);
     return task;
   }
 
   public Task generateTask() throws Exception {
-    final Task task = sheetService.generateTask(getCredentials());
+    final Task task = taskService.generateTask(getCredentials());
     currentTaskOverlay.setTask(task);
     return task;
   }
 
   public Task completeTask() throws Exception {
-    final Task task = sheetService.completeTask(getCredentials());
+    final Task task = taskService.completeTask(getCredentials());
     currentTaskOverlay.setTask(task);
     return task;
   }
 
   public AccountProgress progress() throws Exception {
-    return sheetService.getAccountProgress(getCredentials().getIdentifier());
+    return taskService.getAccountProgress(getCredentials());
   }
 
   private AccountCredentials getCredentials() {
-    return new AccountCredentials(config.spreadsheetKey(), config.passphrase());
+    switch (config.taskSource()) {
+      case SPREADSHEET:
+        return new AccountCredentials(
+            config.spreadsheetKey(), config.passphrase(), config.taskSource());
+      case WEBSITE:
+        return new AccountCredentials(
+            config.websiteUsername(), config.websitePassword(), config.taskSource());
+      default:
+        throw new IllegalArgumentException("No task source selected in config.");
+    }
   }
 
   @Subscribe

src/main/java/com/westerhoud/osrs/taskman/api/TaskService.java

@@ -7,11 +7,11 @@
 
 public interface TaskService {
 
-  Task getCurrentTask(final String identifier) throws IOException;
+  Task getCurrentTask(final AccountCredentials credentials) throws IOException;
 
   Task generateTask(final AccountCredentials credentials) throws IOException;
 
   Task completeTask(final AccountCredentials credentials) throws IOException;
 
-  AccountProgress getAccountProgress(final String identifier) throws IOException;
+  AccountProgress getAccountProgress(final AccountCredentials credentials) throws IOException;
 }

src/main/java/com/westerhoud/osrs/taskman/domain/AccountCredentials.java

@@ -9,4 +9,13 @@ public class AccountCredentials {
 
   final String identifier;
   final String password;
+  final TaskSource source;
+
+  public boolean isValid() {
+    return identifier != null
+        && !identifier.isEmpty()
+        && password != null
+        && !password.isEmpty()
+        && source != null;
+  }
 }

src/main/java/com/westerhoud/osrs/taskman/domain/SheetRequestBody.java

@@ -0,0 +1,6 @@
+package com.westerhoud.osrs.taskman.domain;
+
+public enum TaskSource {
+  SPREADSHEET,
+  WEBSITE
+}

src/main/java/com/westerhoud/osrs/taskman/domain/TaskSource.java

@@ -1,11 +1,9 @@
 package com.westerhoud.osrs.taskman.service;
 
 import com.google.gson.Gson;
-import com.westerhoud.osrs.taskman.api.TaskService;
 import com.westerhoud.osrs.taskman.domain.AccountCredentials;
 import com.westerhoud.osrs.taskman.domain.AccountProgress;
 import com.westerhoud.osrs.taskman.domain.ErrorResponse;
-import com.westerhoud.osrs.taskman.domain.SheetRequestBody;
 import com.westerhoud.osrs.taskman.domain.Task;
 import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
@@ -16,17 +14,20 @@
 import okhttp3.Response;
 
 @Slf4j
-public class SheetService implements TaskService {
+public class TaskService implements com.westerhoud.osrs.taskman.api.TaskService {
 
-  private static final String BASE_URL = "https://osrs-taskman.herokuapp.com/sheet";
+  public static final String TASKMAN_IDENTIFIER_HEADER = "x-taskman-identifier";
+  public static final String TASKMAN_PASSWORD_HEADER = "x-taskman-password";
+  public static final String TASKMAN_SOURCE_HEADER = "x-taskman-source";
+  private static final String BASE_URL = "https://osrs-taskman.herokuapp.com/task";
   private final OkHttpClient client;
   private final Gson gson;
   private final String currentUrl;
   private final String generateUrl;
   private final String completeUrl;
   private final String progressUrl;
 
-  public SheetService(final OkHttpClient okHttpClient) {
+  public TaskService(final OkHttpClient okHttpClient) {
     client = okHttpClient;
     gson = new Gson();
     currentUrl = BASE_URL + "/current";
@@ -36,14 +37,20 @@ public SheetService(final OkHttpClient okHttpClient) {
   }
 
   @Override
-  public Task getCurrentTask(final String key) throws IOException {
-    if (key == null || key.isEmpty()) {
+  public Task getCurrentTask(final AccountCredentials credentials) throws IOException {
+    if (!credentials.isValid()) {
       throw new IllegalArgumentException(
-          "Please set your username / spreadsheet key in the plugin configurations");
+          "Please configure your credentials in the plugin configurations");
     }
 
     final Request request =
-        new Request.Builder().url(String.format("%s?key=%s", currentUrl, key)).get().build();
+        new Request.Builder()
+            .url(currentUrl)
+            .addHeader(TASKMAN_IDENTIFIER_HEADER, credentials.getIdentifier())
+            .addHeader(TASKMAN_PASSWORD_HEADER, credentials.getPassword())
+            .addHeader(TASKMAN_SOURCE_HEADER, credentials.getSource().name())
+            .get()
+            .build();
 
     return executeRequest(request);
   }
@@ -54,7 +61,8 @@ public Task generateTask(final AccountCredentials credentials) throws IOExceptio
         new Request.Builder()
             .url(generateUrl)
             .header("Content-Type", "application/json")
-            .post(getRequestBody(credentials.getIdentifier(), credentials.getPassword()))
+            .addHeader(TASKMAN_SOURCE_HEADER, credentials.getSource().name())
+            .post(getRequestBody(credentials))
             .build();
     return executeRequest(request);
   }
@@ -65,20 +73,28 @@ public Task completeTask(final AccountCredentials credentials) throws IOExceptio
         new Request.Builder()
             .url(completeUrl)
             .header("Content-Type", "application/json")
-            .post(getRequestBody(credentials.getIdentifier(), credentials.getPassword()))
+            .addHeader(TASKMAN_SOURCE_HEADER, credentials.getSource().name())
+            .post(getRequestBody(credentials))
             .build();
     return executeRequest(request);
   }
 
   @Override
-  public AccountProgress getAccountProgress(final String key) throws IOException {
-    if (key == null || key.isEmpty()) {
+  public AccountProgress getAccountProgress(final AccountCredentials credentials)
+      throws IOException {
+    if (!credentials.isValid()) {
       throw new IllegalArgumentException(
           "Please set your username / spreadsheet key in the plugin configurations");
     }
 
     final Request request =
-        new Request.Builder().url(String.format("%s?key=%s", progressUrl, key)).get().build();
+        new Request.Builder()
+            .url(progressUrl)
+            .addHeader(TASKMAN_IDENTIFIER_HEADER, credentials.getIdentifier())
+            .addHeader(TASKMAN_PASSWORD_HEADER, credentials.getPassword())
+            .addHeader(TASKMAN_SOURCE_HEADER, credentials.getSource().name())
+            .get()
+            .build();
 
     final Response response = client.newCall(request).execute();
 
@@ -90,9 +106,8 @@ public AccountProgress getAccountProgress(final String key) throws IOException {
     throw new IllegalArgumentException(error.getMessage());
   }
 
-  private RequestBody getRequestBody(final String key, final String passphrase) {
-    final SheetRequestBody body = new SheetRequestBody(key, passphrase);
-    return RequestBody.create(MediaType.parse("application/json"), gson.toJson(body));
+  private RequestBody getRequestBody(final AccountCredentials credentials) {
+    return RequestBody.create(MediaType.parse("application/json"), gson.toJson(credentials));
   }
 
   private Task executeRequest(final Request request) throws IOException {