Skip to content

Commit

Permalink
Discussion Hub changes for removing oidc Plugin (#41)
Browse files Browse the repository at this point in the history 
* NodeBB create User

* Updated the order of the API paths

* updated docker file to call npm install

* Added axios package

* Removed telemetry helper

* Made the API changes for getUser

* update the urlParam for Request

* Adding the user create API

* request Body Fix

* ResponseChanges

* User Read API Url modified

* Adding email Vaildation

* Remove the content Read

* Adding cassandra Impl

* Adding port in config

---------

Co-authored-by: Karthikeyan Rajendran <[email protected]>
Co-authored-by: Haritest <[email protected]>
  • Loading branch information
@Sahil-tarento @karthik-tarento @Haritest
3 people authored Jan 31, 2024
1 parent a8f5fc7 commit 4c92fb5
Show file tree
Hide file tree
Showing 4 changed files with 190 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ MAINTAINER anjana <[email protected]>
WORKDIR /work
COPY ./ /work
EXPOSE 3002
RUN npm i
RUN npm install --only=production
CMD npm run start
9 changes: 8 additions & 1 deletion helpers/environmentVariablesHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ const __envIn = 'dev';
let devEnvVariables = {
NODEBB_SERVICE_URL: env.nodebb_service_url || 'https://dev.sunbirded.org', //'http://nodebb-service:4567/api',
Authorization: env.authorization_token || 'd8402b15-1d5f-4d84-9fae-595ef805f287', // '9c1adb65-14a9-421d-be75-6006f49c85b6',
nodebb_api_slug: env.nodebb_api_slug || '/discussions/api'
nodebb_api_slug: env.nodebb_api_slug || '/discussions/api',
sunbird_learner_service_host: 'http://learner-service:9000/',
lms_user_read_path: 'private/user/v1/read/',
CASSANDRA_IP: env.CASSANDRA_IP || '10.177.157.30',
CASSANDRA_IP_PORT: env.CASSANDRA_IP_PORT || '9042',
CASSANDRA_KEYSPACE: env.CASSANDRA_KEYSPACE || 'xyz',
CASSANDRA_PASSWORD: env.CASSANDRA_PASSWORD || '',
CASSANDRA_USERNAME: env.CASSANDRA_USERNAME || '',
}

module.exports = devEnvVariables;
4 changes: 3 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"coverage": "nyc --reporter=lcov --reporter=text-lcov npm run backend-test"
},
"dependencies": {
"axios": "^0.19.1",
"@project-sunbird/logger": "^0.0.9",
"chai": "4.2.0",
"chai-http": "^4.3.0",
Expand All @@ -32,6 +33,7 @@
"sb-config-util": "file:libs/sb-config-util",
"sb_logger_util": "file:libs/sb_logger_util",
"sb_telemetry_util": "file:libs/sb_telemetry_util",
"sinon": "^9.2.2"
"sinon": "^9.2.2",
"cassandra-driver": "^4.1.0"
}
}
196 changes: 178 additions & 18 deletions routes/nodebb.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const proxyUtils = require('../proxy/proxyUtils.js')
const proxy = require('express-http-proxy');
const { NODEBB_SERVICE_URL, nodebb_api_slug } = require('../helpers/environmentVariablesHelper.js');
const { NODEBB_SERVICE_URL, nodebb_api_slug, Authorization, lms_user_read_path, sunbird_learner_service_host,
CASSANDRA_IP, CASSANDRA_KEYSPACE,CASSANDRA_IP_PORT } = require('../helpers/environmentVariablesHelper.js');
const { logger } = require('@project-sunbird/logger');
const BASE_REPORT_URL = "/discussion";
const express = require('express');
Expand All @@ -12,6 +13,11 @@ const telemetry = new Telemetry()
const methodSlug = '/update';
const nodebbServiceUrl = NODEBB_SERVICE_URL+ nodebb_api_slug;
const _ = require('lodash')
const axios = require('axios');
const authorization = Authorization;
const learnerServiceHost = sunbird_learner_service_host;
const userReadPath = lms_user_read_path;
const cassandraDriver = require('cassandra-driver')

