github-starred/ntfy
2
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2026-05-15 07:35:49 -06:00
Code Issues 367 Projects Packages Wiki Activity Actions

Merge pull request #1694 from ShipItAndPray/fix/token-expiration-never-edit

Browse source 
Allow edited access tokens to be set to never expire
This commit is contained in:
Philipp C. Heckel 2026-04-11 15:05:59 -04:00 • committed by GitHub
commit a063e2bb35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server/server_account_test.go
View file

@ -361,6 +361,15 @@ func TestAccount_ExtendToken(t *testing.T) {
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, "some label", token.Label) require.Equal(t, "some label", token.Label)
require.Equal(t, expires.Unix(), token.Expires) require.Equal(t, expires.Unix(), token.Expires)
body = fmt.Sprintf(`{"token":"%s", "expires": 0}`, token.Token)
rr = request(t, s, "PATCH", "/v1/account/token", body, map[string]string{
"Authorization": util.BearerAuth(token.Token),
})
require.Equal(t, 200, rr.Code)
token, err = util.UnmarshalJSON[apiAccountTokenResponse](io.NopCloser(rr.Body))
require.Nil(t, err)
require.Equal(t, int64(0), token.Expires)
}) })
} }

4
web/src/app/AccountApi.js
View file

@ -137,8 +137,8 @@ class AccountApi {
token, token,
label, label,
}; };
if (expires > 0) { if (expires >= 0) {
body.expires = Math.floor(Date.now() / 1000) + expires; body.expires = expires > 0 ? Math.floor(Date.now() / 1000) + expires : 0;
} }
console.log(`[AccountApi] Creating user access token ${url}`); console.log(`[AccountApi] Creating user access token ${url}`);
await fetchOrThrow(url, { await fetchOrThrow(url, {