From 966d6248782daf8033ea02fca6a48eb36d78b948 Mon Sep 17 00:00:00 2001 From: Paolo Bueno Date: Wed, 8 Nov 2017 13:35:35 -0200 Subject: [PATCH] Update to master (#182) * Fix types error for api-controller and demoDataSetup (#169) * fix types error for api-controller and demoDataSetup * handle undefined connectionPromise * Fix compilation error --- demo/server/src/modules/index.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/demo/server/src/modules/index.ts b/demo/server/src/modules/index.ts index f1c188c..0eb6e8f 100644 --- a/demo/server/src/modules/index.ts +++ b/demo/server/src/modules/index.ts @@ -15,7 +15,7 @@ import { connect as syncConnector } from './datasync/Connector'; import { init as initKeycloak } from './keycloak'; import { init as authInit } from './passport-auth'; import globalSessionOptions from './session/RedisSession'; -import {StaticUsersRepository} from './wfm-user/StaticUsersRepository'; +import { StaticUsersRepository } from './wfm-user/StaticUsersRepository'; const config = appConfig.getConfig(); @@ -58,11 +58,11 @@ function userApiSetup(app: express.Router) { } function setupPassportSecurity(app: express.Router, sessionOptions?: SessionOptions) { - return authInit(app, sessionOptions); + return authInit(app, sessionOptions); } function setupKeycloakSecurity(app: express.Router) { - return initKeycloak(app); + return initKeycloak(app); } function syncSetup(app: express.Router) { @@ -109,11 +109,13 @@ function fileStoreSetup(app: express.Router, securityMiddleware: EndpointSecurit function demoDataSetup(connectionPromise: Promise) { if (!connectionPromise) { getLogger().error('Failed to connect to a database'); - } else { + } else { connectionPromise.then(function(mongo: Db) { if (config.seedDemoData) { initData(mongo); } + }).catch(function() { + getLogger().error('Failed to connect to a database'); }); } }