let logObj = {
"eid": "LOG",
Expand Down Expand Up @@ -50,13 +56,6 @@ app.get(`${BASE_REPORT_URL}/categories`, proxyObject());
app.post(`${BASE_REPORT_URL}/category/list`, proxyObject());
app.get(`${BASE_REPORT_URL}/notifications`, proxyObject());

app.get(`${BASE_REPORT_URL}/user/:userslug`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/upvoted`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/downvoted`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/bookmarks`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/best`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/posts`, proxyObject())

// categories apis
app.get(`${BASE_REPORT_URL}/category/:category_id/:slug`, proxyObject());
app.get(`${BASE_REPORT_URL}/categories`, proxyObject());
Expand All @@ -82,15 +81,6 @@ app.get(`${BASE_REPORT_URL}/groups/:slug/members`, proxyObject());
// post apis
app.get(`${BASE_REPORT_URL}/recent/posts/:day`, proxyObject());

// all admin apis
app.get(`${BASE_REPORT_URL}/user/admin/watched`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/info`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/bookmarks`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/posts`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/groups`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/upvoted`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/downvoted`, proxyObject());

// topics apis
app.post(`${BASE_REPORT_URL}/v2/topics`, proxyObject());
app.post(`${BASE_REPORT_URL}/v2/topics/:tid`, proxyObject());
Expand Down Expand Up @@ -153,7 +143,39 @@ app.post(`${BASE_REPORT_URL}/v2/users/:uid/tokens`, proxyObject());
app.delete(`${BASE_REPORT_URL}/v2/users/:uid/tokens/:token`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/username/:username`, proxyObject());

app.post(`${BASE_REPORT_URL}/user/v1/create`, proxyObject());
app.post(`${BASE_REPORT_URL}/user/v1/create`, async (req, res) => {
try {
const username = req.body.request.username;
if (!username || username.trim() === '') {
return res.status(400).json({ error: 'Username is required' });
}
//telemetryHelper.logAPIEvent(req, 'discussion-middleware');
// Use the createUserIfNotExists function to check and create the user
const user = await createUserIfNotExists(req);

res.status(200).json({result: { userId: user}});
} catch (error) {
logger.error({ message: "Error creating/checking user:", error });
res.status(500).json({ error: "Internal Server Error" });
}
});

app.get(`${BASE_REPORT_URL}/user/:username`, async (req, res) => {
try {
const username = req.params.username; // Assuming the username is provided in the request body
//telemetryHelper.logAPIEvent(req, 'discussion-middleware');
// Use the createUserIfNotExists function to check and create the user
if (!username || username.trim() === '') {
return res.status(400).json({ error: 'Username is required' });
}
const user = await createUserIfNotExists(req);

res.status(200).json(user);
} catch (error) {
logger.error({ message: "Error creating/checking user:", error });
res.status(500).json({ error: "Internal Server Error" });
}
});
app.get(`${BASE_REPORT_URL}/user/uid/:uid`, proxyObject());

function isEditablePost() {
Expand Down Expand Up @@ -405,5 +427,143 @@ function logApiErrorEventV2 (req, data, option) {
})
}

