diff --git a/de.srsoftware.http/src/main/java/de/srsoftware/http/PathHandler.java b/de.srsoftware.http/src/main/java/de/srsoftware/http/PathHandler.java index 6c3afc0..f1d5bb9 100644 --- a/de.srsoftware.http/src/main/java/de/srsoftware/http/PathHandler.java +++ b/de.srsoftware.http/src/main/java/de/srsoftware/http/PathHandler.java @@ -178,6 +178,7 @@ public abstract class PathHandler implements HttpHandler { if (o instanceof List list) o = new JSONArray(list); if (o instanceof Map map) o = new JSONObject(map); if (o instanceof Error error) o = error.json(); + if (o instanceof JSONObject) ex.getResponseHeaders().add(CONTENT_TYPE, JSON); return sendContent(ex, status, o.toString().getBytes(UTF_8)); } diff --git a/de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/UserController.java b/de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/UserController.java index f915fe8..52e945a 100644 --- a/de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/UserController.java +++ b/de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/UserController.java @@ -21,7 +21,6 @@ import jakarta.mail.*; import jakarta.mail.internet.*; import java.io.IOException; import java.time.Duration; -import java.util.Comparator; import java.util.Map; import java.util.Optional; import java.util.Set; diff --git a/de.srsoftware.oidc.datastore.file/src/main/java/de/srsoftware/oidc/datastore/file/FileStore.java b/de.srsoftware.oidc.datastore.file/src/main/java/de/srsoftware/oidc/datastore/file/FileStore.java index 8e2ba9e..1348ef9 100644 --- a/de.srsoftware.oidc.datastore.file/src/main/java/de/srsoftware/oidc/datastore/file/FileStore.java +++ b/de.srsoftware.oidc.datastore.file/src/main/java/de/srsoftware/oidc/datastore/file/FileStore.java @@ -84,7 +84,7 @@ public class FileStore implements AuthorizationService, ClientService, SessionSe client.remove(scope); } } - if (client.isEmpty()) clients.remove(clientId); + // if (client.isEmpty()) clients.remove(clientId); // keep client as mark for ClientController.dash } if (clients.isEmpty()) authorizations.remove(userId); } diff --git a/de.srsoftware.oidc.web/src/main/resources/de/authorization.html b/de.srsoftware.oidc.web/src/main/resources/de/authorization.html index 0533750..bbdafd1 100644 --- a/de.srsoftware.oidc.web/src/main/resources/de/authorization.html +++ b/de.srsoftware.oidc.web/src/main/resources/de/authorization.html @@ -11,32 +11,22 @@ - - - -
- Fehlender Rückgabe-Typ: code -
- - + + + + + + \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/de/scopes/email.html b/de.srsoftware.oidc.web/src/main/resources/de/scopes/email.html new file mode 100644 index 0000000..d905564 --- /dev/null +++ b/de.srsoftware.oidc.web/src/main/resources/de/scopes/email.html @@ -0,0 +1 @@ +
  • Ihre Email-Adresse
    • \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/de/scopes/openid.html b/de.srsoftware.oidc.web/src/main/resources/de/scopes/openid.html new file mode 100644 index 0000000..6c29a88 --- /dev/null +++ b/de.srsoftware.oidc.web/src/main/resources/de/scopes/openid.html @@ -0,0 +1 @@ +
  • Ihre OpenID – damit wirst du bei der vertrauenden Website identifiziert
    • \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/de/scopes/profile.html b/de.srsoftware.oidc.web/src/main/resources/de/scopes/profile.html new file mode 100644 index 0000000..4122b66 --- /dev/null +++ b/de.srsoftware.oidc.web/src/main/resources/de/scopes/profile.html @@ -0,0 +1 @@ +
  • Zugriff auf Ihren Klar-Namen
    • \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/en/authorization.html b/de.srsoftware.oidc.web/src/main/resources/en/authorization.html index b8b29a1..623031f 100644 --- a/de.srsoftware.oidc.web/src/main/resources/en/authorization.html +++ b/de.srsoftware.oidc.web/src/main/resources/en/authorization.html @@ -22,21 +22,11 @@ - - - -
    - Missing response type: code -
    - - + + + + + + \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/en/scopes/profile.html b/de.srsoftware.oidc.web/src/main/resources/en/scopes/profile.html new file mode 100644 index 0000000..0f54bba --- /dev/null +++ b/de.srsoftware.oidc.web/src/main/resources/en/scopes/profile.html @@ -0,0 +1 @@ +
  • Access your display name
    • \ No newline at end of file diff --git a/de.srsoftware.oidc.web/src/main/resources/en/scripts/clients.js b/de.srsoftware.oidc.web/src/main/resources/en/scripts/clients.js index 1739337..46b08eb 100644 --- a/de.srsoftware.oidc.web/src/main/resources/en/scripts/clients.js +++ b/de.srsoftware.oidc.web/src/main/resources/en/scripts/clients.js @@ -28,7 +28,7 @@ function handleClients(response){ } function link(url){ - return url ? ''+url.split('?')[0]+'': ""; + return url ? ''+url.split('?')[0]+'': ""; } function handleRemove(response){ diff --git a/de.srsoftware.oidc.web/src/main/resources/en/todo.html b/de.srsoftware.oidc.web/src/main/resources/en/todo.html index 1473642..51782d2 100644 --- a/de.srsoftware.oidc.web/src/main/resources/en/todo.html +++ b/de.srsoftware.oidc.web/src/main/resources/en/todo.html @@ -13,8 +13,9 @@

    to do…