Skip to content

Commit 2f824d5

Browse files
committed
Don't hide completely invalid parts and better . placement
1 parent ceaf7e4 commit 2f824d5

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/Pages/Home/JwtDecoder/JwtDecoder.cshtml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@page "~/jwt-decoder"
1+
@page "~/jwt-decoder"
22
@model IdentityServerHost.Pages.Home.JwtDecoder
33

44
<div class="jwt-decoder-page">
@@ -456,10 +456,16 @@
456456
}
457457
}
458458
}
459+
else if (originalParts.length > 1) {
460+
html += `<span class="skipped">${originalParts[0]}</span>`;
461+
}
462+
463+
html += '<span class="jwt-divider">.</span>';
464+
459465
if (encodedPayload) {
460466
const originalPayload = originalParts[1];
461467
if (originalPayload === encodedPayload) {
462-
html += '<span class="jwt-divider">.</span>' + `<span class="text-success">${encodedPayload}</span>`;
468+
html += `<span class="text-success">${encodedPayload}</span>`;
463469
}
464470
else {
465471
// Show the additional characters before and after the "encodedPayload" part that are found in originalPayload
@@ -468,14 +474,20 @@
468474
if (start > 0) {
469475
html += `<span class="skipped">${originalPayload.substring(0, start)}</span>`;
470476
}
471-
html += '<span class="jwt-divider">.</span>' + `<span class="text-success">${encodedPayload}</span>`;
477+
html += `<span class="text-success">${encodedPayload}</span>`;
472478
if (end < originalPayload.length) {
473479
html += `<span class="skipped">${originalPayload.substring(end)}</span>`;
474480
}
475481
}
476482
}
483+
else if (originalParts.length > 2) {
484+
html += `<span class="skipped">${originalParts[1]}</span>`;
485+
}
486+
487+
html += '<span class="jwt-divider">.</span>';
488+
477489
if (signature) {
478-
html += '<span class="jwt-divider">.</span>' + `<span class="text-warning">${signature}</span>`;
490+
html += `<span class="text-warning">${signature}</span>`;
479491
}
480492
target.html(html);
481493
}

0 commit comments

Comments
 (0)