feat(oxauth): add first party native authn support #1925

Client/src/main/java/org/gluu/oxauth/client/AuthorizationResponse.java

@@ -6,24 +6,6 @@
 
 package org.gluu.oxauth.client;
 
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.ACCESS_TOKEN;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.CODE;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.EXPIRES_IN;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.ID_TOKEN;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.SCOPE;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.SESSION_ID;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.SID;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.STATE;
-import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.TOKEN_TYPE;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.lang.StringUtils;
 import org.gluu.oxauth.model.authorize.AuthorizeErrorResponseType;
 import org.gluu.oxauth.model.common.ResponseMode;
@@ -32,6 +14,15 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.ws.rs.core.Response;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static org.gluu.oxauth.model.authorize.AuthorizeResponseParam.*;
+
 /**
  * Represents an authorization response received from the authorization server.
  *
@@ -52,6 +43,7 @@ public class AuthorizationResponse extends BaseResponse {
     private Map<String, String> customParams;
     private ResponseMode responseMode;
 
+    private String errorTypeString;
     private AuthorizeErrorResponseType errorType;
     private String errorDescription;
     private String errorUri;
@@ -67,7 +59,8 @@ public AuthorizationResponse(Response clientResponse) {
             try {
                 JSONObject jsonObj = new JSONObject(entity);
                 if (jsonObj.has("error")) {
-                    errorType = AuthorizeErrorResponseType.fromString(jsonObj.getString("error"));
+                    errorTypeString = jsonObj.getString("error");
+                    errorType = AuthorizeErrorResponseType.fromString(errorTypeString);
                 }
                 if (jsonObj.has("error_description")) {
                     errorDescription = jsonObj.getString("error_description");
@@ -81,6 +74,9 @@ public AuthorizationResponse(Response clientResponse) {
                 if (jsonObj.has("redirect")) {
                     location = jsonObj.getString("redirect");
                 }
+                if (jsonObj.has("authorization_code")) {
+                    code = jsonObj.getString("authorization_code");
+                }
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -173,6 +169,14 @@ private void processLocation() {
         }
     }
 
+    public String getErrorTypeString() {
+        return errorTypeString;
+    }
+
+    public void setErrorTypeString(String errorTypeString) {
+        this.errorTypeString = errorTypeString;
+    }
+
     /**
      * Returns the authorization code generated by the authorization server.
      *

Model/src/main/java/org/gluu/oxauth/model/authorize/AuthorizationChallengeResponse.java

@@ -0,0 +1,44 @@
+package org.gluu.oxauth.model.authorize;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Yuriy Z
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AuthorizationChallengeResponse {
+
+    @JsonProperty(value = "authorization_code")
+    private String authorizationCode;
+
+    /**
+     * Gets authorization code
+     *
+     * @return authorization code
+     */
+    public String getAuthorizationCode() {
+        return authorizationCode;
+    }
+
+    /**
+     * Sets authorization code
+     *
+     * @param authorizationCode authorization code
+     */
+    public void setAuthorizationCode(String authorizationCode) {
+        this.authorizationCode = authorizationCode;
+    }
+
+    /**
+     * Returns string representation of authorization challenge response
+     *
+     * @return string representation of authorization challenge response
+     */
+    @Override
+    public String toString() {
+        return "AuthorizationChallengeResponse{" +
+                "authorizationCode='" + authorizationCode + '\'' +
+                '}';
+    }
+}

Model/src/main/java/org/gluu/oxauth/model/authzdetails/AuthzDetail.java

@@ -0,0 +1,44 @@
+package org.gluu.oxauth.model.authzdetails;
+
+import org.json.JSONObject;
+
+/**
+ * @author Yuriy Z
+ */
+public class AuthzDetail {
+
+    private final JSONObject jsonObject;
+    private String uiRepresentation;
+
+    public AuthzDetail(String json) {
+        this(new JSONObject(json));
+    }
+
+    public AuthzDetail(JSONObject jsonObject) {
+        this.jsonObject = jsonObject;
+    }
+
+    public JSONObject getJsonObject() {
+        return jsonObject;
+    }
+
+    public String getType() {
+        return jsonObject.optString("type");
+    }
+
+    public String getUiRepresentation() {
+        return uiRepresentation;
+    }
+
+    public void setUiRepresentation(String uiRepresentation) {
+        this.uiRepresentation = uiRepresentation;
+    }
+
+    @Override
+    public String toString() {
+        return "AuthzDetail{" +
+                "jsonObject=" + jsonObject +
+                "uiRepresentation=" + uiRepresentation +
+                '}';
+    }
+}

Model/src/main/java/org/gluu/oxauth/model/authzdetails/AuthzDetails.java

@@ -0,0 +1,105 @@
+package org.gluu.oxauth.model.authzdetails;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Yuriy Z
+ */
+public class AuthzDetails {
+
+    private final List<AuthzDetail> details;
+
+    public AuthzDetails(List<AuthzDetail> details) {
+        this.details = details;
+    }
+
+    public AuthzDetails() {
+        this(new ArrayList<>());
+    }
+
+    public static AuthzDetails of(String jsonArray) {
+        return of(new JSONArray(jsonArray));
+    }
+
+    public static AuthzDetails ofSilently(String jsonArray) {
+        try {
+            return of(new JSONArray(jsonArray));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static AuthzDetails of(JSONArray jsonArray) {
+        AuthzDetails result = new AuthzDetails();
+        for (int i = 0; i < jsonArray.length(); i++) {
+            result.details.add(new AuthzDetail(jsonArray.getJSONObject(i)));
+        }
+        return result;
+    }
+
+    public static boolean similar(String authorizationDetails1, String authorizationDetails2) {
+        if (StringUtils.equals(authorizationDetails1, authorizationDetails2)) {
+            return true;
+        }
+        if (authorizationDetails1 == null || authorizationDetails2 == null) {
+            return false;
+        }
+        JSONArray array1 = new JSONArray(authorizationDetails1);
+        JSONArray array2 = new JSONArray(authorizationDetails2);
+        return array1.similar(array2);
+    }
+
+    public static String simpleMerge(String authorizationDetails1, String authorizationDetails2) {
+        final AuthzDetails details1 = AuthzDetails.of(authorizationDetails1);
+        final AuthzDetails details2 = AuthzDetails.of(authorizationDetails2);
+        details1.getDetails().addAll(details2.getDetails());
+        return details1.asJsonArray().toString();
+    }
+
+    public JSONArray asJsonArray() {
+        JSONArray array = new JSONArray();
+        array.putAll(details.stream().map(AuthzDetail::getJsonObject).collect(Collectors.toList()));
+        return array;
+    }
+
+    public String asJsonString() {
+        return asJsonArray().toString();
+    }
+
+    public boolean similar(String authorizationDetails) {
+        if (StringUtils.isBlank(authorizationDetails)) {
+            return false;
+        }
+        return asJsonArray().similar(new JSONArray(authorizationDetails));
+    }
+
+    public List<AuthzDetail> getDetails() {
+        return details;
+    }
+
+    public Set<String> getTypes() {
+        Set<String> result = new HashSet<>();
+        for (AuthzDetail d : details) {
+            result.add(d.getType());
+        }
+        return result;
+    }
+
+    public static boolean isEmpty(AuthzDetails authzDetails) {
+        return authzDetails == null || authzDetails.getDetails() == null || authzDetails.getDetails().isEmpty();
+    }
+
+    @Override
+    public String toString() {
+        return "AuthzDetails{" +
+                "details=" + details +
+                '}';
+    }
+}