StephanRichter/LightOidc
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

replaced Content by Payload due to upstream library changes

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2024-12-17 13:18:25 +01:00
parent f593e7b2c9
commit 5d70e687f6
10 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
de.srsoftware.oidc.backend/build.gradle.kts
View File

@@ -4,7 +4,7 @@ dependencies{
implementation("com.sun.mail:jakarta.mail:2.0.1")
implementation("de.srsoftware:tools.http:1.0.1")
implementation("de.srsoftware:tools.optionals:1.0.0")
implementation("de.srsoftware:tools.util:1.0.3")
implementation("de.srsoftware:tools.util:1.1.0")
implementation("org.bitbucket.b_c:jose4j:0.9.6")
implementation("org.json:json:20240303")

4
de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/UserController.java
View File

@@ -14,7 +14,7 @@ import de.srsoftware.oidc.api.*;
import de.srsoftware.oidc.api.data.Permission;
import de.srsoftware.oidc.api.data.Session;
import de.srsoftware.oidc.api.data.User;
import de.srsoftware.tools.Content;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import de.srsoftware.tools.SessionToken;
import jakarta.mail.*;
@@ -198,7 +198,7 @@ public class UserController extends Controller {
var trust = body.has(TRUST) && body.getBoolean(TRUST);
Result<User> result = users.login(username, password);
if (result instanceof Content<User> user) return sendUserAndCookie(ex, sessions.createSession(user.get(), trust), user.get());
if (result instanceof Payload<User> user) return sendUserAndCookie(ex, sessions.createSession(user.get(), trust), user.get());
return sendContent(ex, HTTP_UNAUTHORIZED, result);
}