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 2017/10/23 10:00:20 UTC
openmeetings git commit: [OPENMEETINGS-1727] code clean-up, tests
Repository: openmeetings
Updated Branches:
refs/heads/master 737df6e87 -> 42512905a
[OPENMEETINGS-1727] code clean-up, tests
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/42512905
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/42512905
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/42512905
Branch: refs/heads/master
Commit: 42512905aa773f28604317add56361fb9b5620ac
Parents: 737df6e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 23 17:00:12 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 23 17:00:12 2017 +0700
----------------------------------------------------------------------
.../openmeetings/db/dto/user/OAuthUser.java | 30 +++++++++-----------
.../openmeetings/db/dto/user/TestOAuthUser.java | 23 ++++++++++-----
.../installation/ImportInitvalues.java | 2 +-
3 files changed, 30 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42512905/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
----------------------------------------------------------------------
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 faf51b1..fe1ac24 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
@@ -51,27 +51,28 @@ public class OAuthUser implements Serializable {
*/
public OAuthUser(String jsonStr, OAuthServer server) {
// get attributes names
- String email = server.getEmailParamName();
- String firstname = server.getFirstnameParamName();
- String lastname = server.getLastnameParamName();
- JSONObject json = getJSON(jsonStr, server.getLoginParamName());
- String login = json.getString(server.getLoginParamName());
+ String pEmail = server.getEmailParamName();
+ String pFirstname = server.getFirstnameParamName();
+ String pLastname = server.getLastnameParamName();
+ String pLogin = server.getLoginParamName();
+ JSONObject json = getJSON(jsonStr, pLogin);
+ String login = json.getString(pLogin);
this.uid = login;
try {
- this.email = json.has(email)
- ? json.getString(email)
+ this.email = json.has(pEmail)
+ ? json.getString(pEmail)
: String.format("%s@%s", login, new URL(server.getIconUrl()).getHost());
} catch (JSONException | MalformedURLException e) {
this.email = null;
// no-op, bad user
log.error("Failed to get user from JSON: {}", json);
}
- if (json.has(firstname)) {
- this.firstName = json.getString(firstname);
+ if (json.has(pFirstname)) {
+ this.firstName = json.getString(pFirstname);
}
- if (json.has(lastname)) {
- this.lastName = json.getString(lastname);
+ if (json.has(pLastname)) {
+ this.lastName = json.getString(pLastname);
}
}
@@ -119,12 +120,7 @@ public class OAuthUser implements Serializable {
// will only check 1 additional level
for (String key : json.keySet()) {
Object o = json.get(key);
- if (o instanceof JSONObject) {
- JSONObject jo = (JSONObject)o;
- if (jo.has(prop)) {
- return jo;
- }
- } else if (o instanceof JSONArray) {
+ if (o instanceof JSONArray) {
JSONArray ja = (JSONArray)o;
//Assuming here array consist of objects
for (int i = 0; i < ja.length(); ++i) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42512905/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
----------------------------------------------------------------------
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 2354bd0..53c4051 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
@@ -21,6 +21,9 @@ package org.apache.openmeetings.db.dto.user;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.junit.Test;
@@ -65,10 +68,16 @@ public class TestOAuthUser {
);
assertEquals("Email should be constructed", "4uidhere4@goo.gl", user.getEmail());
}
- /*
-{'id': '11klahjsfwehf5', 'email': 'alsfkvslvmclqwkdsm@gmail.com', 'verified_email': true, 'name': 'John Doe', 'given_name': 'John', 'family_name': 'Doe', 'link': 'https://plus.google.com/+JohnDoe', 'picture': 'https://lh3.googleusercontent.com/somehash/photo.jpg', 'gender': 'male', 'locale': 'en'}
-*/
-/*
-{'response':[{'uid':4uidhere4,'first_name':'John','last_name':'Doe'}]}
-*/
-}
+
+ @Test
+ public void map() {
+ Map<String, String> umap = new HashMap<>();
+ umap.put("login", "abc");
+ umap.put("email", "abc@local");
+ OAuthUser user = new OAuthUser(umap);
+ assertEquals("UID should be correct", "abc", user.getUid());
+ assertEquals("Email should be correct", "abc@local", user.getEmail());
+ assertNull("First should be empty", user.getFirstName());
+ assertNull("Lastname should be empty", user.getLastName());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42512905/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 5254e36..35f5aed 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -494,7 +494,7 @@ public class ImportInitvalues {
vkServer.setRequestTokenMethod(RequestMethod.POST);
vkServer.setRequestTokenAttributes("client_id={$client_id}&client_secret={$client_secret}&code={$code}&redirect_uri={$redirect_uri}");
vkServer.setRequestInfoUrl("https://api.vk.com/method/users.get?user_ids=&access_token={$access_token}&fields=id,first_name,last_name,email&name_case=nom");
- vkServer.setLoginParamName("id");
+ vkServer.setLoginParamName("uid");
vkServer.setEmailParamName(EMAIL_PARAM);
vkServer.setFirstnameParamName("first_name");
vkServer.setLastnameParamName("last_name");