Skip to content

Commit 9cb350b

Browse files
phavekesphavekes
authored
Merge branch 'main' into feature/swagger_description_rolerequest
2 parents f0e58af + db927fe commit 9cb350b

8 files changed

Lines changed: 8 additions & 23 deletions

File tree

‎.github/badges/branches.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎client/src/__tests__/utils/roles.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"defaultExpiryDays": 365,
88
"enforceEmailEquality": false,
99
"eduIDOnly": false,
10-
"blockExpiryDate": false,
1110
"overrideSettingsAllowed": false,
1211
"teamsOrigin": false,
1312
"identifier": "3e267427-e2cd-4b9e-9a78-9248bede1bc4",
@@ -51,7 +50,6 @@
5150
"defaultExpiryDays": 365,
5251
"enforceEmailEquality": false,
5352
"eduIDOnly": false,
54-
"blockExpiryDate": false,
5553
"overrideSettingsAllowed": false,
5654
"teamsOrigin": false,
5755
"identifier": "3cec7986-ca0c-4750-a6f3-86f2ff7fb82f",
@@ -96,7 +94,6 @@
9694
"defaultExpiryDays": 365,
9795
"enforceEmailEquality": false,
9896
"eduIDOnly": false,
99-
"blockExpiryDate": false,
10097
"overrideSettingsAllowed": false,
10198
"teamsOrigin": false,
10299
"identifier": "9ac14a11-fd43-4f9c-abeb-8bf811f134df",
@@ -162,7 +159,6 @@
162159
"defaultExpiryDays": 365,
163160
"enforceEmailEquality": false,
164161
"eduIDOnly": false,
165-
"blockExpiryDate": false,
166162
"overrideSettingsAllowed": false,
167163
"teamsOrigin": false,
168164
"identifier": "f2c99710-0cd1-4ea2-a20c-14da698a866b",
@@ -206,7 +202,6 @@
206202
"defaultExpiryDays": 365,
207203
"enforceEmailEquality": false,
208204
"eduIDOnly": false,
209-
"blockExpiryDate": false,
210205
"overrideSettingsAllowed": false,
211206
"teamsOrigin": false,
212207
"identifier": "75e4e7b6-5f98-45bc-9d10-9795316e6be0",
@@ -251,7 +246,6 @@
251246
"defaultExpiryDays": 365,
252247
"enforceEmailEquality": false,
253248
"eduIDOnly": false,
254-
"blockExpiryDate": false,
255249
"overrideSettingsAllowed": false,
256250
"teamsOrigin": false,
257251
"identifier": "a2e7d57c-652c-430c-98e6-d5ac7050d979",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ public ResponseEntity<Role> role(@PathVariable("id") Long id,
176176
"defaultExpiryDays": 365,
177177
"enforceEmailEquality": false,
178178
"eduIDOnly": false,
179-
"blockExpiryDate": false,
180179
"overrideSettingsAllowed": false,
181180
"teamsOrigin": false,
182181
"identifier": "74fd8059-7558-4454-8393-fd84f74c4907",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ public class Role implements Serializable, Provisionable {
5252
@Column(name = "edu_id_only")
5353
private boolean eduIDOnly;
5454

55-
@Column(name = "block_expiry_date")
56-
private boolean blockExpiryDate;
57-
5855
@Column(name = "override_settings_allowed")
5956
private boolean overrideSettingsAllowed;
6057

@@ -146,7 +143,6 @@ public Role(RoleRequest roleRequest) {
146143
this.defaultExpiryDate = roleRequest.getDefaultExpiryDate();
147144
this.enforceEmailEquality = roleRequest.isEnforceEmailEquality();
148145
this.eduIDOnly = roleRequest.isEduIDOnly();
149-
this.blockExpiryDate = roleRequest.isBlockExpiryDate();
150146
this.overrideSettingsAllowed = roleRequest.isOverrideSettingsAllowed();
151147
this.organizationGUID = roleRequest.getOrganizationGUID();
152148
this.inviterDisplayName = roleRequest.getInviterDisplayName();

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public class RoleRequest implements Serializable{
4343
@Schema(description = "The invite can only be accepted by an eduID account", defaultValue = "false")
4444
private boolean eduIDOnly;
4545

46-
private boolean blockExpiryDate;
47-
4846
@Schema(description = "Allow changing the settings when sending an invite.", defaultValue = "false")
4947
private boolean overrideSettingsAllowed;
5048

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `roles` DROP `block_expiry_date`;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ void createBySuperUser() throws Exception {
3636
null,
3737
false,
3838
false,
39-
false,
4039
true,
4140
"ad93daef-0911-e511-80d0-005056956c1a",
4241
"From me",
@@ -71,7 +70,6 @@ void createBySuperUserMissingOrganizationGUID() throws Exception {
7170
null,
7271
false,
7372
false,
74-
false,
7573
true,
7674
null,
7775
"From me",
@@ -97,7 +95,7 @@ void createByInstitutionAdmin() throws Exception {
9795

9896
Instant defaultExpiryDate = Instant.now().plus(365, ChronoUnit.DAYS);
9997
RoleRequest roleRequest = new RoleRequest("New", "New desc", null, defaultExpiryDate,
100-
false, false, false, true,
98+
false, false, true,
10199
UUID.randomUUID().toString(), "From me", application("1", EntityType.SAML20_SP));
102100

103101
super.stubForManagerProvidersByIdIn(EntityType.SAML20_SP, List.of("1"));
@@ -126,7 +124,7 @@ void createInvalidApplicationUsages() throws Exception {
126124
stubForManageProvisioning(List.of());
127125
AccessCookieFilter accessCookieFilter = openIDConnectFlow("/api/v1/users/login", SUPER_SUB);
128126
RoleRequest roleRequest = new RoleRequest("New", "New desc", 365, null,
129-
false, false, false, true,
127+
false, false, true,
130128
"ad93daef-0911-e511-80d0-005056956c1a", "From me", Set.of());
131129

132130

@@ -150,7 +148,7 @@ void createInvalidApplicationLandingPage() throws Exception {
150148
Set<ApplicationUsage> applicationUsages = application("1", EntityType.SAML20_SP);
151149
applicationUsages.iterator().next().setLandingPage("nope");
152150
RoleRequest roleRequest = new RoleRequest("New", "New desc", 365, null,
153-
false, false, false, true,
151+
false, false, true,
154152
"ad93daef-0911-e511-80d0-005056956c1a", "From me", applicationUsages);
155153

156154
given()
@@ -714,7 +712,6 @@ void createWithSuperUserToken() throws Exception {
714712
false,
715713
false,
716714
false,
717-
false,
718715
"ad93daef-0911-e511-80d0-005056956c1a",
719716
null,
720717
application("1", EntityType.SAML20_SP)

‎welcome/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,9 +2536,9 @@ lodash.merge@^4.6.2:
25362536
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
25372537

25382538
lodash@*:
2539-
version "4.17.21"
2540-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
2541-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
2539+
version "4.17.23"
2540+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
2541+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
25422542

25432543
loose-envify@^1.4.0:
25442544
version "1.4.0"

0 commit comments

Comments
 (0)