[jira] [Commented] (OPENMEETINGS-1954) Library versions need to be updated (4.0.7)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1954?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16719842#comment-16719842 ] ASF subversion and git services commented on OPENMEETINGS-1954: --- Commit 6416bc20bb9343b40574b66cbde58f927d045638 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6416bc2 ] [OPENMEETINGS-1954] plugins are updated > Library versions need to be updated (4.0.7) > --- > > Key: OPENMEETINGS-1954 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1954 > Project: Openmeetings > Issue Type: Task >Affects Versions: 4.0.7 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.7 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1954] plugins are updated
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 6416bc2 [OPENMEETINGS-1954] plugins are updated
6416bc2 is described below
commit 6416bc20bb9343b40574b66cbde58f927d045638
Author: Maxim Solodovnik
AuthorDate: Thu Dec 13 13:55:18 2018 +0700
[OPENMEETINGS-1954] plugins are updated
---
openmeetings-server/pom.xml | 2 +-
pom.xml | 45 +
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 39735a9..3aa77e2 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -117,7 +117,7 @@
prepare-web-server
-
web-server/apache-tomcat-9.0.13.tar.gz
+
web-server/apache-tomcat-9.0.14.tar.gz
diff --git a/pom.xml b/pom.xml
index 1f2ce94..b300b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
cerulean
3.8.0
3.0.0
- 3.1.0
+ 3.1.1
3.1.0
3.1.1
4.1.0
@@ -79,8 +79,8 @@
1.0.10-M9
5.1.3.RELEASE
2.0.19
- 9.0.13
- 3.0.2
+ 9.0.14
+ 3.0.3
3.2.7
3.14.0
2.7.1
@@ -750,6 +750,25 @@
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ generate-sources
+
+ execute
+
+
+
+ def
autoModuleName = "apache.${project.artifactId}".replace('-', '.')
+
project.properties['autoModuleName'] = autoModuleName;
+
println("Automatic-Module-Name will be '" + autoModuleName + "'")
+
+
+
+
+
@@ -791,7 +810,7 @@
${maven.build.timestamp}
${buildNumber}
${project.version}
-
${project.artifactId}
+
${autoModuleName}
@@ -960,6 +979,11 @@
+
+ org.codehaus.gmaven
+ gmaven-plugin
+ 1.5
+
@@ -1443,6 +1467,19 @@
+
+
+
org.codehaus.groovy.maven
+
gmaven-plugin
+
[1.0.0,)
+
+
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1954] plugins are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new a9e4f76 [OPENMEETINGS-1954] plugins are updated
a9e4f76 is described below
commit a9e4f76ce4387d535dac93611e743ef0ddefac81
Author: Maxim Solodovnik
AuthorDate: Thu Dec 13 13:55:18 2018 +0700
[OPENMEETINGS-1954] plugins are updated
---
pom.xml | 45 +
1 file changed, 41 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d450a58..1668f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
cerulean
3.8.0
3.0.0
- 3.1.0
+ 3.1.1
3.1.0
3.1.1
4.1.0
@@ -80,8 +80,8 @@
1.0.10-M9
5.1.3.RELEASE
2.0.19
- 9.0.13
- 3.0.2
+ 9.0.14
+ 3.0.3
3.2.7
3.14.0
2.7.1
@@ -755,6 +755,25 @@
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ generate-sources
+
+ execute
+
+
+
+ def
autoModuleName = "apache.${project.artifactId}".replace('-', '.')
+
project.properties['autoModuleName'] = autoModuleName;
+
println("Automatic-Module-Name will be '" + autoModuleName + "'")
+
+
+
+
+
@@ -796,7 +815,7 @@
${maven.build.timestamp}
${buildNumber}
${project.version}
-
${project.artifactId}
+
${autoModuleName}
@@ -958,6 +977,11 @@
+
+ org.codehaus.gmaven
+ gmaven-plugin
+ 1.5
+
@@ -1457,6 +1481,19 @@
+
+
+
org.codehaus.groovy.maven
+
gmaven-plugin
+
[1.0.0,)
+
+
execute
+
+
+
+
+
+
[jira] [Commented] (OPENMEETINGS-1954) Library versions need to be updated (4.0.7)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1954?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16719832#comment-16719832 ] ASF subversion and git services commented on OPENMEETINGS-1954: --- Commit a9e4f76ce4387d535dac93611e743ef0ddefac81 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a9e4f76 ] [OPENMEETINGS-1954] plugins are updated > Library versions need to be updated (4.0.7) > --- > > Key: OPENMEETINGS-1954 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1954 > Project: Openmeetings > Issue Type: Task >Affects Versions: 4.0.7 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.7 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718686#comment-16718686 ] Maxim Solodovnik commented on OPENMEETINGS-1972: [~p_daehn], I'll try to check if it would be possible to import SVG cliparts as vector images According to sorting: I believe sorting depends on system `ls` (`dir`) result, I can sort cliparts, what order do you prefer? > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (OPENMEETINGS-1971) Accept nested profile object in OAuth2
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1971?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Maxim Solodovnik resolved OPENMEETINGS-1971.
Resolution: Fixed
Fix Version/s: 4.0.7
Should be fixed
Please see unit test here:
https://github.com/apache/openmeetings/commit/4139f8a2fac18e5b204a439b608395aa8ff7202e#diff-56cc99364d50d3d1db46cf36ed9ff577R79
> Accept nested profile object in OAuth2
> --
>
> Key: OPENMEETINGS-1971
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1971
> Project: Openmeetings
> Issue Type: Improvement
> Components: OAuth
>Affects Versions: 4.0.6
>Reporter: Sadra Heidari
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 4.0.7
>
>
> Hi,
> In the OAuth2 config page there are inputs for defining user profile fields
> from OAuth server response:
> * Login param name
> * Email param name
> * Firstname param name
> * Lastname param name
> User can only write down field names from the *root* of the returned object,
> but if any of the fields is wrapped with a base object, it can not be used.
> Assume that the returned response is as follows:
> {
> "hasError": false,
> "result" : \{ "username": "test", "email": "a...@test.com"}
> }
> In this case user is unable to define the username field because it's put in
> an inner object.
> It will be useful if you can support nested objects so that the user can
> define "*result.username*" as Login param name.
> Thanks
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1954] fabric.js is updated
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 9a7673b [OPENMEETINGS-1954] fabric.js is updated
9a7673b is described below
commit 9a7673b22e4c127c6a0ff026f84f93179c5b0ada
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 16:43:26 2018 +0700
[OPENMEETINGS-1954] fabric.js is updated
---
.../org/apache/openmeetings/web/room/wb/fabric.js | 790 -
1 file changed, 443 insertions(+), 347 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
index f0f36b0..2419e14 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
@@ -2,7 +2,7 @@
/* build: `node build.js modules=ALL exclude=gestures,accessors requirejs
minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */
-var fabric = fabric || { version: '2.4.1' };
+var fabric = fabric || { version: '2.4.5' };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@@ -34,7 +34,8 @@ else {
* True when in environment that supports touch events
* @type boolean
*/
-fabric.isTouchSupported = 'ontouchstart' in fabric.window;
+fabric.isTouchSupported = 'ontouchstart' in fabric.window || 'ontouchstart' in
fabric.document ||
+ (fabric.window && fabric.window.navigator &&
fabric.window.navigator.maxTouchPoints > 0);
/**
* True when in environment that's probably Node.js
@@ -53,7 +54,7 @@ fabric.SHARED_ATTRIBUTES = [
'transform',
'fill', 'fill-opacity', 'fill-rule',
'opacity',
- 'stroke', 'stroke-dasharray', 'stroke-linecap',
+ 'stroke', 'stroke-dasharray', 'stroke-linecap', 'stroke-dashoffset',
'stroke-linejoin', 'stroke-miterlimit',
'stroke-opacity', 'stroke-width',
'id', 'paint-order',
@@ -1082,7 +1083,7 @@ fabric.CommonMethods = {
*/
groupSVGElements: function(elements, options, path) {
var object;
- if (elements.length === 1) {
+ if (elements && elements.length === 1) {
return elements[0];
}
if (options) {
@@ -1179,7 +1180,7 @@ fabric.CommonMethods = {
* @return {CanvasElement} initialized canvas element
*/
copyCanvasElement: function(canvas) {
- var newCanvas = fabric.document.createElement('canvas');
+ var newCanvas = fabric.util.createCanvasElement();
newCanvas.width = canvas.width;
newCanvas.height = canvas.height;
newCanvas.getContext('2d').drawImage(canvas, 0, 0);
@@ -1789,7 +1790,10 @@ fabric.CommonMethods = {
(function() {
/**
* Copies all enumerable properties of one js object to another
+ * this does not and cannot compete with generic utils.
* Does not clone or extend fabric.Object subclasses.
+ * This is mostly for internal use and has extra handling for fabricJS
objects
+ * it skips the canvas property in deep cloning.
* @memberOf fabric.util.object
* @param {Object} destination Where to copy to
* @param {Object} source Where to copy from
@@ -1813,7 +1817,10 @@ fabric.CommonMethods = {
}
else if (source && typeof source === 'object') {
for (var property in source) {
- if (source.hasOwnProperty(property)) {
+ if (property === 'canvas') {
+destination[property] = extend({ }, source[property]);
+ }
+ else if (source.hasOwnProperty(property)) {
destination[property] = extend({ }, source[property], deep);
}
}
@@ -2721,24 +2728,6 @@ fabric.CommonMethods = {
return url + (/\?/.test(url) ? '&' : '?') + param;
}
- var makeXHR = (function() {
-var factories = [
- function() { return new fabric.window.XMLHttpRequest(); },
- function() { return new ActiveXObject('Microsoft.XMLHTTP'); },
- function() { return new ActiveXObject('Msxml2.XMLHTTP'); },
- function() { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); }
-];
-for (var i = factories.length; i--; ) {
- try {
-var req = factories[i]();
-if (req) {
- return factories[i];
-}
- }
- catch (err) { }
-}
- })();
-
function emptyFn() { }
/**
@@ -2757,7 +2746,7 @@ fabric.CommonMethods = {
var method = options.method ? options.method.toUpperCase() : 'GET',
onComplete = options.onComplete || function() { },
-xhr = makeXHR(),
+xhr = new fabric.window.XMLHttpRequest(),
body = options.body || options.parameters;
/** @ignore */
@@ -3398,6 +3387,7 @@ if (typeof console !== 'undefined') {
'letter-spacing': 'charSpacing',
'paint-order':'paintFirst',
[jira] [Commented] (OPENMEETINGS-1954) Library versions need to be updated (4.0.7)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1954?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718687#comment-16718687 ] ASF subversion and git services commented on OPENMEETINGS-1954: --- Commit 3872a17956cbf1bc66111bfb9ad707cd05c93d15 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=3872a17 ] [OPENMEETINGS-1954] fabric.js is updated > Library versions need to be updated (4.0.7) > --- > > Key: OPENMEETINGS-1954 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1954 > Project: Openmeetings > Issue Type: Task >Affects Versions: 4.0.7 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.7 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1954] fabric.js is updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 3872a17 [OPENMEETINGS-1954] fabric.js is updated
3872a17 is described below
commit 3872a17956cbf1bc66111bfb9ad707cd05c93d15
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 16:43:26 2018 +0700
[OPENMEETINGS-1954] fabric.js is updated
---
.../org/apache/openmeetings/web/room/wb/fabric.js | 790 -
1 file changed, 443 insertions(+), 347 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
index f0f36b0..2419e14 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/fabric.js
@@ -2,7 +2,7 @@
/* build: `node build.js modules=ALL exclude=gestures,accessors requirejs
minifier=uglifyjs` */
/*! Fabric.js Copyright 2008-2015, Printio (Juriy Zaytsev, Maxim Chernyak) */
-var fabric = fabric || { version: '2.4.1' };
+var fabric = fabric || { version: '2.4.5' };
if (typeof exports !== 'undefined') {
exports.fabric = fabric;
}
@@ -34,7 +34,8 @@ else {
* True when in environment that supports touch events
* @type boolean
*/
-fabric.isTouchSupported = 'ontouchstart' in fabric.window;
+fabric.isTouchSupported = 'ontouchstart' in fabric.window || 'ontouchstart' in
fabric.document ||
+ (fabric.window && fabric.window.navigator &&
fabric.window.navigator.maxTouchPoints > 0);
/**
* True when in environment that's probably Node.js
@@ -53,7 +54,7 @@ fabric.SHARED_ATTRIBUTES = [
'transform',
'fill', 'fill-opacity', 'fill-rule',
'opacity',
- 'stroke', 'stroke-dasharray', 'stroke-linecap',
+ 'stroke', 'stroke-dasharray', 'stroke-linecap', 'stroke-dashoffset',
'stroke-linejoin', 'stroke-miterlimit',
'stroke-opacity', 'stroke-width',
'id', 'paint-order',
@@ -1082,7 +1083,7 @@ fabric.CommonMethods = {
*/
groupSVGElements: function(elements, options, path) {
var object;
- if (elements.length === 1) {
+ if (elements && elements.length === 1) {
return elements[0];
}
if (options) {
@@ -1179,7 +1180,7 @@ fabric.CommonMethods = {
* @return {CanvasElement} initialized canvas element
*/
copyCanvasElement: function(canvas) {
- var newCanvas = fabric.document.createElement('canvas');
+ var newCanvas = fabric.util.createCanvasElement();
newCanvas.width = canvas.width;
newCanvas.height = canvas.height;
newCanvas.getContext('2d').drawImage(canvas, 0, 0);
@@ -1789,7 +1790,10 @@ fabric.CommonMethods = {
(function() {
/**
* Copies all enumerable properties of one js object to another
+ * this does not and cannot compete with generic utils.
* Does not clone or extend fabric.Object subclasses.
+ * This is mostly for internal use and has extra handling for fabricJS
objects
+ * it skips the canvas property in deep cloning.
* @memberOf fabric.util.object
* @param {Object} destination Where to copy to
* @param {Object} source Where to copy from
@@ -1813,7 +1817,10 @@ fabric.CommonMethods = {
}
else if (source && typeof source === 'object') {
for (var property in source) {
- if (source.hasOwnProperty(property)) {
+ if (property === 'canvas') {
+destination[property] = extend({ }, source[property]);
+ }
+ else if (source.hasOwnProperty(property)) {
destination[property] = extend({ }, source[property], deep);
}
}
@@ -2721,24 +2728,6 @@ fabric.CommonMethods = {
return url + (/\?/.test(url) ? '&' : '?') + param;
}
- var makeXHR = (function() {
-var factories = [
- function() { return new fabric.window.XMLHttpRequest(); },
- function() { return new ActiveXObject('Microsoft.XMLHTTP'); },
- function() { return new ActiveXObject('Msxml2.XMLHTTP'); },
- function() { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); }
-];
-for (var i = factories.length; i--; ) {
- try {
-var req = factories[i]();
-if (req) {
- return factories[i];
-}
- }
- catch (err) { }
-}
- })();
-
function emptyFn() { }
/**
@@ -2757,7 +2746,7 @@ fabric.CommonMethods = {
var method = options.method ? options.method.toUpperCase() : 'GET',
onComplete = options.onComplete || function() { },
-xhr = makeXHR(),
+xhr = new fabric.window.XMLHttpRequest(),
body = options.body || options.parameters;
/** @ignore */
@@ -3398,6 +3387,7 @@ if (typeof console !== 'undefined') {
'letter-spacing': 'charSpacing',
'paint-order':'paintFirst',
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1971] second-level object is being found as expected
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 4139f8a [OPENMEETINGS-1971] second-level object is being found as
expected
4139f8a is described below
commit 4139f8a2fac18e5b204a439b608395aa8ff7202e
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 15:04:55 2018 +0700
[OPENMEETINGS-1971] second-level object is being found as expected
---
.../apache/openmeetings/db/dto/user/OAuthUser.java | 5 +
.../openmeetings/db/dto/user/TestOAuthUser.java| 23 +++---
2 files changed, 25 insertions(+), 3 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 e78f4ab..9ce3355 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
@@ -113,6 +113,11 @@ public class OAuthUser implements Serializable {
return jao;
}
}
+ } else if (o instanceof JSONObject) {
+ JSONObject jo = (JSONObject)o;
+ if (jo.has(prop)) {
+ return jo;
+ }
}
}
return new JSONObject();
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 f860e06..acc5ca9 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
@@ -45,7 +45,7 @@ public class TestOAuthUser {
"{'id': '11klahjsfwehf5', 'email':
'alsfkvslvmclqwk...@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'}"
, server
);
- assertEquals("UID should be correct", "11klahjsfwehf5",
user.getLogin());
+ assertEquals("Login should be correct", "11klahjsfwehf5",
user.getLogin());
assertEquals("Email should be correct",
"alsfkvslvmclqwk...@gmail.com", user.getEmail());
assertEquals("Firstname should be correct", "John",
user.getUserData().get(PARAM_FNAME));
assertEquals("Lastname should be correct", "Doe",
user.getUserData().get(PARAM_LNAME));
@@ -62,7 +62,7 @@ public class TestOAuthUser {
"{'response':[{'uid':4uidhere4,'first_name':'John','last_name':'Doe'}]}"
, server
);
- assertEquals("UID should be correct", "4uidhere4",
user.getLogin());
+ assertEquals("Login should be correct", "4uidhere4",
user.getLogin());
assertTrue("Email should be empty",
Strings.isEmpty(user.getEmail()));
assertEquals("Firstname should be correct", "John",
user.getUserData().get(PARAM_FNAME));
assertEquals("Lastname should be correct", "Doe",
user.getUserData().get(PARAM_LNAME));
@@ -76,12 +76,29 @@ public class TestOAuthUser {
}
@Test
+ public void secondLevel1() {
+ OAuthServer server = new OAuthServer()
+ .addMapping(PARAM_LOGIN, "username")
+ .addMapping(PARAM_EMAIL, "email")
+ .addMapping(PARAM_FNAME, "fname")
+ .addMapping(PARAM_LNAME, "lname");
+ OAuthUser user = new OAuthUser(
+ "{\"hasError\": false, \"result\":
{\"username\": \"test\", \"email\": \"a...@test.com\", \"fname\": \"first\",
\"lname\":\"last\"}}"
+ , server
+ );
+ assertEquals("Login should be correct", "test",
user.getLogin());
+ assertEquals("Email should be correct", "a...@test.com",
user.getEmail());
+ assertEquals("Firstname should be correct", "first",
user.getUserData().get(PARAM_FNAME));
+ assertEquals("Lastname should be correct", "last",
user.getUserData().get(PARAM_LNAME));
+ }
+
+ @Test
public void map() {
Map umap = new HashMap<>();
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1970] additional logging is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 39dd424 [OPENMEETINGS-1970] additional logging is added
39dd424 is described below
commit 39dd424e17df65c0799053a45a9fa3569c1d5211
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 16:47:49 2018 +0700
[OPENMEETINGS-1970] additional logging is added
---
.../main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 887b7c3..4bc2667 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -279,9 +279,10 @@ public class SignInPage extends BaseInitedPage {
connection.setRequestMethod(server.getRequestInfoMethod().name());
}
prepareConnection(connection);
- String sourceResponse =
IOUtils.toString(connection.getInputStream(), UTF_8);
+ String json = IOUtils.toString(connection.getInputStream(),
UTF_8);
+ log.debug("User info={}", json);
// parse json result
- return new OAuthUser(sourceResponse, server);
+ return new OAuthUser(json, server);
}
private void loginViaOAuth2(OAuthUser user, long serverId) throws
IOException, NoSuchAlgorithmException {
[openmeetings] branch master updated: [OPENMEETINGS-1970] additional logging is added
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 a311bb5 [OPENMEETINGS-1970] additional logging is added
a311bb5 is described below
commit a311bb564f834d936a683f2bf7ef73da8a2c8234
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 16:47:49 2018 +0700
[OPENMEETINGS-1970] additional logging is added
---
.../main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 4068153..dcd9102 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -289,9 +289,10 @@ public class SignInPage extends BaseInitedPage {
connection.setRequestMethod(server.getRequestInfoMethod().name());
}
prepareConnection(connection);
- String sourceResponse =
IOUtils.toString(connection.getInputStream(), UTF_8);
+ String json = IOUtils.toString(connection.getInputStream(),
UTF_8);
+ log.debug("User info={}", json);
// parse json result
- return new OAuthUser(sourceResponse, server);
+ return new OAuthUser(json, server);
}
private void loginViaOAuth2(OAuthUser user, long serverId) throws
IOException, NoSuchAlgorithmException {
[jira] [Commented] (OPENMEETINGS-1971) Accept nested profile object in OAuth2
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1971?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718578#comment-16718578
]
ASF subversion and git services commented on OPENMEETINGS-1971:
---
Commit 4139f8a2fac18e5b204a439b608395aa8ff7202e in openmeetings's branch
refs/heads/4.0.x from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=4139f8a ]
[OPENMEETINGS-1971] second-level object is being found as expected
> Accept nested profile object in OAuth2
> --
>
> Key: OPENMEETINGS-1971
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1971
> Project: Openmeetings
> Issue Type: Improvement
> Components: OAuth
>Affects Versions: 4.0.6
>Reporter: Sadra Heidari
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Hi,
> In the OAuth2 config page there are inputs for defining user profile fields
> from OAuth server response:
> * Login param name
> * Email param name
> * Firstname param name
> * Lastname param name
> User can only write down field names from the *root* of the returned object,
> but if any of the fields is wrapped with a base object, it can not be used.
> Assume that the returned response is as follows:
> {
> "hasError": false,
> "result" : \{ "username": "test", "email": "a...@test.com"}
> }
> In this case user is unable to define the username field because it's put in
> an inner object.
> It will be useful if you can support nested objects so that the user can
> define "*result.username*" as Login param name.
> Thanks
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1971] second-level object is being found as expected
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 f8516c3 [OPENMEETINGS-1971] second-level object is being found as
expected
f8516c3 is described below
commit f8516c33357883ef04d83d1c639760185ffb319d
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 15:04:55 2018 +0700
[OPENMEETINGS-1971] second-level object is being found as expected
---
.../apache/openmeetings/db/dto/user/OAuthUser.java | 5 +
.../openmeetings/db/dto/user/TestOAuthUser.java| 23 +++---
2 files changed, 25 insertions(+), 3 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 906cb90..f8fcda7 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
@@ -111,6 +111,11 @@ public class OAuthUser implements Serializable {
return jao;
}
}
+ } else if (o instanceof JSONObject) {
+ JSONObject jo = (JSONObject)o;
+ if (jo.has(prop)) {
+ return jo;
+ }
}
}
return new JSONObject();
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 f860e06..acc5ca9 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
@@ -45,7 +45,7 @@ public class TestOAuthUser {
"{'id': '11klahjsfwehf5', 'email':
'alsfkvslvmclqwk...@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'}"
, server
);
- assertEquals("UID should be correct", "11klahjsfwehf5",
user.getLogin());
+ assertEquals("Login should be correct", "11klahjsfwehf5",
user.getLogin());
assertEquals("Email should be correct",
"alsfkvslvmclqwk...@gmail.com", user.getEmail());
assertEquals("Firstname should be correct", "John",
user.getUserData().get(PARAM_FNAME));
assertEquals("Lastname should be correct", "Doe",
user.getUserData().get(PARAM_LNAME));
@@ -62,7 +62,7 @@ public class TestOAuthUser {
"{'response':[{'uid':4uidhere4,'first_name':'John','last_name':'Doe'}]}"
, server
);
- assertEquals("UID should be correct", "4uidhere4",
user.getLogin());
+ assertEquals("Login should be correct", "4uidhere4",
user.getLogin());
assertTrue("Email should be empty",
Strings.isEmpty(user.getEmail()));
assertEquals("Firstname should be correct", "John",
user.getUserData().get(PARAM_FNAME));
assertEquals("Lastname should be correct", "Doe",
user.getUserData().get(PARAM_LNAME));
@@ -76,12 +76,29 @@ public class TestOAuthUser {
}
@Test
+ public void secondLevel1() {
+ OAuthServer server = new OAuthServer()
+ .addMapping(PARAM_LOGIN, "username")
+ .addMapping(PARAM_EMAIL, "email")
+ .addMapping(PARAM_FNAME, "fname")
+ .addMapping(PARAM_LNAME, "lname");
+ OAuthUser user = new OAuthUser(
+ "{\"hasError\": false, \"result\":
{\"username\": \"test\", \"email\": \"a...@test.com\", \"fname\": \"first\",
\"lname\":\"last\"}}"
+ , server
+ );
+ assertEquals("Login should be correct", "test",
user.getLogin());
+ assertEquals("Email should be correct", "a...@test.com",
user.getEmail());
+ assertEquals("Firstname should be correct", "first",
user.getUserData().get(PARAM_FNAME));
+ assertEquals("Lastname should be correct", "last",
user.getUserData().get(PARAM_LNAME));
+ }
+
+ @Test
public void map() {
Map umap = new HashMap<>();
[jira] [Commented] (OPENMEETINGS-1971) Accept nested profile object in OAuth2
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1971?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718579#comment-16718579
]
ASF subversion and git services commented on OPENMEETINGS-1971:
---
Commit f8516c33357883ef04d83d1c639760185ffb319d in openmeetings's branch
refs/heads/master from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=f8516c3 ]
[OPENMEETINGS-1971] second-level object is being found as expected
> Accept nested profile object in OAuth2
> --
>
> Key: OPENMEETINGS-1971
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1971
> Project: Openmeetings
> Issue Type: Improvement
> Components: OAuth
>Affects Versions: 4.0.6
>Reporter: Sadra Heidari
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Hi,
> In the OAuth2 config page there are inputs for defining user profile fields
> from OAuth server response:
> * Login param name
> * Email param name
> * Firstname param name
> * Lastname param name
> User can only write down field names from the *root* of the returned object,
> but if any of the fields is wrapped with a base object, it can not be used.
> Assume that the returned response is as follows:
> {
> "hasError": false,
> "result" : \{ "username": "test", "email": "a...@test.com"}
> }
> In this case user is unable to define the username field because it's put in
> an inner object.
> It will be useful if you can support nested objects so that the user can
> define "*result.username*" as Login param name.
> Thanks
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1954) Library versions need to be updated (4.0.7)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1954?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718688#comment-16718688 ] ASF subversion and git services commented on OPENMEETINGS-1954: --- Commit 9a7673b22e4c127c6a0ff026f84f93179c5b0ada in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=9a7673b ] [OPENMEETINGS-1954] fabric.js is updated > Library versions need to be updated (4.0.7) > --- > > Key: OPENMEETINGS-1954 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1954 > Project: Openmeetings > Issue Type: Task >Affects Versions: 4.0.7 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.7 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718694#comment-16718694 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit 39dd424e17df65c0799053a45a9fa3569c1d5211 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=39dd424 ] [OPENMEETINGS-1970] additional logging is added > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718695#comment-16718695 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit a311bb564f834d936a683f2bf7ef73da8a2c8234 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a311bb5 ] [OPENMEETINGS-1970] additional logging is added > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1972] svg images can be loaded as cliparts
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 98e31f0 [OPENMEETINGS-1972] svg images can be loaded as cliparts
98e31f0 is described below
commit 98e31f07930378bc82666296782931d79cce6292
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 18:25:54 2018 +0700
[OPENMEETINGS-1972] svg images can be loaded as cliparts
---
.../apache/openmeetings/web/room/wb/WbPanel.java | 8 +-
.../openmeetings/web/room/wb/raw-tool-clipart.js | 32 +-
.../apache/openmeetings/web/room/wb/raw-wb-area.js | 10 +++
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 395fc3d..5227ff4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -51,6 +51,7 @@ import java.util.TreeMap;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.function.Function;
+import java.util.stream.Collectors;
import javax.imageio.ImageIO;
@@ -140,7 +141,12 @@ public class WbPanel extends AbstractWbPanel {
if (rp.getRoom().isHidden(RoomElement.Whiteboard)) {
setVisible(false);
} else {
- add(new ListView("clipart",
Arrays.asList(OmFileHelper.getPublicClipartsDir().list())) {
+ add(new ListView("clipart"
+ ,
Arrays.asList(OmFileHelper.getPublicClipartsDir().list())
+ .stream()
+ .sorted()
+ .collect(Collectors.toList()))
+ {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
index 75bedde..f0dbb2e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
@@ -1,13 +1,18 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+if (!String.prototype.endsWith) {
+ String.prototype.endsWith = function(search, this_len) {
+ if (this_len === undefined || this_len > this.length) {
+ this_len = this.length;
+ }
+ return this.substring(this_len - search.length, this_len) ===
search;
+ };
+}
var Clipart = function(wb, btn, s) {
const art = Shape(wb);
art.add2Canvas = function(canvas) {}
art.createShape = function(canvas) {
- const imgSrc = btn.data('image');
- fabric.Image.fromURL(imgSrc, function(img) {
- art.orig.width = img.width;
- art.orig.height = img.height;
- art.obj = img.set({
+ const imgSrc = btn.data('image')
+ , opts = {
left: art.orig.x
, top: art.orig.y
, scaleX: 0.
@@ -15,9 +20,22 @@ var Clipart = function(wb, btn, s) {
, omType: 'Clipart'
, _src: imgSrc
, opacity: art.opacity
+ };
+ if (imgSrc.toLowerCase().endsWith('svg')) {
+ fabric.loadSVGFromURL(imgSrc, function(elements) {
+ art.orig.width = 32;
+ art.orig.height = 32;
+ art.obj =
fabric.util.groupSVGElements(elements, opts);
+ canvas.add(art.obj);
});
- canvas.add(art.obj);
- });
+ } else {
+ fabric.Image.fromURL(imgSrc, function(img) {
+ art.orig.width = img.width;
+ art.orig.height = img.height;
+ art.obj = img.set(opts);
+ canvas.add(art.obj);
+ });
+ }
};
art.updateShape = function(pointer) {
if (!art.obj) {
diff --git
[jira] [Resolved] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1972. Resolution: Fixed Fix Version/s: 4.0.7 Should be implemented Would appreciate if you can test > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.7 > > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1970] test is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 07bf969 [OPENMEETINGS-1970] test is added
07bf969 is described below
commit 07bf96946ea16db3c71de5cc7832465378a05fec
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 18:59:03 2018 +0700
[OPENMEETINGS-1970] test is added
---
openmeetings-web/pom.xml | 5 ++
.../apache/openmeetings/web/app/UserManager.java | 2 +-
.../web/app/TestUserManagerMocked.java | 93 ++
pom.xml| 6 ++
4 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 5b739a3..9b99310 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -766,5 +766,10 @@
tomcat-embed-jasper
${tomcat.version}
+
+ org.mockito
+ mockito-core
+ test
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index df38e9c..d1f2c8b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -310,7 +310,7 @@ public class UserManager implements IUserManager {
fUser.getGroupUsers().add(new
GroupUser(groupDao.get(getDefaultGroup()), fUser));
for (Map.Entry entry :
user.getUserData().entrySet()) {
final String expression = entry.getKey();
- PropertyResolver.setValue(expression, fUser,
entry.getKey(), new PropertyResolverConverter(null, null) {
+ PropertyResolver.setValue(expression, fUser,
entry.getValue(), new PropertyResolverConverter(null, null) {
private static final long
serialVersionUID = 1L;
@SuppressWarnings("unchecked")
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
new file mode 100644
index 000..6722d3f
--- /dev/null
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.app;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.dto.user.OAuthUser;
+import org.apache.openmeetings.db.entity.server.OAuthServer;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.db.manager.IClientManager;
+import org.apache.openmeetings.db.manager.IStreamClientManager;
+import org.apache.openmeetings.service.mail.EmailManager;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
+import org.apache.openmeetings.util.crypt.SCryptImplementation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
+import
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718881#comment-16718881 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit 926037d34c6d843a802e184d0e20edd5e8e4e544 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=926037d ] [OPENMEETINGS-1970] code clean-up > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1972] code clean-up
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 e82d507 [OPENMEETINGS-1972] code clean-up
e82d507 is described below
commit e82d507521fef7018754da53abc6dce03e3261ff
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 19:02:12 2018 +0700
[OPENMEETINGS-1972] code clean-up
---
.../java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js | 8
1 file changed, 8 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
index 5fdff36..eacd4c1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
@@ -1,12 +1,4 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-if (!String.prototype.endsWith) {
- String.prototype.endsWith = function(search, this_len) {
- if (this_len === undefined || this_len > this.length) {
- this_len = this.length;
- }
- return this.substring(this_len - search.length, this_len) ===
search;
- };
-}
var Clipart = function(wb, btn, s) {
const art = Shape(wb);
art.add2Canvas = function() {}
[openmeetings] branch master updated: [OPENMEETINGS-1970] code clean-up
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 947f50c [OPENMEETINGS-1970] code clean-up
947f50c is described below
commit 947f50cc6cba3e6ce859972ffd776ba086b4fb06
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 19:01:00 2018 +0700
[OPENMEETINGS-1970] code clean-up
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f920b68..1f2ce94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
9.4.12.v20180830
test
1.60
+ 2.23.4
https://builds.apache.org/analysis
@@ -639,7 +640,7 @@
org.mockito
mockito-core
- 2.23.4
+ ${mockito.version}
test
[jira] [Commented] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718893#comment-16718893 ] Peter Dähn commented on OPENMEETINGS-1972: -- TOP! Seams to work as expected... Thanks! > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.7 > > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718891#comment-16718891 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit 158928be2019b3fe665e491164527069a1a9da8a in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=158928b ] [OPENMEETINGS-1970] code clean-up > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718823#comment-16718823 ] ASF subversion and git services commented on OPENMEETINGS-1972: --- Commit 2db29a302b1ba53d195536cbfb7b99ffc82a7b03 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=2db29a3 ] [OPENMEETINGS-1972] svg images can be loaded as cliparts > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718821#comment-16718821 ] ASF subversion and git services commented on OPENMEETINGS-1972: --- Commit 98e31f07930378bc82666296782931d79cce6292 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=98e31f0 ] [OPENMEETINGS-1972] svg images can be loaded as cliparts > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1972] svg images can be loaded as cliparts
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 2db29a3 [OPENMEETINGS-1972] svg images can be loaded as cliparts
2db29a3 is described below
commit 2db29a302b1ba53d195536cbfb7b99ffc82a7b03
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 18:25:54 2018 +0700
[OPENMEETINGS-1972] svg images can be loaded as cliparts
---
.../apache/openmeetings/web/room/wb/WbPanel.java | 8 +-
.../openmeetings/web/room/wb/raw-tool-clipart.js | 32 +-
.../apache/openmeetings/web/room/wb/raw-wb-area.js | 10 +++
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 7613de3..2f4f9bd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -49,6 +49,7 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.function.Consumer;
import java.util.function.Function;
+import java.util.stream.Collectors;
import javax.imageio.ImageIO;
@@ -144,7 +145,12 @@ public class WbPanel extends AbstractWbPanel {
if (rp.getRoom().isHidden(RoomElement.Whiteboard)) {
setVisible(false);
} else {
- add(new ListView("clipart",
Arrays.asList(OmFileHelper.getPublicClipartsDir().list())) {
+ add(new ListView("clipart"
+ ,
Arrays.asList(OmFileHelper.getPublicClipartsDir().list())
+ .stream()
+ .sorted()
+ .collect(Collectors.toList()))
+ {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
index 7f91316..5fdff36 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
@@ -1,13 +1,18 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
+if (!String.prototype.endsWith) {
+ String.prototype.endsWith = function(search, this_len) {
+ if (this_len === undefined || this_len > this.length) {
+ this_len = this.length;
+ }
+ return this.substring(this_len - search.length, this_len) ===
search;
+ };
+}
var Clipart = function(wb, btn, s) {
const art = Shape(wb);
art.add2Canvas = function() {}
art.createShape = function(canvas) {
- const imgSrc = btn.data('image');
- fabric.Image.fromURL(imgSrc, function(img) {
- art.orig.width = img.width;
- art.orig.height = img.height;
- art.obj = img.set({
+ const imgSrc = btn.data('image')
+ , opts = {
left: art.orig.x
, top: art.orig.y
, scaleX: 0.
@@ -15,9 +20,22 @@ var Clipart = function(wb, btn, s) {
, omType: 'Clipart'
, _src: imgSrc
, opacity: art.opacity
+ };
+ if (imgSrc.toLowerCase().endsWith('svg')) {
+ fabric.loadSVGFromURL(imgSrc, function(elements) {
+ art.orig.width = 32;
+ art.orig.height = 32;
+ art.obj =
fabric.util.groupSVGElements(elements, opts);
+ canvas.add(art.obj);
});
- canvas.add(art.obj);
- });
+ } else {
+ fabric.Image.fromURL(imgSrc, function(img) {
+ art.orig.width = img.width;
+ art.orig.height = img.height;
+ art.obj = img.set(opts);
+ canvas.add(art.obj);
+ });
+ }
};
art.updateShape = function(pointer) {
if (!art.obj) {
diff --git
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718878#comment-16718878 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit 07bf96946ea16db3c71de5cc7832465378a05fec in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=07bf969 ] [OPENMEETINGS-1970] test is added > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1970] test is added
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 d703849 [OPENMEETINGS-1970] test is added
d703849 is described below
commit d703849f45459cfb8913da78047893bd5aeb97ef
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 18:59:03 2018 +0700
[OPENMEETINGS-1970] test is added
---
openmeetings-web/pom.xml | 5 ++
.../apache/openmeetings/web/app/UserManager.java | 2 +-
.../web/app/TestUserManagerMocked.java | 93 ++
pom.xml| 6 ++
4 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6185131..94092e4 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -733,5 +733,10 @@
test
+
+ org.mockito
+ mockito-core
+ test
+
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index 5a4c651..1d306dc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -254,7 +254,7 @@ public class UserManager implements IUserManager {
fUser.getGroupUsers().add(new
GroupUser(groupDao.get(getDefaultGroup()), fUser));
for (Map.Entry entry :
user.getUserData().entrySet()) {
final String expression = entry.getKey();
- PropertyResolver.setValue(expression, fUser,
entry.getKey(), new PropertyResolverConverter(null, null) {
+ PropertyResolver.setValue(expression, fUser,
entry.getValue(), new PropertyResolverConverter(null, null) {
private static final long
serialVersionUID = 1L;
@SuppressWarnings("unchecked")
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
new file mode 100644
index 000..6722d3f
--- /dev/null
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.app;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.dto.user.OAuthUser;
+import org.apache.openmeetings.db.entity.server.OAuthServer;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.db.manager.IClientManager;
+import org.apache.openmeetings.db.manager.IStreamClientManager;
+import org.apache.openmeetings.service.mail.EmailManager;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
+import org.apache.openmeetings.util.crypt.SCryptImplementation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
+import
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1970] code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 926037d [OPENMEETINGS-1970] code clean-up
926037d is described below
commit 926037d34c6d843a802e184d0e20edd5e8e4e544
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 19:01:00 2018 +0700
[OPENMEETINGS-1970] code clean-up
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1d5c95f..d450a58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
1.6
test
1.60
+ 2.23.4
https://builds.apache.org/analysis
@@ -637,7 +638,7 @@
org.mockito
mockito-core
- 2.23.4
+ ${mockito.version}
test
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718879#comment-16718879 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit d703849f45459cfb8913da78047893bd5aeb97ef in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=d703849 ] [OPENMEETINGS-1970] test is added > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1970) Use Authorization header for OAuth2 plugin
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1970?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718882#comment-16718882 ] ASF subversion and git services commented on OPENMEETINGS-1970: --- Commit 947f50cc6cba3e6ce859972ffd776ba086b4fb06 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=947f50c ] [OPENMEETINGS-1970] code clean-up > Use Authorization header for OAuth2 plugin > -- > > Key: OPENMEETINGS-1970 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1970 > Project: Openmeetings > Issue Type: Improvement > Components: OAuth >Affects Versions: 4.0.6 >Reporter: Sadra Heidari >Assignee: Maxim Solodovnik >Priority: Major > Attachments: Selection_079.png > > > Hello, > Most OAuth2 servers accept access_token in "Authorization" header for > returning user profile. Example header: > Authorization: bearer > In the OAuth2 config there is no way to set request headers and only the > "Request info URL" is configurable. > Is it possible to add another config filed for "Request info Headers"? > Thank you -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16718884#comment-16718884 ] ASF subversion and git services commented on OPENMEETINGS-1972: --- Commit e82d507521fef7018754da53abc6dce03e3261ff in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e82d507 ] [OPENMEETINGS-1972] code clean-up > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.7 > > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1970] code clean-up
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 158928b [OPENMEETINGS-1970] code clean-up
158928b is described below
commit 158928be2019b3fe665e491164527069a1a9da8a
Author: Maxim Solodovnik
AuthorDate: Wed Dec 12 19:05:57 2018 +0700
[OPENMEETINGS-1970] code clean-up
---
.../org/apache/openmeetings/web/app/TestUserManagerMocked.java | 9 -
1 file changed, 9 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
index 6722d3f..2f0032d 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -29,8 +29,6 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
-import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
-import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.user.OAuthUser;
@@ -38,7 +36,6 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.manager.IClientManager;
-import org.apache.openmeetings.db.manager.IStreamClientManager;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.crypt.SCryptImplementation;
@@ -53,18 +50,12 @@ import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class TestUserManagerMocked {
@Mock
- private SessiondataDao sessionDao;
- @Mock
private GroupDao groupDao;
@Mock
private UserDao userDao;
@Mock
private EmailManager emailManager;
@Mock
- private ScopeApplicationAdapter scopeAdapter;
- @Mock
- private IStreamClientManager streamClientManager;
- @Mock
private IClientManager cm;
@InjectMocks
private UserManager userManager;
[jira] [Closed] (OPENMEETINGS-1972) Support SVG at whiteboard
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1972?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Peter Dähn closed OPENMEETINGS-1972. > Support SVG at whiteboard > - > > Key: OPENMEETINGS-1972 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1972 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/WhiteBoard >Affects Versions: 4.0.7 >Reporter: Peter Dähn >Assignee: Maxim Solodovnik >Priority: Trivial > Fix For: 4.0.7 > > > I tried to use svg as cliparts at wb.it is shown in the toolbar, but it is > not "putable" at the wb. > No errors in browser or om logs. > Is there an easy way to add svg support? -- This message was sent by Atlassian JIRA (v7.6.3#76005)
