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

Issue #SB-21181 fix: Added offline token verification call before server gets started #229

Open
wants to merge 4 commits into
base: release-3.6.0
Choose a base branch
from
Open

Issue #SB-21181 fix: Added offline token verification call before server gets started #229

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e13fada
Issue #SB-21181 fix: Added offline token verification call brfore ser…
Dec 15, 2020
cdbeebf
Issue #SB-21181 fix: Added alternative directory for the local keys
Dec 15, 2020
afb7b6c
Issue #SB-21181 fix: Commenting code for testing
Dec 15, 2020
7eadf2f
Issue #SB-21181 fix: Build breakage issue
Dec 15, 2020
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
10 changes: 8 additions & 2 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ var configUtil = require('sb-config-util')
var _ = require('lodash')
var logger = require('sb_logger_util_v2')

var loadTokenPublicKeys = require('sb_api_interceptor')

const contentProvider = require('sb_content_provider_util')
var contentMetaProvider = require('./contentMetaFilter')
// TODO below configuration should to be refactored in a seperate file
Expand Down Expand Up @@ -58,7 +60,9 @@ const isHealthCheckEnabled = process.env.sunbird_health_check_enable || 'true'
const contentServiceLocalBaseUrl = process.env.sunbird_content_service_local_base_url ? process.env.sunbird_content_service_local_base_url : 'http://knowledge-mw-service:5000'
const sunbirdGzipEnable = process.env.sunbird_gzip_enable || 'true'

configUtil.setContentProviderApi(contentProviderApiConfig.API)
const kidTokenPublicKeyBasePath = process.env.sunbird_kid_public_key_base_path || '/keys/'

configUtil.setContentProviderApi(contentProviderApiConfig.API)
configUtil.setConfig('CONTENT_SERVICE_BASE_URL', contentServiceBaseUrl)
configUtil.setConfig('CONTENT_SERVICE_AUTH_TOKEN', contentServiceAuthToken)
configUtil.setConfig('ASSESSMENT_SERVICE_BASE_URL', assessmentServiceBaseUrl)
Expand Down Expand Up @@ -178,7 +182,9 @@ require('./routes/lockRoutes')(app)
// this middleware route add after all the routes
require('./middlewares/proxy.middleware')(app)

function startServer () {
async function startServer () {
// TODO: Commenting for testing purpose
await loadTokenPublicKeys(path.join(__dirname, kidTokenPublicKeyBasePath));
this.server = http.createServer(app).listen(port, function () {
logger.info({ msg: `server running at PORT ${port}` })
logger.debug({ msg: `server started at ${new Date()}` })
Expand Down