From 1f743019357150c7cd8e346c52346afeb6470f9d Mon Sep 17 00:00:00 2001
From: Alex Gryczewski <agryczewski@outlook.com>
Date: Mon, 31 Jul 2023 10:22:47 -0400
Subject: [PATCH] Sidelined Google Cloud integration for local config

---
 src/main/java/dev/salmonllama/fsbot/Main.java       | 10 ++++++----
 .../dev/salmonllama/fsbot/config/BotConfig.java     | 13 ++++++++++++-
 .../fsbot/endpoints/imgur/ImgurAPIConnection.java   | 10 +++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/dev/salmonllama/fsbot/Main.java b/src/main/java/dev/salmonllama/fsbot/Main.java
index 5015f44..e142343 100644
--- a/src/main/java/dev/salmonllama/fsbot/Main.java
+++ b/src/main/java/dev/salmonllama/fsbot/Main.java
@@ -5,7 +5,7 @@
 package dev.salmonllama.fsbot;
 
 import dev.salmonllama.fsbot.config.BotConfig;
-import dev.salmonllama.fsbot.config.SecretManager;
+// import dev.salmonllama.fsbot.config.SecretManager;
 import dev.salmonllama.fsbot.database.FSDB;
 import dev.salmonllama.fsbot.guthix.Guthix;
 import dev.salmonllama.fsbot.listeners.*;
@@ -25,18 +25,20 @@ public class Main {
     private final static Logger logger = LoggerFactory.getLogger(Main.class);
 
     public static void main(String[] args) {
-        BotConfig.initConfig(Constants.BOT_FOLDER, false); // TODO: Sunset the bot config once and for all
+        BotConfig.initConfig(Constants.BOT_FOLDER, false);
 
         FSDB.init();
 
         String token;
         if (System.getenv("ENVIRONMENT") != null)
         {
-            token = SecretManager.DISCORD_TOKEN_PROD.getPlainText();
+            token = BotConfig.BOT_TOKEN_PROD;
+            // token = SecretManager.DISCORD_TOKEN_PROD.getPlainText();
         }
         else
         {
-            token = SecretManager.DISCORD_TOKEN.getPlainText();
+            token = BotConfig.BOT_TOKEN_DEV;
+            // token = SecretManager.DISCORD_TOKEN.getPlainText();
         }
 
         new DiscordApiBuilder().addIntents(Intent.MESSAGE_CONTENT).setToken(token).login().thenAccept(api -> {
diff --git a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
index b73dd74..d4b3f33 100644
--- a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
+++ b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
@@ -9,7 +9,6 @@ import com.kaaz.configuration.ConfigurationBuilder;
 import com.kaaz.configuration.ConfigurationOption;
 import dev.salmonllama.fsbot.utilities.Constants;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -74,6 +73,18 @@ public class BotConfig {
     @ConfigurationOption
     public static String HOME_SERVER = "Home server here";
 
+    @ConfigurationOption
+    public static String BOT_TOKEN_DEV = "bot token here";
+
+    @ConfigurationOption
+    public static String BOT_TOKEN_PROD = "production token here";
+
+    @ConfigurationOption
+    public static String IMGUR_BEARER = "Bearer token here";
+
+    @ConfigurationOption
+    public static String IMGUR_CLIENT = "client ID here";
+
     public static void initConfig(Path filePath, boolean cleanfile) {
         try {
             new ConfigurationBuilder(BotConfig.class, Paths.get(filePath.toString(), Constants.CONFIG_NAME) .toFile()).build(cleanfile);
diff --git a/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java b/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java
index 3b43285..a311969 100644
--- a/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java
+++ b/src/main/java/dev/salmonllama/fsbot/endpoints/imgur/ImgurAPIConnection.java
@@ -4,10 +4,12 @@
 
 package dev.salmonllama.fsbot.endpoints.imgur;
 
-import dev.salmonllama.fsbot.config.SecretManager;
+//import dev.salmonllama.fsbot.config.SecretManager;
 import okhttp3.*;
 import org.json.JSONObject;
 
+import dev.salmonllama.fsbot.config.BotConfig;
+
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 
@@ -22,8 +24,10 @@ public class ImgurAPIConnection {
     private final Request.Builder requestBuilder;
 
     public ImgurAPIConnection() {
-        CLIENT_ID = SecretManager.IMGUR_ID.getPlainText();
-        BEARER_TOKEN = SecretManager.IMGUR_BEARER.getPlainText();
+        CLIENT_ID = BotConfig.IMGUR_CLIENT;
+        BEARER_TOKEN = BotConfig.IMGUR_BEARER;
+        // CLIENT_ID = SecretManager.IMGUR_ID.getPlainText();
+        // BEARER_TOKEN = SecretManager.IMGUR_BEARER.getPlainText();
 
         client = new OkHttpClient().newBuilder().build();
         requestBuilder = new Request.Builder();