Skip to content

Merge back from release #177

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.

Sign up for GitHub

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

Merged
HuiJun merged 10 commits into from
Nov 9, 2021
Merged

Merge back from release #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
80caf2d
Merge pull request #152 from Open-MBEE/release/4.0.2
HuiJun Feb 18, 2021
8bbebde
Merge pull request #157 from Open-MBEE/develop
dlamoris Feb 24, 2021
0eb60ad
Merge pull request #165 from Open-MBEE/release/4.0.4
HuiJun May 14, 2021
771e2a9
Merge branch 'develop' of https://github.com/Open-MBEE/mms
HuiJun Aug 24, 2021
0b54b75
Bump version
HuiJun Oct 6, 2021
46ff2df
Mitigate possible NPE
HuiJun Oct 12, 2021
118e051
Fix the right npe
HuiJun Oct 13, 2021
d2f6b36
Always try to save attribute if null
HuiJun Oct 13, 2021
4ab7a07
Merge pull request #176 from Open-MBEE/release/4.0.5
HuiJun Oct 19, 2021
060544f
Merge branch 'master' of https://github.com/Open-MBEE/mms
HuiJun Oct 19, 2021
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=4.0.4
version=4.0.5
group=org.openmbee.mms

springBootVersion=2.2.6.RELEASE
Expand Down
12 changes: 9 additions & 3 deletions ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,19 @@ public BaseLdapPathContextSource contextSource() {
}

private User saveLdapUser(DirContextOperations userData, User saveUser) {
if (!saveUser.getEmail().equals(userData.getStringAttribute(userAttributesEmail))) {
if (saveUser.getEmail() == null ||
!saveUser.getEmail().equals(userData.getStringAttribute(userAttributesEmail))
) {
saveUser.setEmail(userData.getStringAttribute(userAttributesEmail));
}
if (!saveUser.getFirstName().equals(userData.getStringAttribute(userAttributesFirstName))) {
if (saveUser.getFirstName() == null ||
!saveUser.getFirstName().equals(userData.getStringAttribute(userAttributesFirstName))
) {
saveUser.setFirstName(userData.getStringAttribute(userAttributesFirstName));
}
if (!saveUser.getLastName().equals(userData.getStringAttribute(userAttributesLastName))) {
if (saveUser.getLastName() == null ||
!saveUser.getLastName().equals(userData.getStringAttribute(userAttributesLastName))
) {
saveUser.setLastName(userData.getStringAttribute(userAttributesLastName));
}

Expand Down