github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

push changes

Browse Source
This commit is contained in:
Nawaz Dhandala
2021-12-31 12:36:04 +05:30
parent eb50ac7d7b
commit ffcc2fcf7b
10 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/backend/api/statusPage.js
View File

@@ -67,12 +67,12 @@ router.post('/:projectId/tweets', checkUser, async (req, res) => {
try {
let { handle } = req.body;
if(handle.includes("https://twitter.com/")){
handle = handle.replace("https://twitter.com/","");
if (handle.includes('https://twitter.com/')) {
handle = handle.replace('https://twitter.com/', '');
}
if(handle.includes("http://twitter.com/")){
handle = handle.replace("http://twitter.com/","");
if (handle.includes('http://twitter.com/')) {
handle = handle.replace('http://twitter.com/', '');
}
if (!handle || (handle && handle.trim().length === 0)) {

24
backend/backend/middlewares/auditLogs.js
View File

@@ -14,6 +14,9 @@ const sendErrorResponse = require('./response').sendErrorResponse;
const { getProjectId } = require('./api');
const GlobalConfigService = require('../services/globalConfigService');
// TODO: This should be stored in a shared cache like redis.
let shouldStoreLogs = null;
module.exports = {
log: async function(req, res, next) {
try {
@@ -37,16 +40,19 @@ module.exports = {
let projectId = getProjectId(req, res);
projectId = isValidMongoObjectId(projectId) ? projectId : null;
const auditLogStatus = await GlobalConfigService.findOneBy({
query: { name: 'auditLogMonitoringStatus' },
select: 'value',
});
// check if the global config has auditLog flag and is storing logs before trying to store logs
const shouldStoreLogs = !(
auditLogStatus && !auditLogStatus.value
);
// skip storing if audit log config exist and it is not storing
if (shouldStoreLogs === null) {
const auditLogStatus = await GlobalConfigService.findOneBy({
query: { name: 'auditLogMonitoringStatus' },
select: 'value',
});
// check if the global config has auditLog flag and is storing logs before trying to store logs
shouldStoreLogs = !(
auditLogStatus && !auditLogStatus.value
);
}
// skip storing if audit log config exist and it is not storing
if (shouldStoreLogs) {
// store logs if storing
const parsedUrl = url.parse(req.originalUrl);

2
backend/backend/middlewares/probeAuthorization.js
View File

@@ -23,8 +23,6 @@ global.probes = {};
module.exports = {
isAuthorizedProbe: async function(req, res, next) {
console.log("IsAuthorizedProbe");
try {
let probeKey, probeName, clusterKey, probeVersion;

5
backend/backend/services/probeService.js
View File

@@ -838,15 +838,14 @@ module.exports = {
},
updateProbeStatus: async function(probeId) {
console.log("Updating Probe Status")
try {
const probe = await ProbeModel.findOneAndUpdate(
{ _id: probeId },
{ $set: { lastAlive: Date.now() } },
{ new: true }
);
console.log("Probe Status Updated!")
console.log(probe)
return probe;
} catch (error) {
ErrorService.log('probeService.updateProbeStatus', error);

44
backend/backend/services/statusPageService.js
View File

@@ -2229,32 +2229,32 @@ module.exports = {
fetchTweets: async handle => {
try {
// const userData = await axios.get(
// `https://api.twitter.com/2/users/by/username/${handle}?user.fields=id`,
// {
// headers: {
// Authorization: `Bearer ${bearer}`,
// },
// }
// );
const userData = await axios.get(
`https://api.twitter.com/2/users/by/username/${handle}?user.fields=id`,
{
headers: {
Authorization: `Bearer ${bearer}`,
},
}
);
// const userId = userData?.data?.data?.id || false;
// let response = '';
const userId = userData?.data?.data?.id || false;
let response = '';
// if (userId) {
// const tweetData = await axios.get(
// `https://api.twitter.com/2/users/${userId}/tweets?tweet.fields=created_at&exclude=retweets,replies`,
// {
// headers: {
// Authorization: `Bearer ${bearer}`,
// },
// }
// );
if (userId) {
const tweetData = await axios.get(
`https://api.twitter.com/2/users/${userId}/tweets?tweet.fields=created_at&exclude=retweets,replies`,
{
headers: {
Authorization: `Bearer ${bearer}`,
},
}
);
// response = tweetData.data.data;
// }
response = tweetData.data.data;
}
return [];
return response;
} catch (error) {
ErrorService.log('statusPageService.fetchTweets', error);
throw error;

17
backend/package-lock.json generated
View File

@@ -26,6 +26,7 @@
"ejs": "^3.1.6",
"express": "^4.17.1",
"express-rate-limit": "^5.2.6",
"express-request-id": "^1.4.1",
"fyipe-acme-http-01": "^3.0.10432",
"fyipe-gl-manager": "^3.0.13361",
"fyipe-le-store": "^3.0.10432",
@@ -3565,6 +3566,14 @@
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.6.tgz",
"integrity": "sha512-nE96xaxGfxiS5jP3tD3kIW1Jg9yQgX0rXCs3rCkZtmbWHEGyotwaezkLj7bnB41Z0uaOLM8W4AX6qHao4IZ2YA=="
},
"node_modules/express-request-id": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz",
"integrity": "sha512-qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw==",
"dependencies": {
"uuid": "^3.3.2"
}
},
"node_modules/extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -12311,6 +12320,14 @@
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.6.tgz",
"integrity": "sha512-nE96xaxGfxiS5jP3tD3kIW1Jg9yQgX0rXCs3rCkZtmbWHEGyotwaezkLj7bnB41Z0uaOLM8W4AX6qHao4IZ2YA=="
},
"express-request-id": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz",
"integrity": "sha512-qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw==",
"requires": {
"uuid": "^3.3.2"
}
},
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",

1
backend/package.json
View File

@@ -20,6 +20,7 @@
"ejs": "^3.1.6",
"express": "^4.17.1",
"express-rate-limit": "^5.2.6",
"express-request-id": "^1.4.1",
"fyipe-acme-http-01": "^3.0.10432",
"fyipe-gl-manager": "^3.0.13361",
"fyipe-le-store": "^3.0.10432",

8
backend/server.js
View File

@@ -14,8 +14,12 @@ const express = require('express');
const Sentry = require('@sentry/node');
const Tracing = require('@sentry/tracing');
const logger = require('./backend/config/logger');
const expressRequestId = require('express-request-id')();
const app = express();
app.use(expressRequestId);
Sentry.init({
dsn: process.env.SENTRY_DSN,
release: `oneuptime-backend@${process.env.npm_package_version}`,
@@ -72,7 +76,7 @@ const bodyParser = require('body-parser');
const cors = require('cors');
// const redis = require('redis');
const mongoose = require('./backend/config/db');
const Gl = require('greenlock');
// const Gl = require('greenlock');
const ErrorService = require('./backend/services/errorService');
// try {
@@ -375,7 +379,7 @@ app.use(
app.use(['/api'], require('./backend/api/apiStatus'));
app.use('/*', function(req, res) {
res.status(404).send('Api endpoint not found');
res.status(404).send('Endpoint not found.');
});
app.use(Sentry.Handlers.errorHandler());

4
backend/test/slack.test.js
View File

@@ -12,9 +12,7 @@ const GlobalConfig = require('./utils/globalConfig');
// eslint-disable-next-line
let token,
projectId,
anotherUser,
log = obj => console.log(obj);
projectId;
describe('Slack API', function() {
this.timeout(20000);

1
package-lock.json generated
View File

@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
"name": "app",
"version": "3.0.2",
"license": "ISC",
"dependencies": {