WIP for #564

Author: oharsta

client/src/pages/InvitationForm.jsx

@@ -29,7 +29,7 @@ import ErrorIndicator from "../components/ErrorIndicator";
 import SelectField from "../components/SelectField";
 import {DateField} from "../components/DateField";
 import EmailField from "../components/EmailField";
-import {displayExpiryDate, futureDate} from "../utils/Date";
+import {deriveExpirationDate, displayExpiryDate, futureDate} from "../utils/Date";
 import SwitchField from "../components/SwitchField";
 import {InvitationRoleCard} from "../components/InvitationRoleCard";
 import DOMPurify from "dompurify";
@@ -144,27 +144,26 @@ export const InvitationForm = () => {
         const initialRole = markedRoles.find(role => role.value === location.state);
         if (initialRole) {
             // See markAndFilterRoles - we are mixing up userRoles and roles
-            const defaultExpiryDays = initialRole.isUserRole ? initialRole.role.defaultExpiryDays : initialRole.defaultExpiryDays;
             setSelectedRoles([initialRole])
             setInvitation({
                 ...invitation,
                 intendedAuthority: isGuest ? AUTHORITIES.GUEST : AUTHORITIES.INVITER,
                 enforceEmailEquality: initialRole.enforceEmailEquality,
                 eduIDOnly: initialRole.eduIDOnly,
-                roleExpiryDate: futureDate(defaultExpiryDays)
+                roleExpiryDate: deriveExpirationDate(initialRole.isUserRole ? initialRole.role : initialRole)
             })
             setOriginalRoleId(initialRole.isUserRole ? initialRole.role.id : initialRole.id);
         } else {
-            let defaultExpiryDays = 366;
+            let roleExpiryDate = futureDate(366);
             if (markedRoles.length === 1) {
                 const role = markedRoles[0]
-                defaultExpiryDays = role.isUserRole ? role.role.defaultExpiryDays : role.defaultExpiryDays;
+                roleExpiryDate = deriveExpirationDate(role.isUserRole ? role.role : role);
                 setSelectedRoles(markedRoles);
             }
             setInvitation({
                 ...invitation,
                 intendedAuthority: isGuest ? AUTHORITIES.GUEST : AUTHORITIES.INVITER,
-                roleExpiryDate: futureDate(defaultExpiryDays)
+                roleExpiryDate: roleExpiryDate
             })
         }
     }
@@ -215,14 +214,11 @@ export const InvitationForm = () => {
     }
 
     const defaultRoleExpiryDate = newRoles => {
-        const allDefaultExpiryDays = (newRoles || [])
-            .filter(role => role.defaultExpiryDays)
-            .map(role => role.defaultExpiryDays)
-            .sort();
-        if (invitation.intendedAuthority === AUTHORITIES.GUEST) {
-            return futureDate(isEmpty(allDefaultExpiryDays) ? 365 : allDefaultExpiryDays[0]);
-        }
-        return invitation.roleExpiryDate;
+        const allDefaultExpiryDates = (newRoles || [])
+            .map(role => deriveExpirationDate(role));
+
+        return isEmpty(allDefaultExpiryDates) ? futureDate(365, new Date()) :
+            new Date(Math.max(...allDefaultExpiryDates.map(d => d.getTime())));
     }
 
     const validateOrganizationGUID = e => {
@@ -431,7 +427,7 @@ export const InvitationForm = () => {
                 <InviterContainer isInviter={isInviter}>
                     {renderFormElements(authorityOptions)}
                 </InviterContainer>
-
+                <h1>roleExpiryDate: {invitation.roleExpiryDate.toString()}</h1>
                 <InviterContainer isInviter={isInviter}>
                     {!displayAdvancedSettings &&
                         <a className={`advanced-settings ${isInviter ? "inviter" : ""}`} href="/#"

client/src/utils/Date.js

@@ -9,6 +9,14 @@ export const futureDate = (daysAhead, fromDate = new Date()) => {
     return new Date(time);
 }
 
+export const deriveExpirationDate = role => {
+    if (!isEmpty(role.defaultExpiryDate)) {
+        //When the role is serialized from the Server, then the defaultExpiryDate in epoch / 1000, else a genuine Date
+        return role.defaultExpiryDate.getTime ? role.defaultExpiryDate : new Date(role.defaultExpiryDate * 1000);
+    }
+    return futureDate(role.defaultExpiryDays);
+}
+
 const formatOptions = {month: "short", day: "numeric", year: "numeric"};
 
 export const shortDateFromEpoch = (epoch, needsMultiplier = true) => {

server/src/main/java/invite/api/RoleController.java

@@ -130,11 +130,13 @@ public ResponseEntity<List<Role>> rolesPerApplicationId(@PathVariable("manageId"
         LOG.debug(String.format("/rolesPerApplicationId for user %s", user.getEduPersonPrincipalName()));
 
         UserPermissions.assertAuthority(user, Authority.INSTITUTION_ADMIN);
-
-        if (!user.isSuperUser()) {
+        List<Role> roles;
+        if (user.isSuperUser()) {
+            roles = roleRepository.findByApplicationUsagesApplicationManageId(manageId);
+        } else {
             Set<String> applicationManageIdentifiers = user.getApplications().stream().map(m -> (String) m.get("id")).collect(Collectors.toSet());
             Set<String> roleManageIdentifiers = user.getUserRoles().stream()
-                    //If the user has an userRole as Inviter, then we must exclude those
+                    //If the user has a userRole as Inviter, then we must exclude those
                     .filter(userRole -> userRole.getAuthority().hasEqualOrHigherRights(Authority.MANAGER))
                     .map(userRole -> userRole.getRole().applicationsUsed())
                     .flatMap(Collection::stream)
@@ -144,8 +146,8 @@ public ResponseEntity<List<Role>> rolesPerApplicationId(@PathVariable("manageId"
             if (!applicationManageIdentifiers.contains(manageId)) {
                 throw new UserRestrictionException();
             }
+            roles = roleRepository.findByOrganizationGUIDAndApplicationUsagesApplicationManageId(user.getOrganizationGUID(), manageId);
         }
-        List<Role> roles = roleRepository.findByApplicationUsagesApplicationManageId(manageId);
         return ResponseEntity.ok(manage.addManageMetaData(roles));
     }
 

server/src/main/java/invite/repository/RoleRepository.java

@@ -68,6 +68,8 @@ SELECT COUNT(r.id) FROM roles r WHERE r.organization_guid = ?1
 
     List<Role> findByApplicationUsagesApplicationManageId(String manageId);
 
+    List<Role> findByOrganizationGUIDAndApplicationUsagesApplicationManageId(String organizationGUID, String manageId);
+
     List<Role> findByOrganizationGUID(String organizationGUID);
 
     Optional<Role> findByName(String name);