1: Create XING Connector

Task-Url: http://github.com/keilw/agorava-xing/issues/issue/1

agorava-core-api/src/main/java/org/agorava/AgoravaConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Agorava
+ * Copyright 2016 Agorava
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
  * This interface contains OAuth and other Agorava constants
  *
  * @author Antoine Sabot-Durand
+ * @author Werner Keil
  */
 public interface AgoravaConstants {
     /**
@@ -130,7 +131,12 @@ public interface AgoravaConstants {
      * Return code field name in OAuth request
      */
     String CODE = "code";
-
+
+    /**
+     * Return grant type in OAuth request
+     */
+    String GRANT_TYPE = "grant_type";
+
     /**
      * default OAuth Callback relative url to send user when returning from OAuth service. It's used in {@link org.agorava
      * .api.oauth.application.SimpleOAuthAppSettingsBuilder}

agorava-core-api/src/main/java/org/agorava/api/oauth/OAuthService.java

@@ -16,6 +16,7 @@
 
 package org.agorava.api.oauth;
 
+import org.agorava.api.oauth.application.OAuthAppSettings;
 import org.agorava.api.rest.Response;
 import org.agorava.api.rest.RestService;
 import org.agorava.api.rest.Verb;
@@ -204,5 +205,8 @@ public interface OAuthService extends RestService {
      */
     JsonMapperService getJsonMapper();
 
-
+    /**
+     * @return configuration settings needed to access an OAuth 1.0a and 2.0 service tier
+     */
+    OAuthAppSettings getConfig();
 }

agorava-core-impl/src/main/java/org/agorava/oauth/OAuth10aServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Agorava
+ * Copyright 2016 Agorava
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.agorava.api.rest.Response;
 import org.agorava.spi.ProviderConfigOauth10a;
 import org.agorava.utils.MapUtils;
+
 import static org.agorava.api.oauth.OAuth.OAuthVersion.ONE;
 
 import java.util.Map;
@@ -40,8 +41,10 @@
  *
  * @author Antoine Sabot-Durand
  * @author Pablo Fernandez
+ * @author Werner Keil
  */
 
+@SuppressWarnings("serial")
 @Generic
 @OAuth(ONE)
 public class OAuth10aServiceImpl extends OAuthServiceBase {

agorava-core-impl/src/main/java/org/agorava/oauth/OAuth20FinalServiceImpl.java

@@ -53,7 +53,7 @@ public Token getAccessToken(Token requestToken, Verifier verifier) {
         request.addBodyParameter(AgoravaConstants.CLIENT_SECRET, config.getApiSecret());
         request.addBodyParameter(AgoravaConstants.CODE, verifier.getValue());
         request.addBodyParameter(AgoravaConstants.REDIRECT_URI, config.getCallback());
-        request.addBodyParameter("grant_type", "authorization_code");
+        request.addBodyParameter(AgoravaConstants.GRANT_TYPE, "authorization_code");
         if (config.hasScope())
             request.addBodyParameter(AgoravaConstants.SCOPE, config.getScope());
         Response response = request.send(); //todo:should check return code and launch ResponseException if it's not 200
@@ -64,4 +64,9 @@ public Token getAccessToken(Token requestToken, Verifier verifier) {
     public OAuth.OAuthVersion getVersion() {
         return TWO_FINAL;
     }
+
+    @Override
+    public OAuthAppSettings getConfig() {
+    	return config;
+    }
 }

agorava-core-impl/src/main/java/org/agorava/oauth/OAuth20ServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Agorava
+ * Copyright 2016 Agorava
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,16 +28,17 @@
 import org.agorava.api.rest.Response;
 import org.agorava.rest.OAuthRequestImpl;
 import org.agorava.spi.ProviderConfigOauth20;
+
 import static org.agorava.api.oauth.OAuth.OAuthVersion.TWO_DRAFT_11;
 
+@SuppressWarnings("serial")
 @Generic
 @OAuth(TWO_DRAFT_11)
 public class OAuth20ServiceImpl extends OAuthServiceBase {
 
     @InjectWithQualifier
     ProviderConfigOauth20 api;
 
-
     /**
      * {@inheritDoc}
      */
@@ -76,7 +77,6 @@ public void signRequest(Token accessToken, OAuthRequest request) {
         request.addQuerystringParameter(AgoravaConstants.ACCESS_TOKEN, accessToken.getToken());
     }
 
-
     @Override
     public String getVerifierParamName() {
         return AgoravaConstants.CODE;
@@ -86,6 +86,4 @@ public String getVerifierParamName() {
     public String getAuthorizationUrl() {
         return api.getAuthorizationUrl(getTunedOAuthAppSettings());
     }
-
-
 }

agorava-core-impl/src/main/java/org/agorava/oauth/OAuthServiceBase.java

@@ -122,7 +122,6 @@ public Response sendSignedXmlRequest(Verb verb, String uri, String payload) {
     @Override
     public OAuthSession getSession() {
         return OAuthLifeCycleService.resolveSessionForQualifier(config.getQualifier());
-
     }
 
     @Override
@@ -189,13 +188,17 @@ public <T> T get(String uri, Class<T> clazz, boolean signed) {
         else
             resp = requestFactory(GET, uri).send(); //todo:should check return code and launch
         // ResponseException if it's not 200
+        LOGGER.warning("R: " + resp.toString());
         return getJsonMapper().mapToObject(resp, clazz);
     }
 
     @Override
-    public <T> T get(String uri, Class<T> clazz, Object... urlParams) {
-        String url = MessageFormat.format(uri, urlParams);
-        return getJsonMapper().mapToObject(sendSignedRequest(GET, url), clazz);
+    public <T> T get(String uri, Class<T> clazz, Object... urlParams) {	
+        final String url = MessageFormat.format(uri, urlParams);
+        LOGGER.warning("U: " + url);
+        Response resp = sendSignedRequest(GET, url);
+        LOGGER.warning("R: " + resp.toString());
+        return getJsonMapper().mapToObject(resp, clazz);
     }
 
     @Override
@@ -241,5 +244,8 @@ protected OAuthAppSettings getTunedOAuthAppSettings() {
         AppSettingsTuner tuner = BeanResolver.getInstance().resolve(AppSettingsTuner.class, true);
         return tuner == null ? config : tuner.tune(config);
     }
-
+
+    public OAuthAppSettings getConfig() {
+    	return config;
+    }
 }