Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: sonar fixes. #56

Merged
merged 1 commit into from
Nov 9, 2023
Merged

fix: sonar fixes. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const logStream = {
}
};

// NOSONAR
app.use(cors());
app.use(helmet());
app.use(noCache());
Expand Down
52 changes: 23 additions & 29 deletions backend/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,11 @@ prisma.$connect().then(() => {
process.exit(1);
});

/**
* Normalize a port into a number, string, or false.
*/
function normalizePort(val) {
const portNumber = parseInt(val, 10);

if (isNaN(portNumber)) {
// named pipe
return val;
}

if (portNumber >= 0) {
// port number
return portNumber;
}

return false;
}

/**
* Event listener for HTTP server "error" event.
*/
function onError(error) {
function onError(error: { syscall: string; code: any; }) {
if (error.syscall !== 'listen') {
throw error;
}
Expand Down Expand Up @@ -76,15 +58,27 @@ function onListening() {
logger.info('Listening on ' + bind);
}

process.on('SIGINT', async () => {
await prisma.$disconnect();
server.close();
logger.info('process terminated by SIGINT');
process.exit(0);
process.on('SIGINT', () => {
prisma.$disconnect()
.then(() => {
server.close();
logger.info('process terminated by SIGINT');
process.exit(0);
})
.catch((error) => {
console.error('Error while disconnecting from Prisma:', error);
process.exit(1); // Handle the error and exit with a non-zero status code
});
});
process.on('SIGTERM', async () => {
await prisma.$disconnect();
server.close();
logger.info('process terminated by SIGTERM');
process.exit(0);
process.on('SIGTERM', () => {
prisma.$disconnect()
.then(() => {
server.close();
logger.info('process terminated by SIGTERM');
process.exit(0);
})
.catch((error) => {
console.error('Error while disconnecting from Prisma:', error);
process.exit(1); // Handle the error and exit with a non-zero status code
});
});
32 changes: 15 additions & 17 deletions backend/src/v1/routes/auth-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ router.get('/logout', async (req, res, next) => {
}
req.session.destroy();
const discovery = await utils.getOidcDiscovery();
let retUrl;
let retUrl: string;
if (idToken) {
if (req.query && req.query.sessionExpired) {
if (req.query?.sessionExpired) {
retUrl = encodeURIComponent(discovery.end_session_endpoint + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/session-expired' + '&id_token_hint=' + idToken);
} else if (req.query && req.query.loginError) {
} else if (req.query?.loginError) {
retUrl = encodeURIComponent(discovery.end_session_endpoint + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/login-error' + '&id_token_hint=' + idToken);
} else if (req.query && req.query.loginBceid) {
} else if (req.query?.loginBceid) {
retUrl = encodeURIComponent(discovery.end_session_endpoint + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/api/auth/login_bceid' + '&id_token_hint=' + idToken);
} else {
retUrl = encodeURIComponent(discovery.end_session_endpoint + '?post_logout_redirect_uri=' + config.get('server:frontend') + '/logout' + '&id_token_hint=' + idToken);
Expand Down Expand Up @@ -120,21 +120,19 @@ router.post('/refresh', [
errors: errors.array()
});
}
if (!req['user'] || !req['user'].refreshToken || !req?.user?.jwt) {
if (!req['user']?.refreshToken || !req?.user?.jwt) {
res.status(401).json(UnauthorizedRsp);
} else {
if (auth.isTokenExpired(req.user.jwt)) {
if (req?.user?.refreshToken && auth.isRenewable(req.user.refreshToken)) {
return generateTokens(req, res);
} else {
res.status(401).json(UnauthorizedRsp);
}
} else if (auth.isTokenExpired(req.user.jwt)) {
if (req?.user?.refreshToken && auth.isRenewable(req.user.refreshToken)) {
return generateTokens(req, res);
} else {
const responseJson = {
jwtFrontend: req.user.jwtFrontend
};
return res.status(200).json(responseJson);
res.status(401).json(UnauthorizedRsp);
}
} else {
const responseJson = {
jwtFrontend: req.user.jwtFrontend
};
return res.status(200).json(responseJson);
}
});

Expand All @@ -161,7 +159,7 @@ router.get('/token', auth.refreshJWT, (req, res) => {

async function generateTokens(req, res) {
const result = await auth.renew(req.user.refreshToken);
if (result && result.jwt && result.refreshToken) {
if (result?.jwt && result?.refreshToken) {
req.user.jwt = result.jwt;
req.user.refreshToken = result.refreshToken;
req.user.jwtFrontend = auth.generateUiToken();
Expand Down
Loading