Skip to content

Commit

Permalink
Pinning Node Engine Versions (#212)
Browse files Browse the repository at this point in the history
* Pinning Node Engine Versions

- pinning current LTS node versions https://nodejs.org/en/about/releases/
- adding LTS versions to CircleCI
- fixing tests on node 14

* Reconfig circleCi
  • Loading branch information
davidpatrick committed Jan 11, 2021
1 parent dab5112 commit 589dde8
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 26 deletions.
28 changes: 23 additions & 5 deletions .circleci/config.yml
@@ -1,24 +1,42 @@
version: 2
version: 2.1

workflows:
version: 2
test:
jobs:
- test:
name: test_node10
v: "10"
- test:
name: test_node12
v: "12"
- test:
name: test_node14
v: "14"
jobs:
build:
test:
parameters:
v:
type: string
default: "12"
docker:
- image: circleci/node:10
- image: circleci/node:<< parameters.v >>
environment:
LANG: en_US.UTF-8
steps:
- checkout
- run:
name: Update NPM version
command: sudo npm install -g npm@latest
- restore-cache:
- restore_cache:
name: Restore NPM Package Cache
keys:
- npm-packages-{{ checksum "package-lock.json" }}
- npm-packages-
- run:
name: Install Dependencies
command: npm install
- save-cache:
- save_cache:
name: Save NPM Package Cache
key: npm-packages-{{ checksum "package-lock.json" }}
paths:
Expand Down
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -4,6 +4,9 @@
"description": "Library to retrieve RSA public keys from a JWKS endpoint",
"main": "lib/index.js",
"types": "index.d.ts",
"engines": {
"node": ">=10 < 13 || >=14"
},
"dependencies": {
"@types/express-jwt": "0.0.42",
"axios": "^0.21.1",
Expand Down
48 changes: 27 additions & 21 deletions tests/passport.tests.js
Expand Up @@ -63,11 +63,12 @@ describe('passportJwtSecret', () => {
)
);

let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
expectedFlashMessage = msg;
};
next();
},
Expand All @@ -81,8 +82,8 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', 'Bearer abc')
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('jwt malformed');
.end(() => {
expect(expectedFlashMessage).to.equal('jwt malformed');
done();
});
});
Expand All @@ -101,11 +102,12 @@ describe('passportJwtSecret', () => {
)
);

let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
expectedFlashMessage = msg;
};
next();
},
Expand All @@ -121,8 +123,8 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', `Bearer ${token}`)
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('secret or public key must be provided');
.end(() => {
expect(expectedFlashMessage).to.equal('secret or public key must be provided');
done();
});
});
Expand All @@ -141,12 +143,13 @@ describe('passportJwtSecret', () => {
)
);

let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
};
expectedFlashMessage = msg;
},
next();
},
passport.authenticate('jwt', { session: false, failureFlash: true }),
Expand All @@ -162,9 +165,9 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', `Bearer ${token}`)
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('secret or public key must be provided');
done();
.end((err) => {
expect(expectedFlashMessage).to.equal('secret or public key must be provided');
done(err);
});
});

Expand All @@ -184,11 +187,12 @@ describe('passportJwtSecret', () => {
)
);

let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
expectedFlashMessage = msg;
};
next();
},
Expand All @@ -205,8 +209,8 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', `Bearer ${token}`)
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('secret or public key must be provided');
.end(() => {
expect(expectedFlashMessage).to.equal('secret or public key must be provided');
done();
});
});
Expand All @@ -227,11 +231,12 @@ describe('passportJwtSecret', () => {
)
);

let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
expectedFlashMessage = msg;
};
next();
},
Expand All @@ -248,8 +253,8 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', `Bearer ${token}`)
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('invalid signature');
.end(() => {
expect(expectedFlashMessage).to.equal('invalid signature');
done();
});
});
Expand All @@ -272,12 +277,13 @@ describe('passportJwtSecret', () => {
(jwt_payload, done) => done(null, jwt_payload)
)
);


let expectedFlashMessage;
app.get(
'/',
(req, res, next) => {
req.flash = (type, msg) => {
res.send(msg);
expectedFlashMessage = msg;
};
next();
},
Expand All @@ -294,8 +300,8 @@ describe('passportJwtSecret', () => {
.get('/')
.set('Authorization', `Bearer ${token}`)
.expect(401)
.end((err, res) => {
expect(res.text).to.equal('this is bad');
.end(() => {
expect(expectedFlashMessage).to.equal('this is bad');
done();
});
});
Expand Down

0 comments on commit 589dde8

Please sign in to comment.