Fixes #611

Author: oharsta

client/src/components/SwitchField.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import "./SwitchField.scss";
 import {Switch} from "@surfnet/sds";
 
-export default function SwitchField({name, value, onChange, label, info, last = false}) {
+export default function SwitchField({name, value, onChange, label, info, last = false, disabled= false}) {
     return (
         <div className={`switch-field ${last ? "last" : ""}`}>
             <div className={"inner-switch"}>
@@ -11,6 +11,7 @@ export default function SwitchField({name, value, onChange, label, info, last =
             </div>
             <Switch name={name}
                     value={value}
+                    disabled={disabled}
                     onChange={onChange}/>
         </div>
 

client/src/pages/InvitationForm.jsx

@@ -371,7 +371,7 @@ export const InvitationForm = () => {
                 {(!isInviter && !skipRoles) && <>
                     <SelectField value={selectedRoles}
                                  options={roles.filter(role => !selectedRoles.find(r => r.value === role.value)
-                                 && isEmpty(role.crmRoleId))}
+                                     && isEmpty(role.crmRoleId))}
                                  name={I18n.t("invitations.roles")}
                                  toolTip={I18n.t("tooltips.rolesTooltip")}
                                  isMulti={true}
@@ -454,22 +454,23 @@ export const InvitationForm = () => {
                                 <UpIcon/>
                             </a>
 
-                            {overrideSettingsAllowed &&
-                                <SwitchField name={"enforceEmailEquality"}
-                                             value={invitation.enforceEmailEquality || false}
-                                             onChange={val => setInvitation({...invitation, enforceEmailEquality: val})}
-                                             label={I18n.t("invitations.enforceEmailEquality")}
-                                             info={I18n.t("tooltips.enforceEmailEqualityTooltip")}
-                                />}
-
-                            {overrideSettingsAllowed &&
-                                <SwitchField name={"eduIDOnly"}
-                                             value={invitation.eduIDOnly || false}
-                                             onChange={eduIDOnlyChanged}
-                                             label={I18n.t("invitations.eduIDOnly")}
-                                             info={I18n.t("tooltips.eduIDOnlyTooltip")}
-                                             last={invitation.eduIDOnly}
-                                />}
+
+                            <SwitchField name={"enforceEmailEquality"}
+                                         value={invitation.enforceEmailEquality || false}
+                                         onChange={val => setInvitation({...invitation, enforceEmailEquality: val})}
+                                         label={I18n.t("invitations.enforceEmailEquality")}
+                                         disabled={!overrideSettingsAllowed}
+                                         info={I18n.t("tooltips.enforceEmailEqualityTooltip")}
+                            />
+
+                            <SwitchField name={"eduIDOnly"}
+                                         value={invitation.eduIDOnly || false}
+                                         onChange={eduIDOnlyChanged}
+                                         label={I18n.t("invitations.eduIDOnly")}
+                                         disabled={!overrideSettingsAllowed}
+                                         info={I18n.t("tooltips.eduIDOnlyTooltip")}
+                                         last={invitation.eduIDOnly}
+                            />
 
                             {(overrideSettingsAllowed && invitation.eduIDOnly) &&
                                 <SelectField

server/src/main/java/invite/crm/CRMController.java

@@ -110,7 +110,7 @@ public CRMController(@Value("${crm.collab-person-prefix}") String collabPersonPr
                         crmConfigEntry -> crmConfigEntry.code(),
                         crmConfigEntry -> crmConfigEntry
                 ));
-        LOG.info(String.format("Parsed %s entries from %s", this.crmConfig.size(), crmConfigResource.getDescription()));
+        LOG.debug(String.format("Parsed %s entries from %s", this.crmConfig.size(), crmConfigResource.getDescription()));
         this.invitationRepository = invitationRepository;
     }
 
@@ -144,14 +144,14 @@ public ResponseEntity<String> delete(@RequestBody CRMContact crmContact) {
         List<Invitation> invitations = invitationRepository.findByCrmContactIdAndCrmOrganisationId(
                 crmContact.getContactId(), crmContact.getOrganisation().getOrganisationId());
         invitations.forEach(invitation -> {
-            LOG.info("Deleting CRM invitation: " + invitation.getEmail());
+            LOG.debug("Deleting CRM invitation: " + invitation.getEmail());
             this.invitationRepository.delete(invitation);
         });
 
         Optional<User> userOptional = userRepository.findByCrmContactIdAndCrmOrganisationId(
                 crmContact.getContactId(), crmContact.getOrganisation().getOrganisationId());
         userOptional.ifPresent(user -> {
-            LOG.info("Deleting CRM user: " + user.getEmail());
+            LOG.debug("Deleting CRM user: " + user.getEmail());
             this.provisioningService.deleteUserRequest(user);
             this.userRepository.delete(user);
         });
@@ -178,6 +178,10 @@ private boolean provisionUser(CRMContact crmContact) {
                     this.provisioningService.updateGroupRequest(userRole, OperationType.add);
                 });
         userRepository.save(user);
+
+        LOG.debug(String.format("Provisioned user %s with roles %s",
+                user.getEmail(), roles.stream().map(Role::getName).collect(Collectors.joining(","))));
+
         return optionalUser.isEmpty();
     }
 
@@ -193,6 +197,10 @@ private User createUser(CRMContact crmContact, String sub) {
                 StringUtils.hasText(middleName) ? String.format("%s %s", middleName, surName) : surName,
                 crmContact.getEmail());
         User user = userRepository.save(unsavedUser);
+
+        LOG.debug(String.format("Created new user %s with sub %s",
+                user.getEmail(), sub));
+
         this.provisioningService.newUserRequest(user);
         return user;
     }
@@ -244,6 +252,10 @@ private boolean sendInvitation(CRMContact crmContact) {
             Invitation invitation = createInvitation(crmContact, invitationRoles);
 
             Optional<String> idpName = identityProviderName(manage, invitation);
+
+            LOG.debug(String.format("Sending invitation to user %s for roles %s",
+                    invitation.getEmail(), roles.stream().map(Role::getName).collect(Collectors.joining(","))));
+
             mailBox.sendInviteMail(this.provisionable, invitation, groupedProviders, Language.en, idpName);
         }
         return optionalUser.isEmpty();