From 01ce83f1cbdbee9565261a814cdf1810f190ceba Mon Sep 17 00:00:00 2001
From: Kristijan Mitrovic <kris@noreply.git.bubblev.org>
Date: Thu, 6 Aug 2020 13:42:35 +0000
Subject: [PATCH] Move Log Flag API calls to network resource (#40)

Merge branch 'master' into kris/move_log_flag_api_calls

Add network ID in all log flag API calls

Move Log Flag API calls to network resource

Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org>
Co-authored-by: Kristijan Mitrovic <kmitrovic@itekako.com>
Reviewed-on: https://git.bubblev.org/bubblev/bubble/pulls/40
---
 .../bubble/resources/cloud/NetworksResource.java     | 12 ++++++++++++
 .../java/bubble/resources/cloud/NodesResource.java   |  6 ------
 bubble-web                                           |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java b/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
index 40896d28..50fef760 100644
--- a/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
+++ b/bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
@@ -217,4 +217,16 @@ public class NetworksResource extends AccountOwnedResource<BubbleNetwork, Bubble
         return configuration.subResource(BackupsResource.class, account, network);
     }
 
+    @Path("/{id}" + EP_LOGS)
+    @NonNull public LogsResource getLogs(@NonNull @Context final ContainerRequest ctx,
+                                         @NonNull @PathParam("id") String id) {
+        final var network = find(ctx, id);
+        if (network == null) throw notFoundEx(id);
+
+        // only available for this (current) network
+        if (!configuration.getThisNetwork().getUuid().equals(network.getUuid())) throw forbiddenEx();
+
+        final Account caller = userPrincipal(ctx);
+        return configuration.subResource(LogsResource.class, caller);
+    }
 }
diff --git a/bubble-server/src/main/java/bubble/resources/cloud/NodesResource.java b/bubble-server/src/main/java/bubble/resources/cloud/NodesResource.java
index c1c71de3..56bbbaf6 100644
--- a/bubble-server/src/main/java/bubble/resources/cloud/NodesResource.java
+++ b/bubble-server/src/main/java/bubble/resources/cloud/NodesResource.java
@@ -85,10 +85,4 @@ public class NodesResource extends ReadOnlyAccountOwnedResource<BubbleNode, Bubb
         return configuration.subResource(NodeManagerResource.class, node);
     }
 
-    @Path(EP_LOGS)
-    public LogsResource getLogs(@NonNull @Context final ContainerRequest ctx, @PathParam("id") String id) {
-        final Account caller = userPrincipal(ctx);
-        return configuration.subResource(LogsResource.class, caller);
-    }
-
 }
diff --git a/bubble-web b/bubble-web
index 35d92182..24a0dc8f 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 35d921827a1fd83361d68c2554d42a7686216b39
+Subproject commit 24a0dc8f23304dd689a0e1420ca879e2e2147ff0