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 916beb1 [OPENMEETINGS-2071] client baseUrl is being used for
invitation sending
916beb1 is described below
commit 916beb16b472493c86e982ea3e29eb2ce7a3dd3c
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue May 21 17:14:38 2019 +0700
[OPENMEETINGS-2071] client baseUrl is being used for invitation sending
---
.../src/main/java/org/apache/openmeetings/IApplication.java | 2 +-
.../org/apache/openmeetings/db/dao/room/IInvitationManager.java | 2 +-
.../org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
.../org/apache/openmeetings/service/room/InvitationManager.java | 6 +++---
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 4 ++--
.../java/org/apache/openmeetings/web/common/InvitationForm.java | 7 ++++---
.../org/apache/openmeetings/web/room/menu/RoomInvitationForm.java | 4 +++-
.../java/org/apache/openmeetings/invitiation/TestInvitation.java | 2 +-
.../java/org/apache/openmeetings/webservice/RoomWebService.java | 2 +-
9 files changed, 17 insertions(+), 14 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
index 0b6a15d..159f2cf 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
@@ -38,7 +38,7 @@ public interface IApplication {
String getOmString(String key, long languageId);
String getOmString(String key, final Locale loc, String... params);
String getOmContactsLink();
- String getOmInvitationLink(Invitation i);
+ String getOmInvitationLink(Invitation i, String baseUrl);
String urlForActivatePage(PageParameters pp);
String getServerId();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
index 72684ce..a9280c2 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
@@ -43,5 +43,5 @@ public interface IInvitationManager {
User createdBy, Long languageId, Date gmtTimeStart,
Date gmtTimeEnd
, Appointment appointment);
- void sendInvitationLink(Invitation i, MessageType type, String subject,
String message, boolean ical) throws Exception;
+ void sendInvitationLink(Invitation i, MessageType type, String subject,
String message, boolean ical, String baseUrl) throws Exception;
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 0185964..1c2f80d 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -52,6 +52,6 @@ public class MailNotifier implements INotifier {
public void notify(User u, Appointment a, Invitation inv) throws
Exception {
TimeZone tz = getTimeZone(u);
SubjectEmailTemplate t = AppointmentReminderTemplate.get(u, a,
tz);
- invitationManager.sendInvitationLink(inv, MessageType.Create,
t.getSubject(), t.getEmail(), false);
+ invitationManager.sendInvitationLink(inv, MessageType.Create,
t.getSubject(), t.getEmail(), false, null);
}
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 839d312..c977ef3 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -95,15 +95,15 @@ public class InvitationManager implements
IInvitationManager {
t =
UpdatedAppointmentTemplate.get(mm.getUser(), a, tz, invitorName);
break;
}
- sendInvitationLink(mm.getInvitation(), type, t.getSubject(),
t.getEmail(), ical);
+ sendInvitationLink(mm.getInvitation(), type, t.getSubject(),
t.getEmail(), ical, null);
}
@Override
- public void sendInvitationLink(Invitation i, MessageType type, String
subject, String message, boolean ical) throws Exception {
+ public void sendInvitationLink(Invitation i, MessageType type, String
subject, String message, boolean ical, String baseUrl) throws Exception {
String invitationLink = null;
if (type != MessageType.Cancel) {
IApplication app = ensureApplication(1L);
- invitationLink = app.getOmInvitationLink(i);
+ invitationLink = app.getOmInvitationLink(i, baseUrl);
}
User owner = i.getInvitedBy();
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 4a618be..e5247bc 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
@@ -450,8 +450,8 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
@Override
- public String getOmInvitationLink(Invitation i) {
- return getInvitationLink(i, null);
+ public String getOmInvitationLink(Invitation i, String baseUrl) {
+ return getInvitationLink(i, baseUrl);
}
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index 2b1723d..fa2a480 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -214,19 +214,20 @@ public abstract class InvitationForm extends
Form<Invitation> {
}
public void onClick(AjaxRequestTarget target, DialogButton button) {
+ final String userbaseUrl =
WebSession.get().getExtendedProperties().getBaseUrl();
if (button.equals(dialog.getCancel())) {
dialog.onSuperClick(target, button);
} else if (button.equals(dialog.getGenerate())) {
Invitation i =
create(recipients.getModelObject().iterator().next());
setModelObject(i);
- url.setModelObject(getInvitationLink(i,
WebSession.get().getExtendedProperties().getBaseUrl()));
+ url.setModelObject(getInvitationLink(i, userbaseUrl));
target.add(url);
} else if (button.equals(dialog.getSend())) {
if (Strings.isEmpty(url.getModelObject())) {
for (User u : recipients.getModelObject()) {
Invitation i = create(u);
try {
-
inviteManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false);
+
inviteManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by User ", e);
}
@@ -234,7 +235,7 @@ public abstract class InvitationForm extends
Form<Invitation> {
} else {
Invitation i = getModelObject();
try {
- inviteManager.sendInvitationLink(i,
MessageType.Create, subject.getModelObject(), message.getModelObject(), false);
+ inviteManager.sendInvitationLink(i,
MessageType.Create, subject.getModelObject(), message.getModelObject(), false,
userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by URL ", e);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index 4753b3c..80a6e43 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.room.InvitationManager;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.GroupChoiceProvider;
import org.apache.openmeetings.web.common.InvitationForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -138,11 +139,12 @@ public class RoomInvitationForm extends InvitationForm {
@Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
if (button.equals(dialog.getSend()) &&
Strings.isEmpty(url.getModelObject()) && rdi.getModelObject() ==
InviteeType.group) {
+ final String userbaseUrl =
WebSession.get().getExtendedProperties().getBaseUrl();
for (Group g : groups.getModelObject()) {
for (GroupUser ou : groupUserDao.get(g.getId(),
0, Integer.MAX_VALUE)) {
Invitation i = create(ou.getUser());
try {
-
invitationManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false);
+
invitationManager.sendInvitationLink(i, MessageType.Create,
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);
} catch (Exception e) {
log.error("error while sending
invitation by Group ", e);
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index d06908d..648dd3a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -49,6 +49,6 @@ public class TestInvitation extends AbstractWicketTester {
, us, us.getLanguageId(),
getDate(from, "GMT"),
getDate(from.plusHours(2), "GMT"), null);
- invitationManager.sendInvitationLink(i, MessageType.Create,
"subject", "message", false);
+ invitationManager.sendInvitationLink(i, MessageType.Create,
"subject", "message", false, null);
}
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 07d1303..99414b6 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -395,7 +395,7 @@ public class RoomWebService extends BaseWebService {
if (i != null) {
if (sendmail) {
try {
-
inviteManager.sendInvitationLink(i, MessageType.Create, invite.getSubject(),
invite.getMessage(), false);
+
inviteManager.sendInvitationLink(i, MessageType.Create, invite.getSubject(),
invite.getMessage(), false, null);
} catch (Exception e) {
throw new
ServiceException(e.getMessage());
}
