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.

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

Feat/vic 1421 admin console set two factor authentication #493

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Feat/vic 1421 admin console set two factor authentication #493

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2697c89
Merge pull request #50 from virtualidentityag/VIC-746-add-demographic…
tkuzynow Jul 25, 2022
665b800
Merge pull request #51 from Onlineberatung/develop
tkuzynow Jul 27, 2022
465cff9
feat: enable ghcr registry
Aug 5, 2022
07c9425
Merge pull request #52 from Onlineberatung/develop
mebo4b Aug 8, 2022
b9d96e2
Merge pull request #53 from Onlineberatung/develop
tkuzynow Aug 10, 2022
5600eb2
Merge pull request #54 from Onlineberatung/develop
patric-dosch-vi Aug 12, 2022
6b502ab
Merge pull request #55 from Onlineberatung/develop
tkuzynow Aug 17, 2022
149c165
Merge pull request #56 from Onlineberatung/develop
patric-dosch-vi Aug 18, 2022
2440dff
Merge pull request #58 from Onlineberatung/develop
patric-dosch-vi Aug 19, 2022
f52ad53
Merge pull request #59 from Onlineberatung/develop
patric-dosch-vi Aug 22, 2022
e8db0ed
Merge pull request #60 from Onlineberatung/develop
patric-dosch-vi Aug 23, 2022
3ac1e01
Merge pull request #61 from Onlineberatung/develop
tkuzynow Aug 24, 2022
148fe30
Merge pull request #62 from Onlineberatung/develop
tkuzynow Aug 24, 2022
154be91
feat/VIC-1421: Admin console: Set Two-Factor-Authentication
adnanalicic Sep 1, 2022
05adb40
feat/VIC-1421: Admin console: Set Two-Factor-Authentication
adnanalicic Sep 1, 2022
ed13c95
feat/VIC-1421: Admin console: Set Two-Factor-Authentication
adnanalicic Sep 5, 2022
0bec25d
Merge branch 'develop' into feat/VIC_1421Admin_console_Set_Two-Factor…
adnanalicic Sep 14, 2022
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
6 changes: 1 addition & 5 deletions src/main/java/de/caritas/cob/userservice/api/config/auth/IdentityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,7 @@ private void addPath(String path, String arg, UriComponentsBuilder builder) {
public boolean isOtpAllowed(@NotNull Set<String> roles) {
return roles.contains(UserRole.USER.getValue()) && otpAllowedForUsers
|| roles.contains(UserRole.CONSULTANT.getValue()) && otpAllowedForConsultants
|| isMultitenancyEnabledAndOtpAllowed(roles);
}

private boolean isMultitenancyEnabledAndOtpAllowed(Set<String> roles) {
return multiTenancyEnabled && isAnyTenantAdminAndOtpIsAllowed(roles);
|| isAnyTenantAdminAndOtpIsAllowed(roles);
}

private boolean isAnyTenantAdminAndOtpIsAllowed(Set<String> roles) {
Expand Down