(openmeetings) branch master updated: [OPENMEETINGS-2827] Invitation hash generation is disabled for non-contact user

[solomax]

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 c6d6da749 [OPENMEETINGS-2827] Invitation hash generation is disabled 
for non-contact user
c6d6da749 is described below

commit c6d6da7498a90fc14d542c4f0d00aac6a0548246
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Wed Aug 26 14:04:52 2026 +0700

    [OPENMEETINGS-2827] Invitation hash generation is disabled for non-contact 
user
---
 .../openmeetings/web/common/InvitationForm.java    | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

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 80e0dd21c..e804db171 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
@@ -148,17 +148,20 @@ public abstract class InvitationForm extends 
Form<Invitation> {
                super.onInitialize();
        }
 
+       private static boolean isGenerateEnabled(Collection<User> recpnts) {
+               return recpnts.size() == 1
+                       && recpnts.stream()
+                               .findFirst()
+                               .map(u -> getUserId().equals(u.getId()) || 
User.Type.CONTACT == u.getType())
+                               .orElse(false);
+       }
+
        protected void updateButtons(AjaxRequestTarget target) {
                Collection<User> recpnts = recipients.getModelObject();
-               boolean generateEnabled = false;
-               if (recpnts.size() == 1) {
-                       User u = recpnts.iterator().next();
-                       generateEnabled = getUserId().equals(u.getId()) || 
User.Type.CONTACT == u.getType();
-               }
-               target.add(
-                               dialog.getSend().setEnabled(!recpnts.isEmpty())
-                               , 
dialog.getGenerate().setEnabled(generateEnabled)
-                               );
+               boolean generateEnabled = isGenerateEnabled(recpnts);
+               target.add(dialog.getSend().setEnabled(!recpnts.isEmpty())
+                       , dialog.getGenerate().setEnabled(generateEnabled)
+               );
        }
 
        @Override
@@ -227,14 +230,15 @@ public abstract class InvitationForm extends 
Form<Invitation> {
 
        public void onClick(AjaxRequestTarget target, Action action) {
                final String userbaseUrl = 
WebSession.get().getExtendedProperties().getBaseUrl();
-               if (Action.GENERATE == action) {
-                       Invitation i = 
create(recipients.getModelObject().iterator().next());
+               Collection<User> recpnts = recipients.getModelObject();
+               if (Action.GENERATE == action && isGenerateEnabled(recpnts)) {
+                       Invitation i = create(recpnts.iterator().next());
                        setModelObject(i);
                        url.setModelObject(getInvitationLink(i, userbaseUrl));
                        target.add(url);
                } else {
                        if (Strings.isEmpty(url.getModelObject())) {
-                               for (User u : recipients.getModelObject()) {
+                               for (User u : recpnts) {
                                        Invitation i = create(u);
                                        try {
                                                
inviteManager.sendInvitationLink(i, MessageType.CREATE, 
subject.getModelObject(), message.getModelObject(), false, userbaseUrl);