Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AUP exemption #811

Open
wants to merge 36 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
22faeb3
Bump version to 1.11.0
enricovianello Oct 16, 2024
ae09f39
Self-service upload of user certificate (#750)
darcato Oct 16, 2024
aecb995
Revert "Self-service upload of user certificate (#750)"
enricovianello Nov 26, 2024
2777efe
Revert "Bump version to 1.11.0"
enricovianello Nov 26, 2024
6018c3e
Merge branch 'v1.10.3' into develop
enricovianello Nov 26, 2024
1e75841
Bump version to 1.11.0
enricovianello Nov 26, 2024
edb3d77
Set reset service account
garaimanoj Jul 19, 2024
4bfc038
Fix vomsAc test
garaimanoj Jul 22, 2024
fdfbac2
Fix typo and set service_account default to false
garaimanoj Jul 25, 2024
06cdacc
Test ServiceAccountReplacer works
garaimanoj Jul 25, 2024
d6efb95
Test ServiceAccountReplacedEvent is called
garaimanoj Jul 29, 2024
fff9c98
Throw error on AUP update for service account
garaimanoj Aug 6, 2024
7334fd4
Send email notification on service account status change
garaimanoj Aug 6, 2024
3ccbe00
Test email notification on service account status change
garaimanoj Aug 8, 2024
d675aa9
Test email notification on scim user provisioning method call
garaimanoj Aug 12, 2024
3852038
Remove the declaration of thrown exception
garaimanoj Aug 12, 2024
e955b0c
Unit test email notifications for service account operations
garaimanoj Aug 12, 2024
03e8c5d
Add license
garaimanoj Aug 12, 2024
8a9f6a8
Add SpringBootTest annotation
garaimanoj Aug 14, 2024
6c4d30b
Add unit test for service account emails message creation
garaimanoj Aug 14, 2024
ffb4319
Test notification delivery
garaimanoj Aug 15, 2024
3b9d9e0
Move test to notification test file
garaimanoj Aug 15, 2024
1aa1efd
Delete unnecessary tests
garaimanoj Aug 16, 2024
fb3905b
Move tests to registration flow test file to pass sonar cloud
garaimanoj Aug 16, 2024
011e3ee
Address review comments
garaimanoj Aug 19, 2024
04ac5bc
Add an ExceptionHandler for IamAupSignatureUpdateError
garaimanoj Aug 20, 2024
ec22e8c
Fix test
garaimanoj Aug 20, 2024
8a18dd7
Add exception handler in AupSignaturePageController
garaimanoj Aug 21, 2024
956330a
Block AUP reminder and expiration email for service account
garaimanoj Aug 22, 2024
5107bf0
Return error message as a JSON response
garaimanoj Sep 3, 2024
9a1f87f
Add serviceAccount field inside ScimIndigoUser extension object
garaimanoj Sep 18, 2024
b780971
Fix failing tests
garaimanoj Sep 19, 2024
0e8d554
Fix failing tests
garaimanoj Sep 19, 2024
fe9cfba
Remove getServiceAccount from ScimUser
garaimanoj Sep 20, 2024
e094baa
Move V106 migrations to V108
garaimanoj Oct 18, 2024
a48620e
Fix test
garaimanoj Oct 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix failing tests
  • Loading branch information
garaimanoj authored and rmiccoli committed Dec 17, 2024

Verified

This commit was signed with the committer’s verified signature.
commit 0e8d5543be49f96e38f13db35cadba236eb1e188
Original file line number Diff line number Diff line change
@@ -91,7 +91,8 @@ private ScimIndigoUser(@JsonProperty("oidcIds") List<ScimOidcId> oidcIds,
@JsonProperty("samlIds") List<ScimSamlId> samlIds,
@JsonProperty("x509Certificates") List<ScimX509Certificate> certs,
@JsonProperty("aupSignatureTime") Date aupSignatureTime,
@JsonProperty("endTime") Date endTime, @JsonProperty("serviceAccount") Boolean serviceAccount) {
@JsonProperty("endTime") Date endTime,
@JsonProperty("serviceAccount") Boolean serviceAccount) {

this.oidcIds = oidcIds != null ? oidcIds : new LinkedList<>();
this.sshKeys = sshKeys != null ? sshKeys : new LinkedList<>();
Original file line number Diff line number Diff line change
@@ -282,6 +282,11 @@ public boolean hasName() {
return name != null;
}

public boolean hasServiceAccountStatus() {

return indigoUser != null && indigoUser.getServiceAccount() != null;
}

public static Builder builder(String username) {

return new Builder(username);
Original file line number Diff line number Diff line change
@@ -207,7 +207,10 @@ private void prepareReplacers(List<AccountUpdater> updaters, ScimUser user, IamA
addUpdater(updaters, Objects::nonNull, user::getUserName, replace::username);
addUpdater(updaters, Objects::nonNull, user::getPassword, replace::password);
addUpdater(updaters, Objects::nonNull, user::getActive, replace::active);
addUpdater(updaters, Objects::nonNull, user::getServiceAccount, replace::serviceAccount);

if (user.hasServiceAccountStatus()) {
addUpdater(updaters, Objects::nonNull, user::getServiceAccount, replace::serviceAccount);
rmiccoli marked this conversation as resolved.
Show resolved Hide resolved
}

if (user.hasEmails()) {
addUpdater(updaters, Objects::nonNull, user.getEmails().get(0)::getValue, replace::email);