From 274db7ddf71e46675dbdb1c41d31d0d201c01c57 Mon Sep 17 00:00:00 2001
From: James Quinley <jsquinley@gmail.com>
Date: Thu, 13 Oct 2022 21:06:10 -0700
Subject: [PATCH] Tweaks error messages, as file path shows on exr

---
 .../AOTSK_Login_Delegation_Server_jar.xml     | 32 +++++++++----------
 .../delegationServices.java                   | 11 +++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml b/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml
index cbc2ce4..e03d7e0 100644
--- a/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml
+++ b/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml
@@ -1,25 +1,25 @@
 <component name="ArtifactManager">
   <artifact type="jar" build-on-make="true" name="AOTSK-Login-Delegation-Server:jar">
     <output-path>$PROJECT_DIR$/out/artifacts/AOTSK_Login_Delegation_Server_jar</output-path>
-    <root id="archive" name="Server_US.jar">
+    <root id="archive" name="AOTSK-Login-Delegation-Server.jar">
       <element id="module-output" name="AOTSK-Login-Delegation-Server" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.6.2/javax.mail-api-1.6.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jfoenix/jfoenix/8.0.10/jfoenix-8.0.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/controlsfx/controlsfx/11.1.1/controlsfx-11.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.2/javax.mail-1.6.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.14.2/jsoup-1.14.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/lingala/zip4j/zip4j/2.6.1/zip4j-2.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/bson/4.3.2/bson-4.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/4.3.2/mongodb-driver-core-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.2/javax.mail-1.6.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.3.2/mongodb-driver-sync-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jfoenix/jfoenix/8.0.10/jfoenix-8.0.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/4.3.2/mongodb-driver-core-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.14.2/jsoup-1.14.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/lingala/zip4j/zip4j/2.6.1/zip4j-2.6.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/controlsfx/controlsfx/11.1.1/controlsfx-11.1.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/bson/4.3.2/bson-4.3.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.6.2/javax.mail-api-1.6.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index 56eca87..a75df6a 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -1413,13 +1413,12 @@ public class delegationServices {
                                 String policyDocument;
                                 try
                                 {
-                                    File homedir = new File(System.getProperty("user.home"));
-                                    policyDocument  = Files.readString(Path.of(homedir + "/ocs/policy/launcher/legal/eula.txt"));
+                                    policyDocument  = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt"));
                                 }
                                 catch (Exception EXR)
                                 {
                                 System.out.println("Unable to pull file, fallback.");
-                                policyDocument = "Policy file does not exist on server. (Unable to find file in /ocs/policy/launcher/legal/accountagreement.txt) This is an issue on our end. Error ID: " + EXR;
+                                policyDocument = "Policy file does not exist on server. This is an issue on our end. Error ID: " + EXR;
                                 }
 
                                 BasicDBObject updateQuery = new BasicDBObject();
@@ -1444,13 +1443,13 @@ public class delegationServices {
                                 String policyDocument;
                                 try
                                 {
-                                    File homedir = new File(System.getProperty("user.home"));
-                                    policyDocument  = Files.readString(Path.of(homedir + "/ocs/policy/launcher/legal/eula.txt"));
+                                   // File homedir = new File(System.getProperty("user.home"));
+                                    policyDocument  = Files.readString(Path.of(System.getProperty("user.home") + "/ocs/policy/launcher/legal/eula.txt"));
                                 }
                                 catch (Exception EXR)
                                 {
                                     System.out.println("Unable to pull file, fallback.");
-                                    policyDocument = "Policy file does not exist on server. (Unable to find file in /ocs/policy/launcher/legal/accountagreement.txt) This is an issue on our end. Error ID: " + EXR;
+                                    policyDocument = "Policy file does not exist on server. This is an issue on our end. Error ID: " + EXR;
                                 }
 
                                 BasicDBObject updateQuery = new BasicDBObject();