[jira] [Updated] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alvaro updated OPENMEETINGS-2639: - Attachment: localhost.2021-08-10.log > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 7.0.0 > > Attachments: localhost.2021-08-10.log, > localhost_access_log.2021-08-10.txt, openmeetings.log > > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17396854#comment-17396854 ] Alvaro commented on OPENMEETINGS-2639: -- Server: OM 7.0.0 #12 - Ubuntu 18.04 Clients: Firefox - Safari - OSx 11.5.2 and Ubuntu 18.04 FF. ## An user "A", no administrator, he is alone at room and send an invitation, with password, to user "B" administrator. Result, nobody receive the invitation mail. ## The same user "A" send a meeting from Calendar to user "B". Result, who receive the Calendar invitation is himself, user "A", and nothing for user "B". === Sending invitations from administrator user to any user no administrator from Room with password, or Calendar, everything works as expectd. Attached a logs. [^localhost_access_log.2021-08-10.txt] > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 7.0.0 > > Attachments: localhost.2021-08-10.log, > localhost_access_log.2021-08-10.txt, openmeetings.log > > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alvaro updated OPENMEETINGS-2639: - Attachment: openmeetings.log > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 7.0.0 > > Attachments: localhost.2021-08-10.log, > localhost_access_log.2021-08-10.txt, openmeetings.log > > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alvaro updated OPENMEETINGS-2639: - Attachment: localhost_access_log.2021-08-10.txt > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 7.0.0 > > Attachments: localhost_access_log.2021-08-10.txt > > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2639: --- Fix Version/s: 7.0.0 > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 7.0.0 > > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2639) Add internal password user when send inivitation from room
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2639?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17396783#comment-17396783 ] ASF subversion and git services commented on OPENMEETINGS-2639: --- Commit e5f6815235573ab820f9f5352083a5dfe83002cc in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e5f6815 ] [OPENMEETINGS-2639] invitation hash should be generated for password protected invitations > Add internal password user when send inivitation from room > -- > > Key: OPENMEETINGS-2639 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2639 > Project: Openmeetings > Issue Type: Improvement > Components: Email >Affects Versions: 6.1.0 > Environment: Ubuntu 18.04 - OM 6.1.0 #323 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > > Add active internal password user when send inivitation from room -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2639] invitation hash should be generated for password protected invitations
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 e5f6815 [OPENMEETINGS-2639] invitation hash should be generated for
password protected invitations
e5f6815 is described below
commit e5f6815235573ab820f9f5352083a5dfe83002cc
Author: Maxim Solodovnik
AuthorDate: Tue Aug 10 23:56:29 2021 +0700
[OPENMEETINGS-2639] invitation hash should be generated for password
protected invitations
---
.../db/entity/calendar/Appointment.java| 4 ++
.../openmeetings/db/entity/room/Invitation.java| 4 ++
.../apache/openmeetings/db/entity/room/Room.java | 4 ++
.../apache/openmeetings/web/app/Application.java | 67 ++
.../apache/openmeetings/web/room/RoomPanel.java| 50 +++-
.../webservice/CalendarWebService.java | 2 +-
6 files changed, 52 insertions(+), 79 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
index 13cb47e..e592d3b 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
@@ -499,6 +499,10 @@ public class Appointment extends HistoricalEntity {
this.etag = etag;
}
+ public boolean isOwner(Long userId) {
+ return owner.getId().equals(userId);
+ }
+
@Override
public String toString() {
return "Appointment [id=" + id + ", title=" + title + ",
start=" + start + ", end=" + end + ", owner=" + owner
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
index 062600c..76a46c8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
@@ -271,4 +271,8 @@ public class Invitation extends HistoricalEntity {
public void setAllowEntry(boolean allowEntry) {
this.allowEntry = allowEntry;
}
+
+ public boolean isOwner(Long userId) {
+ return invitedBy != null && invitedBy.getId().equals(userId);
+ }
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 4e7f986..30404c5 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -630,6 +630,10 @@ public class Room extends HistoricalEntity {
this.files = files;
}
+ public boolean isOwner(Long userId) {
+ return ownerId != null && ownerId.equals(userId);
+ }
+
@Override
public String toString() {
return "Room [id=" + id + ", name=" + name + ", type=" + type +
"]";
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index a173df2..1c427f2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -41,6 +41,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.websocket.WebSocketContainer;
@@ -61,6 +62,7 @@ import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomGroup;
+import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
@@ -521,23 +523,17 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
Room r = i.getRoom();
User u = i.getInvitee();
if (r != null) {
- if (r.isAppointment() &&
i.getInvitedBy().getId().equals(u.getId())) {
- link = getRoomUrlFragment(r.getId()).getLink();
- } else {
- boolean allowed = Type.CONTACT != u.getType()
&& Type.EXTERNAL !=
