Skip to content

Commit 9b587ac

Browse files
committed
Bugfix for accepting an invitation created by remote API user
1 parent e6635ea commit 9b587ac

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

server/src/main/java/access/api/InvitationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public ResponseEntity<Map<String, Object>> accept(@Validated @RequestBody Accept
220220
}
221221
} else {
222222
UserRole userRole = new UserRole(
223-
inviter.getName(),
223+
inviter != null ? inviter.getName() : invitation.getRemoteApiUser(),
224224
user,
225225
role,
226226
intendedAuthority,
@@ -230,7 +230,7 @@ public ResponseEntity<Map<String, Object>> accept(@Validated @RequestBody Accept
230230
newUserRoles.add(userRole);
231231
}
232232
});
233-
if (intendedAuthority.equals(Authority.INSTITUTION_ADMIN)) {
233+
if (intendedAuthority.equals(Authority.INSTITUTION_ADMIN) && inviter != null) {
234234
user.setInstitutionAdmin(true);
235235
user.setInstitutionAdminByInvite(true);
236236
//Might be that a super-user has invited the institution admin or a different institution admin

0 commit comments

Comments
 (0)