steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing Object.hasOwn 

maintain support for node 14
deepsource-autofix-76c6eb20
Dan Gowans 2023-01-24 09:32:19 -05:00
parent bf672408c8
commit dbd2acce75
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app.js
View File

@ -88,15 +88,15 @@ app.use(session({
} }
})); }));
app.use((request, response, next) => { app.use((request, response, next) => {
if (Object.hasOwn(request.cookies, sessionCookieName) && if (Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName) &&
!Object.hasOwn(request.session, 'user')) { !Object.prototype.hasOwnProperty.call(request.session, 'user')) {
response.clearCookie(sessionCookieName); response.clearCookie(sessionCookieName);
} }
next(); next();
}); });
const sessionChecker = (request, response, next) => { const sessionChecker = (request, response, next) => {
if (Object.hasOwn(request.session, 'user') && if (Object.prototype.hasOwnProperty.call(request.session, 'user') &&
Object.hasOwn(request.cookies, sessionCookieName)) { Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)) {
next(); next();
return; return;
} }
@ -132,8 +132,8 @@ app.all(urlPrefix + '/keepAlive', (_request, response) => {
}); });
app.use(urlPrefix + '/login', routerLogin); app.use(urlPrefix + '/login', routerLogin);
app.get(urlPrefix + '/logout', (request, response) => { app.get(urlPrefix + '/logout', (request, response) => {
if (Object.hasOwn(request.session, 'user') && if (Object.prototype.hasOwnProperty.call(request.session, 'user') &&
Object.hasOwn(request.cookies, sessionCookieName)) { Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)) {
request.session.destroy(() => { request.session.destroy(() => {
response.clearCookie(sessionCookieName); response.clearCookie(sessionCookieName);
response.redirect(urlPrefix + '/'); response.redirect(urlPrefix + '/');

12
app.ts
View File

@ -172,8 +172,8 @@ app.use(
// Clear cookie if no corresponding session // Clear cookie if no corresponding session
app.use((request, response, next) => { app.use((request, response, next) => {
if ( if (
Object.hasOwn(request.cookies, sessionCookieName) && Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName) &&
!Object.hasOwn(request.session, 'user') !Object.prototype.hasOwnProperty.call(request.session, 'user')
) { ) {
response.clearCookie(sessionCookieName) response.clearCookie(sessionCookieName)
} }
@ -188,8 +188,8 @@ const sessionChecker = (
next: express.NextFunction next: express.NextFunction
): void => { ): void => {
if ( if (
Object.hasOwn(request.session, 'user') && Object.prototype.hasOwnProperty.call(request.session, 'user') &&
Object.hasOwn(request.cookies, sessionCookieName) Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)
) { ) {
next() next()
return return
@ -257,8 +257,8 @@ app.use(urlPrefix + '/login', routerLogin)
app.get(urlPrefix + '/logout', (request, response) => { app.get(urlPrefix + '/logout', (request, response) => {
if ( if (
Object.hasOwn(request.session, 'user') && Object.prototype.hasOwnProperty.call(request.session, 'user') &&
Object.hasOwn(request.cookies, sessionCookieName) Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)
) { ) {
request.session.destroy(() => { request.session.destroy(() => {
response.clearCookie(sessionCookieName) response.clearCookie(sessionCookieName)

2
helpers/functions.api.js
View File

@ -33,7 +33,7 @@ export async function getApiKey(userName) {
if (apiKeys === undefined) { if (apiKeys === undefined) {
await loadApiKeys(); await loadApiKeys();
} }
if (!Object.hasOwn(apiKeys, userName)) { if (!Object.prototype.hasOwnProperty.call(apiKeys, userName)) {
await regenerateApiKey(userName); await regenerateApiKey(userName);
} }
return apiKeys[userName]; return apiKeys[userName];

2
helpers/functions.api.ts
View File

@ -42,7 +42,7 @@ export async function getApiKey(userName: string): Promise<string> {
await loadApiKeys() await loadApiKeys()
} }
if (!Object.hasOwn(apiKeys, userName)) { if (!Object.prototype.hasOwnProperty.call(apiKeys, userName)) {
await regenerateApiKey(userName) await regenerateApiKey(userName)
} }

2
helpers/functions.config.js
View File

@ -52,7 +52,7 @@ export function getProperty(propertyName) {
const propertyNameSplit = propertyName.split('.'); const propertyNameSplit = propertyName.split('.');
let currentObject = config; let currentObject = config;
for (const propertyNamePiece of propertyNameSplit) { for (const propertyNamePiece of propertyNameSplit) {
if (Object.hasOwn(currentObject, propertyNamePiece)) { if (Object.prototype.hasOwnProperty.call(currentObject, propertyNamePiece)) {
currentObject = currentObject[propertyNamePiece]; currentObject = currentObject[propertyNamePiece];
continue; continue;
} }

2
helpers/functions.config.ts
View File

@ -210,7 +210,7 @@ export function getProperty(propertyName: string): unknown {
let currentObject = config let currentObject = config
for (const propertyNamePiece of propertyNameSplit) { for (const propertyNamePiece of propertyNameSplit) {
if (Object.hasOwn(currentObject, propertyNamePiece)) { if (Object.prototype.hasOwnProperty.call(currentObject, propertyNamePiece)) {
currentObject = currentObject[propertyNamePiece] currentObject = currentObject[propertyNamePiece]
continue continue
} }