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

Merge branch 'devel'

Browse Source
This commit is contained in:
Stephan Richter
2025-02-26 23:31:18 +01:00
parent 9f3500dd8f 357439ca96
commit 7255e5b4b0
5 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
de.srsoftware.oidc.backend/src/main/java/de/srsoftware/oidc/backend/ClientController.java
View File

@@ -169,7 +169,7 @@ public class ClientController extends Controller {
.stream() .stream()
.map(clients::getClient) .map(clients::getClient)
.flatMap(Optional::stream) .flatMap(Optional::stream)
.sorted(Comparator.comparing(Client::name)) .sorted(Comparator.comparing(Client::name, String.CASE_INSENSITIVE_ORDER))
.map(Client::safeMap) .map(Client::safeMap)
.toList(); .toList();
return sendContent(ex, Map.of(AUTHORZED, authorizedClients, NAME, user.realName())); return sendContent(ex, Map.of(AUTHORZED, authorizedClients, NAME, user.realName()));

4
de.srsoftware.oidc.web/src/main/resources/de/reset.html
View File

@@ -42,6 +42,10 @@
<th>Error</th> <th>Error</th>
<td class="warning">Zugriffs-Token gefunden, ist aber ungültig!</td> <td class="warning">Zugriffs-Token gefunden, ist aber ungültig!</td>
</tr> </tr>
<tr id="other_error" style="display: none">
<th>Error</th>
<td class="warning" id="other_error_text">Unbekannter Fehler!</td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td><button id="passBtn" type="button" onClick="updatePass()">Aktualisieren</button></td> <td><button id="passBtn" type="button" onClick="updatePass()">Aktualisieren</button></td>

5
de.srsoftware.oidc.web/src/main/resources/en/reset.html
View File

@@ -42,6 +42,11 @@
<th>Error</th> <th>Error</th>
<td class="warning">I received an access token, but it is invalid!</td> <td class="warning">I received an access token, but it is invalid!</td>
</tr> </tr>
<tr id="other_error" style="display: none">
<th>Error</th>
<td class="warning" id="other_error_text">Unknown error!</td>
</tr>
<tr> <tr>
<td></td> <td></td>
<td><button id="passBtn" type="button" onClick="updatePass()">Update</button></td> <td><button id="passBtn" type="button" onClick="updatePass()">Update</button></td>

12
de.srsoftware.oidc.web/src/main/resources/en/scripts/index.js
View File

@@ -11,12 +11,18 @@ function handleDash(response){
var clients = data.authorized; var clients = data.authorized;
var content = document.getElementById('content'); var content = document.getElementById('content');
var any = false; var any = false;
var lastLetter = null;
for (let id in clients){ for (let id in clients){
var client = clients[id]; var client = clients[id];
if (client.landing_page){ if (client.landing_page){
var div = document.createElement("div"); var initialLetter = client.name.charAt(0).toUpperCase();
div.innerHTML = `<button onclick="window.open('${client.landing_page}','_blank').focus();">${client.name}</button>`; if (initialLetter != lastLetter) {
content.append(div); if (lastLetter) content.append(document.createElement("br"));
lastLetter = initialLetter;
}
var span = document.createElement("span");
span.innerHTML = `<button onclick="window.location.href='${client.landing_page}';">${client.name}</button>`;
content.append(span);
any = true; any = true;
} }
} }

12
de.srsoftware.oidc.web/src/main/resources/en/scripts/reset.js
View File

@@ -10,10 +10,14 @@ function handlePasswordResponse(response){
} else { } else {
setText('passBtn', 'Update failed!'); setText('passBtn', 'Update failed!');
response.text().then(text => { response.text().then(text => {
if (text == 'invalid token') show('invalid_token'); if (text == 'invalid token') show('invalid_token'); else
if (text == 'token missing') show('missing_token'); if (text == 'token missing') show('missing_token'); else
if (text == 'password mismatch') show('password_mismatch'); if (text == 'password mismatch') show('password_mismatch'); else
if (text == 'weak password') show('weak_password'); if (text == 'weak password') show('weak_password'); else {
setText('other_error_text',text);
show('other_error');
}
}); });
} }
enable('passBtn'); enable('passBtn');