Commit 1afd9958 authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Improve token formatting.

parent cfb5d936
...@@ -2704,13 +2704,19 @@ function formatToken(token, details) { ...@@ -2704,13 +2704,19 @@ function formatToken(token, details) {
if(token.group) if(token.group)
togroup = ' to group ' + token.group; togroup = ' to group ' + token.group;
} }
let since = '';
if(token["not-before"])
since = ` since ${(new Date(token['not-before'])).toLocaleString()}`
/** @type{Date} */ /** @type{Date} */
let expires = null; let expires = null;
if(token.expires) let until = '';
expires = new Date(token.expires); if(token.expires) {
expires = new Date(token.expires)
until = ` until ${expires.toLocaleString()}`;
}
return [ return [
(expires && (expires >= new Date())) ? (expires && (expires >= new Date())) ?
`Invitation${foruser}${togroup}${by} valid until ${expires.toLocaleString()}` : `Invitation${foruser}${togroup}${by} valid${since}${until}` :
`Expired invitation${foruser}${togroup}${by}`, `Expired invitation${foruser}${togroup}${by}`,
url.toString(), url.toString(),
]; ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment