Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
Update to master (#182)
Browse files Browse the repository at this point in the history
* Fix types error for api-controller and demoDataSetup (#169)

* fix types error for api-controller and demoDataSetup

* handle undefined connectionPromise

* Fix compilation error
  • Loading branch information
paolobueno authored and wtrocki committed Nov 15, 2017
1 parent 0d7de1f commit 966d624
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions demo/server/src/modules/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -109,11 +109,13 @@ function fileStoreSetup(app: express.Router, securityMiddleware: EndpointSecurit
function demoDataSetup(connectionPromise: Promise<any>) {
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');
});
}
}

0 comments on commit 966d624

Please sign in to comment.