Bug 512778 - [USS] Update to revised server scopes
Now using uss_retrieve and uss_update scopes.
Change-Id: Idd8fb2401e43204070864e70647101f92c1a31ab
diff --git a/org.eclipse.userstorage.oauth.tests/src/org/eclipse/userstorage/oauth/AuthTokenTest.java b/org.eclipse.userstorage.oauth.tests/src/org/eclipse/userstorage/oauth/AuthTokenTest.java
index 18ad537..5ca627e 100644
--- a/org.eclipse.userstorage.oauth.tests/src/org/eclipse/userstorage/oauth/AuthTokenTest.java
+++ b/org.eclipse.userstorage.oauth.tests/src/org/eclipse/userstorage/oauth/AuthTokenTest.java
@@ -17,12 +17,12 @@
@Test
public void testDeserialization() {
String serializedForm = "{\"access_token\":\"a8f8a49232520e7d621b1ae1235a35665e27344d\","
- + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_all_retrieve\","
+ + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_retrieve\","
+ "\"_expires_\":\"Mon, 07 Nov 2016 22:19:17 GMT\"}";
AuthToken token = AuthToken.deserialize(serializedForm);
assertEquals("a8f8a49232520e7d621b1ae1235a35665e27344d", token.getAccessToken());
assertEquals("Bearer", token.getTokenType());
- assertEquals(new HashSet<String>(Collections.singleton("uss_all_retrieve")), token.getScopes());
+ assertEquals(new HashSet<String>(Collections.singleton("uss_retrieve")), token.getScopes());
assertNull(token.getRefreshToken());
assertTrue(token.isExpired());
}
@@ -40,7 +40,7 @@
@Test
public void testReserialization() throws IllegalArgumentException, IOException {
String serializedForm = "{\"access_token\":\"a8f8a49232520e7d621b1ae1235a35665e27344d\","
- + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_all_retrieve\","
+ + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_retrieve\","
+ "\"_expires_\":\"Mon, 07 Nov 2016 22:19:17 GMT\"}";
AuthToken original = AuthToken.deserialize(serializedForm);
AuthToken reserialized = AuthToken.deserialize(original.serialize());
@@ -54,7 +54,7 @@
@Test
public void testNeverExpires() {
String serializedForm = "{\"access_token\":\"a8f8a49232520e7d621b1ae1235a35665e27344d\","
- + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_all_retrieve\"}";
+ + "\"token_type\":\"Bearer\"," + "\"scope\":\"uss_retrieve\"}";
AuthToken token = AuthToken.deserialize(serializedForm);
assertFalse(token.isExpired());
}
diff --git a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/AuthToken.java b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/AuthToken.java
index 6b52d63..114cc32 100644
--- a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/AuthToken.java
+++ b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/internal/oauth/AuthToken.java
@@ -35,7 +35,7 @@
// "access_token":"06f965eefeac977ea132fff0afcc396639ada8d6",
// "expires_in":"3600",
// "token_type":"Bearer",
- // "scope":"uss_all_retrieve",
+ // "scope":"uss_retrieve",
// "refresh_token":"83f14719ffcf3f5b82825f4bda93c2e5f3e896cc"
// }
diff --git a/org.eclipse.userstorage.sdk/src/org/eclipse/userstorage/sdk/browser/USSBrowsingView.java b/org.eclipse.userstorage.sdk/src/org/eclipse/userstorage/sdk/browser/USSBrowsingView.java
index 8589ab6..e6af2c0 100644
--- a/org.eclipse.userstorage.sdk/src/org/eclipse/userstorage/sdk/browser/USSBrowsingView.java
+++ b/org.eclipse.userstorage.sdk/src/org/eclipse/userstorage/sdk/browser/USSBrowsingView.java
@@ -92,7 +92,7 @@
oauthClientId = Constants.getOAuthClientId();
oauthClientSecret = Constants.getOAuthClientSecret();
// "profile": the user personal identification information
- oauthScopes = new String[] { "profile", "uss_all_retrieve", };
+ oauthScopes = new String[] { "profile", "uss_retrieve", };
oauthExpectedCallback = new URI("http://localhost/");
refresh();
} catch (URISyntaxException e) {
