From 1eedc755ea31872067bcad5be2654f445c88c3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Wed, 29 Nov 2017 00:36:59 +0100 Subject: [PATCH] Remove Authorization scope --- .../java/org/shredzone/acme4j/Authorization.java | 15 --------------- .../org/shredzone/acme4j/AuthorizationTest.java | 1 - .../json/updateAuthorizationResponse.json | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java index b621804e..dc850db5 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java @@ -43,7 +43,6 @@ public class Authorization extends AcmeResource { private String domain; private Status status; private Instant expires; - private Order scope; private List challenges; private boolean loaded = false; @@ -90,15 +89,6 @@ public class Authorization extends AcmeResource { return expires; } - /** - * Gets the scope of the {@link Authorization}. If not {@code null}, this - * {@link Authorization} is only valid for the returned {@link Order}. - */ - public Order getScope() { - load(); - return scope; - } - /** * Gets a list of all challenges offered by the server. */ @@ -204,11 +194,6 @@ public class Authorization extends AcmeResource { domain = jsonIdentifier.get("value").asString(); } - URL scopeUrl = json.get("scope").asURL(); - if (scopeUrl != null) { - scope = Order.bind(getSession(), scopeUrl); - } - challenges = fetchChallenges(json); loaded = true; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java index 3bbb2cb2..0c4d844b 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -126,7 +126,6 @@ public class AuthorizationTest { assertThat(auth.getStatus(), is(Status.VALID)); assertThat(auth.getExpires(), is(parseTimestamp("2016-01-02T17:12:40Z"))); assertThat(auth.getLocation(), is(locationUrl)); - assertThat(auth.getScope().getLocation(), is(url("https://example.com/order/123"))); assertThat(auth.getChallenges(), containsInAnyOrder( (Challenge) httpChallenge, (Challenge) dnsChallenge)); diff --git a/acme4j-client/src/test/resources/json/updateAuthorizationResponse.json b/acme4j-client/src/test/resources/json/updateAuthorizationResponse.json index e50c5322..36f18ed8 100644 --- a/acme4j-client/src/test/resources/json/updateAuthorizationResponse.json +++ b/acme4j-client/src/test/resources/json/updateAuthorizationResponse.json @@ -18,6 +18,5 @@ "url": "https://example.com/authz/asdf/1", "token": "DGyRejmCefe7v4NfDGDKfA" } - ], - "scope": "https://example.com/order/123" + ] }