Browse Source

fix account_registration test

tags/v0.12.9
Jonathan Cobb 4 years ago
parent
commit
aece06b4bb
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java
  2. +1
    -1
      bubble-server/src/test/resources/models/tests/auth/account_registration.json

+ 5
- 0
bubble-server/src/main/java/bubble/resources/cloud/NetworksResource.java View File

@@ -29,6 +29,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import java.util.List;
import java.util.stream.Collectors;
@@ -61,6 +62,10 @@ public class NetworksResource extends AccountOwnedResource<BubbleNetwork, Bubble
if (caller.admin() && this.domain != null) {
return getDao().findAllByDomain(this.domain.getUuid());
} else {
if (caller.admin()) {
final MultivaluedMap<String, String> params = ctx.getUriInfo().getQueryParameters();
if (Boolean.parseBoolean(params.getFirst("all"))) return super.list(ctx);
}
return super.list(ctx).stream()
.filter(BubbleNetwork::isNotRootNetwork)
.filter(net -> accountPlanDAO.isNotDeleted(net.getUuid()))


+ 1
- 1
bubble-server/src/test/resources/models/tests/auth/account_registration.json View File

@@ -1,7 +1,7 @@
[
{
"comment": "lookup networks",
"request": { "uri": "me/networks" },
"request": { "uri": "me/networks?all=true" },
"response": {
"store": "networks",
"check": [ {"condition": "json.length >= 1"} ]


Loading…
Cancel
Save