commit 98dacdf1c13326fd0a55a76bfc8e9296986cffa3
author Brian de Alwis <bsd@mt.ca> Mon Dec 05 12:03:33 2016 -0500
committer Brian de Alwis <bsd@mt.ca> Mon Dec 05 12:03:33 2016 -0500
tree 1842abc3dc801676da7ecbfd3756aae03698ecde
parent 9098256c553d324e273fe8365e30a22938d96379

Bug 482820 - [OAuth] Minor code cleanup in EclipseOAuthCredentialsProvider

Change-Id: I154ba44ec253b1384a5a42f9019ac1fcc11e50f4

org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/oauth/EclipseOAuthCredentialsProvider.java

diff --git a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/oauth/EclipseOAuthCredentialsProvider.java b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/oauth/EclipseOAuthCredentialsProvider.java
index e05c678..292a959 100644
--- a/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/oauth/EclipseOAuthCredentialsProvider.java
+++ b/org.eclipse.userstorage.oauth/src/org/eclipse/userstorage/oauth/EclipseOAuthCredentialsProvider.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.userstorage.IStorageService;
 import org.eclipse.userstorage.internal.Activator;
+import org.eclipse.userstorage.internal.Session;
 import org.eclipse.userstorage.internal.oauth.AuthToken;
 import org.eclipse.userstorage.internal.oauth.OAuthCredentialsPersistence;
 import org.eclipse.userstorage.internal.oauth.UIFacade;
@@ -74,6 +75,8 @@
  */
 public final class EclipseOAuthCredentialsProvider extends OAuthCredentialsProvider
 {
+  private static final String AUTHORIZATION = "Authorization";
+
   private static final boolean DEBUG = Boolean.getBoolean("org.eclipse.userstorage.session.debug");
 
   private static final String PLUGIN_ID = "org.eclipse.userstorage.oauth";
@@ -203,7 +206,7 @@
   public Request configureRequest(Request request, URI uri, Credentials credentials)
   {
     AuthToken token = AuthToken.deserialize(credentials.getPassword());
-    return request.addHeader("Authorization", token.getTokenType() + " " + token.getAccessToken());
+    return request.addHeader(AUTHORIZATION, token.getTokenType() + " " + token.getAccessToken());
   }
 
   @Override
@@ -295,10 +298,10 @@
       refreshURI = new URIBuilder(service.getServiceURI()).setPath("/account/profile").build();
       //@formatter:off
       Request request = Request.Get(refreshURI)
-          .addHeader("Accept", ContentType.APPLICATION_JSON.getMimeType())
-          .addHeader("Content-Type", ContentType.APPLICATION_JSON.getMimeType())
-          .addHeader("User-Agent", "uss/1.0.0")
-          .addHeader("Authorization", token.getTokenType() + " " + token.getAccessToken());
+          .addHeader(Session.ACCEPT, ContentType.APPLICATION_JSON.getMimeType())
+          .addHeader(Session.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType())
+          .addHeader(Session.USER_AGENT, Session.USER_AGENT_ID)
+          .addHeader(AUTHORIZATION, token.getTokenType() + " " + token.getAccessToken());
       //@formatter:on
       Response result = ProxyUtil.proxyAuthentication(executor, refreshURI).execute(request);
       HttpResponse response = result.returnResponse();
@@ -316,15 +319,15 @@
     }
     catch (URISyntaxException ex)
     {
-      ex.printStackTrace();
+      log(IStatus.WARNING, "Unable to construct remote URI", ex);
     }
     catch (ClientProtocolException ex)
     {
-      ex.printStackTrace();
+      log(IStatus.WARNING, "Unable to request user profile information", ex);
     }
     catch (IOException ex)
     {
-      ex.printStackTrace();
+      log(IStatus.WARNING, "Unable to parse user profile information", ex);
     }
     return null;
   }