You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/03/23 07:32:56 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2188] all levels of JSON are being checked

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new b7f5f43  [OPENMEETINGS-2188] all levels of JSON are being checked
b7f5f43 is described below

commit b7f5f433105cc28b270e79aceb3ed51ad8eefd27
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Mar 23 14:32:40 2020 +0700

    [OPENMEETINGS-2188] all levels of JSON are being checked
---
 .../apache/openmeetings/db/dto/user/OAuthUser.java | 18 ++++++---
 .../openmeetings/db/dto/user/TestOAuthUser.java    | 47 ++++++++++++++++++++++
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
index f8fcda7..318ef31 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
@@ -95,7 +95,11 @@ public class OAuthUser implements Serializable {
 	}
 
 	private static JSONObject getJSON(String str, String prop) {
-		JSONObject json = new JSONObject(str);
+		JSONObject res = getJSON(new JSONObject(str), prop);
+		return res == null ? new JSONObject() : res;
+	}
+
+	private static JSONObject getJSON(JSONObject json, String prop) {
 		if (json.has(prop)) {
 			return json;
 		}
@@ -107,17 +111,19 @@ public class OAuthUser implements Serializable {
 				//Assuming here array consist of objects
 				for (int i = 0; i < ja.length(); ++i) {
 					JSONObject jao = ja.getJSONObject(i);
-					if (jao.has(prop)) {
-						return jao;
+					JSONObject res = getJSON(jao, prop);
+					if (res != null) {
+						return res;
 					}
 				}
 			} else if (o instanceof JSONObject) {
 				JSONObject jo = (JSONObject)o;
-				if (jo.has(prop)) {
-					return jo;
+				JSONObject res = getJSON(jo, prop);
+				if (res != null) {
+					return res;
 				}
 			}
 		}
-		return new JSONObject();
+		return null;
 	}
 }
diff --git a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
index b475cd4..a5979dd 100644
--- a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
+++ b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
@@ -93,6 +93,53 @@ public class TestOAuthUser {
 	}
 
 	@Test
+	public void thirdLevel() {
+		OAuthServer server = new OAuthServer()
+				.addMapping(PARAM_LOGIN, "id")
+				.addMapping(PARAM_EMAIL, "email")
+				.addMapping(PARAM_FNAME, "display-name");
+		OAuthUser user = new OAuthUser("{\n" +
+				"    \"ocs\": {\n" +
+				"        \"meta\": {\n" +
+				"            \"status\": \"ok\",\n" +
+				"            \"statuscode\": 200,\n" +
+				"            \"message\": \"OK\"\n" +
+				"        },\n" +
+				"        \"data\": {\n" +
+				"            \"storageLocation\": \"xxxxx\",\n" +
+				"            \"id\": \"xxxxx\",\n" +
+				"            \"lastLogin\": 1584799957000,\n" +
+				"            \"backend\": \"Database\",\n" +
+				"            \"subadmin\": [],\n" +
+				"            \"quota\": {\n" +
+				"                \"free\": 183035547648,\n" +
+				"                \"used\": 10244,\n" +
+				"                \"total\": 183035557892,\n" +
+				"                \"relative\": 0,\n" +
+				"                \"quota\": -3\n" +
+				"            },\n" +
+				"            \"email\": \"xxxxxx@xxx.x\",\n" +
+				"            \"phone\": \"\",\n" +
+				"            \"address\": \"\",\n" +
+				"            \"website\": \"\",\n" +
+				"            \"twitter\": \"\",\n" +
+				"            \"groups\": [\n" +
+				"                \"xxxxxx\"\n" +
+				"            ],\n" +
+				"            \"language\": \"en\",\n" +
+				"            \"locale\": \"\",\n" +
+				"            \"backendCapabilities\": {\n" +
+				"                \"setDisplayName\": true,\n" +
+				"                \"setPassword\": true\n" +
+				"            },\n" +
+				"            \"display-name\": \"xxxxx\"\n" +
+				"        }\n" +
+				"    }\n" +
+				"}", server);
+		assertEquals("xxxxx", user.getLogin(), "Login should be correct");
+	}
+
+	@Test
 	public void map() {
 		Map<String, String> umap = new HashMap<>();
 		umap.put("login", "abc");