Skip to content

Commit

Permalink
Merge e517097 into b11bfb4
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagobustamante committed Feb 8, 2018
2 parents b11bfb4 + e517097 commit 9c3b06a
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 58 deletions.
90 changes: 45 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"consul": "^0.30.0",
"cookie-parser": "^1.4.3",
"cors": "^2.8.4",
"decache": "^4.2.0",
"decache": "^4.4.0",
"eventemitter3": "1.x.x",
"eventloop-latency": "^1.0.0",
"events": "^1.1.1",
Expand All @@ -77,8 +77,8 @@
"ioredis": "^3.1.4",
"ip-filter": "^2.0.0",
"joi": "^9.2.0",
"jsonata": "^1.5.0",
"lodash": "^4.17.4",
"jsonata": "^1.5.1",
"lodash": "^4.17.5",
"lodash-deep": "^2.0.0",
"minimatch": "^3.0.4",
"mustache": "^2.3.0",
Expand All @@ -93,7 +93,7 @@
"request": "^2.83.0",
"requires-port": "1.x.x",
"stream-buffers": "^3.0.1",
"swagger-client": "^3.4.7",
"swagger-client": "^3.4.8",
"typescript-ioc": "^1.1.0",
"typescript-rest": "^1.2.2",
"typescript-rest-swagger": "0.0.12",
Expand All @@ -115,20 +115,20 @@
"@types/consul": "^0.23.32",
"@types/cookie-parser": "^1.4.1",
"@types/cors": "^2.8.0",
"@types/express": "^4.11.0",
"@types/express": "^4.11.1",
"@types/express-serve-static-core": "^4.11.1",
"@types/fs-extra-promise": "0.0.30",
"@types/ioredis": "0.0.25",
"@types/joi": "^9.0.32",
"@types/jsonwebtoken": "^7.2.5",
"@types/lodash": "4.14.78",
"@types/minimatch": "^3.0.3",
"@types/mocha": "^2.2.47",
"@types/mocha": "^2.2.48",
"@types/multer": "0.0.32",
"@types/mustache": "^0.8.30",
"@types/on-headers": "^2.1.29",
"@types/passport": "^0.2.33",
"@types/passport-http": "^0.3.1",
"@types/passport-http": "^0.3.4",
"@types/passport-jwt": "^2.0.22",
"@types/passport-local": "^1.0.29",
"@types/request": "0.0.31",
Expand All @@ -150,7 +150,7 @@
"source-map-support": "^0.4.14",
"ts-node": "^3.3.0",
"tslint": "^5.9.1",
"typescript": "2.5.3",
"typescript": "2.7.1",
"typescript-formatter": "^5.2.0"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/service/redis/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class RedisUserService implements UserService {
return new Promise((resolve, reject) => {
this.database.redisClient.hgetall(RedisUserService.USERS_PREFIX)
.then((users: any) => {
resolve(_.map(_.values(users), (value: string) => _.omit(JSON.parse(value), 'password')));
resolve(<UserData[]>_.map(_.values(users), (value: string) => _.omit(JSON.parse(value), 'password')));
})
.catch(reject);
});
Expand Down
2 changes: 0 additions & 2 deletions test/unit/admin.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ let config: Configuration;
let adminRequest: any;
let adminToken: string;
let configToken: string;
let simpleToken: string;
let sdk: SDK = null;

const adminUser = {
Expand Down Expand Up @@ -128,7 +127,6 @@ describe('Gateway Admin Tasks', () => {
url:'/users/authentication'
}, (error: any, response: any, body: any) => {
expect(response.statusCode).to.equal(200);
simpleToken = body;
done();
});
});
Expand Down
2 changes: 0 additions & 2 deletions test/unit/install-apis.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ let config: Configuration;
let database: Database;
let gateway: Gateway;
let sdk: SDK = null;
let loadedApis: string[];

describe('Gateway APIs install', () => {
before(() => {
Expand Down Expand Up @@ -83,7 +82,6 @@ describe('Gateway APIs install', () => {
return Promise.all(promises);
})
.then((apis) => {
loadedApis = apis;
setTimeout(resolve, 1000);
})
.catch(reject);
Expand Down

0 comments on commit 9c3b06a

Please sign in to comment.