Fixes #629

Author: oharsta

client/src/__tests__/utils/roles.json

@@ -7,7 +7,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "3e267427-e2cd-4b9e-9a78-9248bede1bc4",
@@ -51,7 +50,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "3cec7986-ca0c-4750-a6f3-86f2ff7fb82f",
@@ -96,7 +94,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "9ac14a11-fd43-4f9c-abeb-8bf811f134df",
@@ -162,7 +159,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "f2c99710-0cd1-4ea2-a20c-14da698a866b",
@@ -206,7 +202,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "75e4e7b6-5f98-45bc-9d10-9795316e6be0",
@@ -251,7 +246,6 @@
     "defaultExpiryDays": 365,
     "enforceEmailEquality": false,
     "eduIDOnly": false,
-    "blockExpiryDate": false,
     "overrideSettingsAllowed": false,
     "teamsOrigin": false,
     "identifier": "a2e7d57c-652c-430c-98e6-d5ac7050d979",

server/src/main/java/invite/internal/InternalInviteController.java

@@ -176,7 +176,6 @@ public ResponseEntity<Role> role(@PathVariable("id") Long id,
                                               "defaultExpiryDays": 365,
                                               "enforceEmailEquality": false,
                                               "eduIDOnly": false,
-                                              "blockExpiryDate": false,
                                               "overrideSettingsAllowed": false,
                                               "teamsOrigin": false,
                                               "identifier": "74fd8059-7558-4454-8393-fd84f74c4907",

server/src/main/java/invite/model/Role.java

@@ -52,9 +52,6 @@ public class Role implements Serializable, Provisionable {
     @Column(name = "edu_id_only")
     private boolean eduIDOnly;
 
-    @Column(name = "block_expiry_date")
-    private boolean blockExpiryDate;
-
     @Column(name = "override_settings_allowed")
     private boolean overrideSettingsAllowed;
 
@@ -146,7 +143,6 @@ public Role(RoleRequest roleRequest) {
         this.defaultExpiryDate = roleRequest.getDefaultExpiryDate();
         this.enforceEmailEquality = roleRequest.isEnforceEmailEquality();
         this.eduIDOnly = roleRequest.isEduIDOnly();
-        this.blockExpiryDate = roleRequest.isBlockExpiryDate();
         this.overrideSettingsAllowed = roleRequest.isOverrideSettingsAllowed();
         this.organizationGUID = roleRequest.getOrganizationGUID();
         this.inviterDisplayName = roleRequest.getInviterDisplayName();

server/src/main/java/invite/model/RoleRequest.java

@@ -36,8 +36,6 @@ public class RoleRequest implements Serializable{
 
     private boolean eduIDOnly;
 
-    private boolean blockExpiryDate;
-
     private boolean overrideSettingsAllowed;
 
     private String organizationGUID;

server/src/main/resources/db/mysql/migration/V53_0__drop_role_block_expiry_date.sql

@@ -0,0 +1 @@
+ALTER TABLE `roles` DROP `block_expiry_date`;

server/src/test/java/invite/api/RoleControllerTest.java

@@ -36,7 +36,6 @@ void createBySuperUser() throws Exception {
                 null,
                 false,
                 false,
-                false,
                 true,
                 "ad93daef-0911-e511-80d0-005056956c1a",
                 "From me",
@@ -71,7 +70,6 @@ void createBySuperUserMissingOrganizationGUID() throws Exception {
                 null,
                 false,
                 false,
-                false,
                 true,
                 null,
                 "From me",
@@ -97,7 +95,7 @@ void createByInstitutionAdmin() throws Exception {
 
         Instant defaultExpiryDate = Instant.now().plus(365, ChronoUnit.DAYS);
         RoleRequest roleRequest = new RoleRequest("New", "New desc", null, defaultExpiryDate,
-                false, false, false, true,
+                false, false,  true,
                 UUID.randomUUID().toString(), "From me", application("1", EntityType.SAML20_SP));
 
         super.stubForManagerProvidersByIdIn(EntityType.SAML20_SP, List.of("1"));
@@ -126,7 +124,7 @@ void createInvalidApplicationUsages() throws Exception {
         stubForManageProvisioning(List.of());
         AccessCookieFilter accessCookieFilter = openIDConnectFlow("/api/v1/users/login", SUPER_SUB);
         RoleRequest roleRequest = new RoleRequest("New", "New desc", 365, null,
-                false, false, false, true,
+                false, false,  true,
                 "ad93daef-0911-e511-80d0-005056956c1a", "From me", Set.of());
 
 
@@ -150,7 +148,7 @@ void createInvalidApplicationLandingPage() throws Exception {
         Set<ApplicationUsage> applicationUsages = application("1", EntityType.SAML20_SP);
         applicationUsages.iterator().next().setLandingPage("nope");
         RoleRequest roleRequest = new RoleRequest("New", "New desc", 365, null,
-                false, false, false, true,
+                false, false,  true,
                 "ad93daef-0911-e511-80d0-005056956c1a", "From me", applicationUsages);
 
         given()
@@ -714,7 +712,6 @@ void createWithSuperUserToken() throws Exception {
                 false,
                 false,
                 false,
-                false,
                 "ad93daef-0911-e511-80d0-005056956c1a",
                 null,
                 application("1", EntityType.SAML20_SP)