async function createUserIfNotExists(request) {
const username = request.params.username || request.body.request.username;
logger.info("username " + username);
try {
return await getUserByUsername(username);
} catch (error) {
if (error.response && error.response.status === 404) {
let userEmail = null;
let fullName = null;
let identifier = null;
if (request.body.request != undefined) {
userEmail = request.body.request.email;
fullName = request.body.request.fullname;
identifier = request.body.request.identifier;
}

// if (!userEmail || userEmail.trim() === '') {
// const userInfo = await getUserInfo(request.headers['authorization'], request.headers['x-authenticated-user-token'], request.headers['x-authenticated-user-id'])
// userEmail = userInfo.primaryEmail;
// fullName = userInfo.fullName;
// }

logger.info({ message: "User not found, creating user..."});
const createResponse = await axios.post(nodebbServiceUrl + '/v2/users?_uid=1', {
username: username,
fullname: fullName,
email: userEmail,
isAdmin: false,
}, {
headers: {
'Authorization': 'Bearer ' + authorization,
'Content-Type': 'application/json'
}
});
if (createResponse.status === 200) {
// User exists, return the user data
const nodeBBUser = await getUserByUsername(username);
if (!identifier || identifier.trim() != '') {
await updateNodeBBId(identifier, nodeBBUser.uid)
}
return nodeBBUser;
}

}
// Handle errors appropriately
logger.error({ message: "Error checking/creating user:", error });
throw error;
}
}

async function getUserByUsername(username) {
const getUserResponse = await axios.get(nodebbServiceUrl + `/user/${username}`);

if (getUserResponse.status === 200) {
logger.info(getUserResponse.data)
// User exists, return the user data
logger.info({ message: "User exists:", username });
return getUserResponse.data;
}
}

function getIPList() {
const ipAddressList = CASSANDRA_IP.split(',');
const ipAddressWithPortList = ipAddressList.map(ipAddress => `${ipAddress}:${CASSANDRA_IP_PORT}`);
return ipAddressWithPortList;
}

const cassandraClientOptions = /** @type {cassandraDriver.ClientOptions} */ ({
contactPoints: getIPList(),
keyspace: CASSANDRA_KEYSPACE,
localDataCenter: 'datacenter1',
queryOptions: {
prepare: true,
},
});

async function updateNodeBBId(identifier, nodeBBId) {
try {
const clientConnect = new cassandraDriver.Client(cassandraClientOptions)
const query = `UPDATE ${CASSANDRA_KEYSPACE}.user SET nodeBBId = ? WHERE id = ?`;
const params = [nodeBBId, identifier]
clientConnect.execute(query, params, (err, _result) => {
if (!err) {
clientConnect.shutdown()
logger.info('Update Query to user_access_paths successful')
} else if (err) {
clientConnect.shutdown()
logger.error(`ERROR executing the query >> ${query}`)
}
})
// })
} catch (err) {
logger.error(' >', err)
}
}

async function getUserInfo(userAuthorization, AutheticatedUserToken, identifier) {
const userReadResponse = await axios.get(learnerServiceHost + userReadPath + identifier,
{
headers: {
'Authorization': userAuthorization,
'x-authenticated-user-token': AutheticatedUserToken
},
'Content-Type': 'application/json'
});

if (userReadResponse.status === 200) {
const primaryEmail = userReadResponse.data.result.response.profileDetails.personalDetails.primaryEmail;
const fullName = userReadResponse.data.result.response.firstName;
if (userReadResponse.data.result.response.lastName != null) {
fullName = fullName + " " + lastName;
}
logger.info({ message: "User exists:", primaryEmail });
if (!primaryEmail || primaryEmail.trim() === '') {
logger.error({ message: "Issue with fetching userEmail", error });
throw error;
} else {
return {primaryEmail, fullName};
}
}
}

// all admin apis
app.get(`${BASE_REPORT_URL}/user/admin/watched`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/info`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/bookmarks`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/posts`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/groups`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/upvoted`, proxyObject());
app.get(`${BASE_REPORT_URL}/user/admin/downvoted`, proxyObject());

//app.get(`${BASE_REPORT_URL}/user/:userslug`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/upvoted`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/downvoted`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/bookmarks`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/best`, proxyObject())
app.get(`${BASE_REPORT_URL}/user/:userslug/posts`, proxyObject())

module.exports = app;
// module.exports.logMessage = logMessage;

0 comments on commit 4c92fb5

Please sign in to comment.