From f4b483bda04ed53873aa1c76ad289611a1ac2992 Mon Sep 17 00:00:00 2001 From: Jameel Briones Date: Tue, 3 Oct 2017 15:07:04 +0100 Subject: [PATCH 1/3] downgrade connect-redis version --- demo/server/config-dev.js | 5 +++-- demo/server/config-prod.js | 5 +++-- demo/server/package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/demo/server/config-dev.js b/demo/server/config-dev.js index 60d2330..e9a8e7e 100644 --- a/demo/server/config-dev.js +++ b/demo/server/config-dev.js @@ -25,8 +25,9 @@ var config = { /// Redis session store configuration // https://github.com/tj/connect-redis "redisStore": { - "url": getRedisUrl(), - "prefix": "rc-session:", + "host": getRedisHost(), + "port": getRedisPort(), + "prefix": "rcsession:", "logErrors": true }, // Configuration for express session (used for both passport and keycloak) diff --git a/demo/server/config-prod.js b/demo/server/config-prod.js index 2d85451..44b8d85 100644 --- a/demo/server/config-prod.js +++ b/demo/server/config-prod.js @@ -26,8 +26,9 @@ var config = { /// Redis session store configuration // https://github.com/tj/connect-redis "redisStore": { - "url": getRedisUrl(), - "prefix": "rc-session:", + "host": getRedisHost(), + "port": getRedisPort(), + "prefix": "rcsession:", "logErrors": true }, // Configuration for express session (used for both passport and keycloak) diff --git a/demo/server/package.json b/demo/server/package.json index d204a0d..ebe432d 100644 --- a/demo/server/package.json +++ b/demo/server/package.json @@ -69,7 +69,7 @@ "@raincatcher/wfm-user": "0.0.5", "bluebird": "^3.5.0", "body-parser": "^1.17.2", - "connect-redis": "^3.3.0", + "connect-redis": "3.0.0", "cookie-parser": "^1.4.3", "cors": "^2.8.4", "express": "^4.15.4", From 99a23a0491fe2c11e7bb09e327f3828e091b3288 Mon Sep 17 00:00:00 2001 From: Jameel Briones Date: Tue, 3 Oct 2017 16:54:26 +0100 Subject: [PATCH 2/3] fix failing build --- cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts | 6 +++--- cloud/wfm-rest-api/src/impl/MongoDbRepository.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts b/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts index 6a55804..1255a60 100644 --- a/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts +++ b/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts @@ -31,20 +31,20 @@ export interface PagingDataRepository { * Get specific item from database * @param id - object id */ - get(id: string): Promise; + get(id: string): Promise; /** * Store object in database * @param object - object to store */ - create(object: T): Promise; + create(object: T): Promise; /** * Update object * @param object - object to update * Note: id field of the object will be used to determine what should be updated */ - update(object: T): Promise; + update(object: T): Promise; /** * Delete object from database diff --git a/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts b/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts index 8526887..12959a3 100644 --- a/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts +++ b/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts @@ -45,14 +45,14 @@ export class MongoDbRepository { + public get(id: string): Bluebird { if (!this.db) { return Bluebird.reject(dbError); } return Bluebird.resolve(this.collection.findOne({ id })).catch(this.handleError); } - public create(object: T): Bluebird { + public create(object: T): Bluebird { object.id = object.id || generate(); if (!this.db) { return Bluebird.reject(dbError); @@ -64,7 +64,7 @@ export class MongoDbRepository { + public update(object: T): Bluebird { if (!this.db) { return Bluebird.reject(dbError); } From 67445b973026834ff7ba4f4e43ea4c704863782b Mon Sep 17 00:00:00 2001 From: Jameel Briones Date: Tue, 3 Oct 2017 17:02:17 +0100 Subject: [PATCH 3/3] change type to null --- cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts | 6 +++--- cloud/wfm-rest-api/src/impl/MongoDbRepository.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts b/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts index 1255a60..8705052 100644 --- a/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts +++ b/cloud/wfm-rest-api/src/data-api/PagingDataRepository.ts @@ -31,20 +31,20 @@ export interface PagingDataRepository { * Get specific item from database * @param id - object id */ - get(id: string): Promise; + get(id: string): Promise; /** * Store object in database * @param object - object to store */ - create(object: T): Promise; + create(object: T): Promise; /** * Update object * @param object - object to update * Note: id field of the object will be used to determine what should be updated */ - update(object: T): Promise; + update(object: T): Promise; /** * Delete object from database diff --git a/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts b/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts index 12959a3..88840eb 100644 --- a/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts +++ b/cloud/wfm-rest-api/src/impl/MongoDbRepository.ts @@ -45,14 +45,14 @@ export class MongoDbRepository { + public get(id: string): Bluebird { if (!this.db) { return Bluebird.reject(dbError); } return Bluebird.resolve(this.collection.findOne({ id })).catch(this.handleError); } - public create(object: T): Bluebird { + public create(object: T): Bluebird { object.id = object.id || generate(); if (!this.db) { return Bluebird.reject(dbError); @@ -64,7 +64,7 @@ export class MongoDbRepository { + public update(object: T): Bluebird { if (!this.db) { return Bluebird.reject(dbError); }