0ct0pu5/homepage
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #594 from benphelps/fix-591

Browse source 
Fix: Add token expiration, tweak error handling for npm
This commit is contained in:
shamoon 2022-11-30 09:57:26 -08:00 • committed by GitHub
commit df5ff48000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/widgets/npm/proxy.js
View file

@ -20,12 +20,18 @@ async function login(loginUrl, username, password) {
});
const status = authResponse[0];
const data = JSON.parse(Buffer.from(authResponse[2]).toString());
let data = authResponse[2];
if (status === 200) {
cache.put(tokenCacheKey, data.token);
try {
data = JSON.parse(Buffer.from(authResponse[2]).toString());
if (status === 200) {
const expiration = new Date(data.expires) - Date.now();
cache.put(tokenCacheKey, data.token, expiration - (5 * 60 * 1000)); // expiration -5 minutes
}
} catch (e) {
logger.error(`Error ${status} logging into npm`, authResponse[2]);
}
return [status, data.token ?? data];
}
@ -51,8 +57,8 @@ export default async function npmProxyHandler(req, res) {
if (!token) {
[status, token] = await login(loginUrl, widget.username, widget.password);
if (status !== 200) {
logger.debug(`HTTTP ${status} logging into npm api: ${data}`);
return res.status(status).send(data);
logger.debug(`HTTTP ${status} logging into npm api: ${token}`);
return res.status(status).send(token);
}
}