Stable Version 1.0.1 Release

Physical-Science-Academy · May 9, 2023 · 38bc267 · 38bc267
1 parent 03bb77a
commit 38bc267
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.cimeyclust.ncpwebserver</groupId>
   <artifactId>NCPWebserver</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <build>
     <defaultGoal>clean package</defaultGoal>
     <resources>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.cimeyclust.ncpwebserver</groupId>
     <artifactId>NCPWebserver</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/com/cimeyclust/ncpwebserver/HttpServer.java b/src/main/java/com/cimeyclust/ncpwebserver/HttpServer.java
@@ -128,19 +128,13 @@ public Response serve(IHTTPSession session) {
                 break;
 
             default:
-                if (!isAuthenticated(session)) {
-                    code = 401;
-                    responseBody = "{\"message\": \"Not authenticated!\"}";
-                    break;
-                }
                 Response staticFileResponse = serveStaticFiles(session, new File(webapp.getPath()));
                 if (staticFileResponse != null) {
                     return staticFileResponse;
                 }
         }
 
-        Response response = newFixedLengthResponse(Response.Status.lookup(code), "application/json", responseBody);
-        return response;
+        return newFixedLengthResponse(Response.Status.lookup(code), "application/json", responseBody);
     }
 
     private boolean isAuthenticated(IHTTPSession session) {

diff --git a/src/main/java/com/cimeyclust/ncpwebserver/Plugin.java b/src/main/java/com/cimeyclust/ncpwebserver/Plugin.java
@@ -49,7 +49,7 @@ public void onLoad() {
         config = new Config(getDataFolder() + "/config.yml", Config.YAML);
         if (Objects.equals(config.getString("secret"), "SECRET")) {
             // Random String as Value for the issuer key
-            config.set("issuer", UUID.randomUUID().toString());
+            config.set("secret", UUID.randomUUID().toString());
             config.save();
         }
 

diff --git a/webapp/package.json b/webapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webapp",
   "private": false,
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
@@ -126,13 +126,13 @@ export const App: React.FC = () => {
                 p: 1,
                 mt: 2
             }}>
-                {active === "modules" && (
+                {(active === "modules" && !unauthenticated) && (
                     <Modules setError={setError} setSuccess={setSuccess} setUnauthenticated={() => setUnauthenticated(true)}/>
                 )}
-                {active === "players" && (
+                {(active === "players" && !unauthenticated) && (
                     <Players setError={setError} setSuccess={setSuccess} setUnauthenticated={() => setUnauthenticated(true)}/>
                 )}
-                {active === "banlist" && (
+                {(active === "banlist" && !unauthenticated) && (
                     <BanList setError={setError} setSuccess={setSuccess} setUnauthenticated={() => setUnauthenticated(true)}/>
                 )}
             </Container>
@@ -234,6 +234,8 @@ export const App: React.FC = () => {
                         setLoginFailed(false);
                         login(username, password).then(() => {
                             setLoading(false);
+                            setLoginFailed(false);
+                            setUnauthenticated(false);
                         }).catch((error) => {
                             setLoading(false);
                             setLoginFailed(true);