Merge branch 'ldap-and-sso-auth-endpoints' into 'master' (3ae36bb4) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

3ae36bb4

Commit 3ae36bb4 authored 5 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'ldap-and-sso-auth-endpoints' into 'master'

LDAP and SSO auth endpoints

See merge request arsnova/arsnova-backend!169

parents 2fde57d7 7b8d50c4

Branches

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/config/SecurityConfig.java 2 additions, 0 deletions

src/main/java/de/thm/arsnova/config/SecurityConfig.java
src/main/java/de/thm/arsnova/controller/AuthenticationController.java 86 additions, 12 deletions

...a/de/thm/arsnova/controller/AuthenticationController.java
src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java 4 additions, 2 deletions

...e/thm/arsnova/controller/v2/AuthenticationController.java
src/main/java/de/thm/arsnova/model/AuthenticationProvider.java 2 additions, 2 deletions

...ain/java/de/thm/arsnova/model/AuthenticationProvider.java
src/main/java/de/thm/arsnova/security/LoginAuthenticationFailureHandler.java 3 additions, 2 deletions

...m/arsnova/security/LoginAuthenticationFailureHandler.java
src/main/java/de/thm/arsnova/security/LoginAuthenticationSucessHandler.java 39 additions, 5 deletions

...hm/arsnova/security/LoginAuthenticationSucessHandler.java
src/main/java/de/thm/arsnova/security/jwt/JwtService.java 6 additions, 3 deletions

src/main/java/de/thm/arsnova/security/jwt/JwtService.java
src/main/java/de/thm/arsnova/security/jwt/JwtTokenFilter.java 33 additions, 12 deletions

...main/java/de/thm/arsnova/security/jwt/JwtTokenFilter.java
src/main/java/de/thm/arsnova/service/UserService.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/service/UserService.java
src/main/java/de/thm/arsnova/service/UserServiceImpl.java 3 additions, 3 deletions

src/main/java/de/thm/arsnova/service/UserServiceImpl.java

with 179 additions and 42 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment