Use single quotes :P

This commit is contained in:
Michael Jackson
2018-12-17 09:38:05 -08:00
parent ada37035cd
commit 19b2e5574b
93 changed files with 792 additions and 791 deletions

View File

@ -1,11 +1,11 @@
const AuthAPI = require("../AuthAPI");
const AuthAPI = require('../AuthAPI');
describe("Auth API", () => {
describe('Auth API', () => {
beforeEach(done => {
AuthAPI.removeAllRevokedTokens().then(() => done(), done);
});
it("creates tokens with the right scopes", done => {
it('creates tokens with the right scopes', done => {
const scopes = {
blacklist: {
add: true,
@ -24,7 +24,7 @@ describe("Auth API", () => {
});
});
it("refuses to verify revoked tokens", done => {
it('refuses to verify revoked tokens', done => {
const scopes = {};
AuthAPI.createToken(scopes).then(token => {

View File

@ -1,12 +1,12 @@
const BlacklistAPI = require("../BlacklistAPI");
const BlacklistAPI = require('../BlacklistAPI');
describe("Blacklist API", () => {
describe('Blacklist API', () => {
beforeEach(done => {
BlacklistAPI.removeAllPackages().then(() => done(), done);
});
it("adds and removes packages to/from the blacklist", done => {
const packageName = "bad-package";
it('adds and removes packages to/from the blacklist', done => {
const packageName = 'bad-package';
BlacklistAPI.addPackage(packageName).then(() => {
BlacklistAPI.getPackages().then(packageNames => {

View File

@ -1,46 +1,46 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const withRevokedToken = require("./utils/withRevokedToken");
const withToken = require("./utils/withToken");
const createServer = require('../createServer');
const withRevokedToken = require('./utils/withRevokedToken');
const withToken = require('./utils/withToken');
describe("The /_auth endpoint", () => {
describe('The /_auth endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("POST /_auth", () => {
it("creates a new auth token", done => {
describe('POST /_auth', () => {
it('creates a new auth token', done => {
request(server)
.post("/_auth")
.post('/_auth')
.end((err, res) => {
expect(res.body).toHaveProperty("token");
expect(res.body).toHaveProperty('token');
done();
});
});
});
describe("GET /_auth", () => {
describe("with no auth", () => {
it("echoes back null", done => {
describe('GET /_auth', () => {
describe('with no auth', () => {
it('echoes back null', done => {
request(server)
.get("/_auth")
.get('/_auth')
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBe(null);
done();
});
});
});
describe("with a revoked auth token", () => {
it("echoes back null", done => {
describe('with a revoked auth token', () => {
it('echoes back null', done => {
withRevokedToken({ some: { scope: true } }, token => {
request(server)
.get("/_auth?token=" + token)
.get('/_auth?token=' + token)
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBe(null);
done();
});
@ -48,14 +48,14 @@ describe("The /_auth endpoint", () => {
});
});
describe("with a valid auth token", () => {
it("echoes back the auth payload", done => {
describe('with a valid auth token', () => {
it('echoes back the auth payload', done => {
withToken({ some: { scope: true } }, token => {
request(server)
.get("/_auth?token=" + token)
.get('/_auth?token=' + token)
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(typeof res.body.auth).toBe("object");
expect(res.body).toHaveProperty('auth');
expect(typeof res.body.auth).toBe('object');
done();
});
});

View File

@ -1,22 +1,22 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const clearBlacklist = require("./utils/clearBlacklist");
const withToken = require("./utils/withToken");
const createServer = require('../createServer');
const clearBlacklist = require('./utils/clearBlacklist');
const withToken = require('./utils/withToken');
describe("The /_blacklist endpoint", () => {
describe('The /_blacklist endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("POST /_blacklist", () => {
describe('POST /_blacklist', () => {
afterEach(clearBlacklist);
describe("with no auth", () => {
it("is forbidden", done => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.post("/_blacklist")
.post('/_blacklist')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -25,11 +25,11 @@ describe("The /_blacklist endpoint", () => {
});
describe('with the "blacklist.add" scope', () => {
it("can add to the blacklist", done => {
it('can add to the blacklist', done => {
withToken({ blacklist: { add: true } }, token => {
request(server)
.post("/_blacklist")
.send({ token, packageName: "bad-package" })
.post('/_blacklist')
.send({ token, packageName: 'bad-package' })
.end((err, res) => {
expect(res.statusCode).toBe(200);
expect(res.body.ok).toBe(true);
@ -40,11 +40,11 @@ describe("The /_blacklist endpoint", () => {
});
});
describe("GET /_blacklist", () => {
describe("with no auth", () => {
it("is forbidden", done => {
describe('GET /_blacklist', () => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.get("/_blacklist")
.get('/_blacklist')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -53,10 +53,10 @@ describe("The /_blacklist endpoint", () => {
});
describe('with the "blacklist.read" scope', () => {
it("can read the blacklist", done => {
it('can read the blacklist', done => {
withToken({ blacklist: { read: true } }, token => {
request(server)
.get("/_blacklist?token=" + token)
.get('/_blacklist?token=' + token)
.end((err, res) => {
expect(res.statusCode).toBe(200);
done();
@ -66,11 +66,11 @@ describe("The /_blacklist endpoint", () => {
});
});
describe("DELETE /_blacklist/:packageName", () => {
describe("with no auth", () => {
it("is forbidden", done => {
describe('DELETE /_blacklist/:packageName', () => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.delete("/_blacklist/bad-package")
.delete('/_blacklist/bad-package')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -79,10 +79,10 @@ describe("The /_blacklist endpoint", () => {
});
describe('with the "blacklist.remove" scope', () => {
it("can remove a package from the blacklist", done => {
it('can remove a package from the blacklist', done => {
withToken({ blacklist: { remove: true } }, token => {
request(server)
.delete("/_blacklist/bad-package")
.delete('/_blacklist/bad-package')
.send({ token })
.end((err, res) => {
expect(res.statusCode).toBe(200);
@ -92,10 +92,10 @@ describe("The /_blacklist endpoint", () => {
});
});
it("can remove a scoped package from the blacklist", done => {
it('can remove a scoped package from the blacklist', done => {
withToken({ blacklist: { remove: true } }, token => {
request(server)
.delete("/_blacklist/@scope/bad-package")
.delete('/_blacklist/@scope/bad-package')
.send({ token })
.end((err, res) => {
expect(res.statusCode).toBe(200);

View File

@ -1,17 +1,17 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const createServer = require('../createServer');
describe("The /_publicKey endpoint", () => {
describe('The /_publicKey endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("GET /_publicKey", () => {
it("echoes the public key", done => {
describe('GET /_publicKey', () => {
it('echoes the public key', done => {
request(server)
.get("/_publicKey")
.get('/_publicKey')
.end((err, res) => {
expect(res.text).toMatch(/PUBLIC KEY/);
done();

View File

@ -1,47 +1,47 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const withAuthHeader = require("./utils/withAuthHeader");
const withRevokedToken = require("./utils/withRevokedToken");
const withToken = require("./utils/withToken");
const createServer = require('../createServer');
const withAuthHeader = require('./utils/withAuthHeader');
const withRevokedToken = require('./utils/withRevokedToken');
const withToken = require('./utils/withToken');
describe("The /api/auth endpoint", () => {
describe('The /api/auth endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("POST /api/auth", () => {
it("creates a new auth token", done => {
describe('POST /api/auth', () => {
it('creates a new auth token', done => {
request(server)
.post("/api/auth")
.post('/api/auth')
.end((err, res) => {
expect(res.body).toHaveProperty("token");
expect(res.body).toHaveProperty('token');
done();
});
});
});
describe("GET /api/auth", () => {
describe("with no auth", () => {
it("echoes back null", done => {
describe('GET /api/auth', () => {
describe('with no auth', () => {
it('echoes back null', done => {
request(server)
.get("/api/auth")
.get('/api/auth')
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBe(null);
done();
});
});
});
describe("with a revoked auth token", () => {
it("echoes back null", done => {
describe('with a revoked auth token', () => {
it('echoes back null', done => {
withRevokedToken({ some: { scope: true } }, token => {
request(server)
.get("/api/auth?token=" + token)
.get('/api/auth?token=' + token)
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBe(null);
done();
});
@ -49,16 +49,16 @@ describe("The /api/auth endpoint", () => {
});
});
describe("with a valid auth token", () => {
describe("in the query string", () => {
it("echoes back the auth payload", done => {
describe('with a valid auth token', () => {
describe('in the query string', () => {
it('echoes back the auth payload', done => {
const scopes = { some: { scope: true } };
withToken(scopes, token => {
request(server)
.get("/api/auth?token=" + token)
.get('/api/auth?token=' + token)
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBeDefined();
expect(res.body.auth.scopes).toMatchObject(scopes);
done();
@ -67,16 +67,16 @@ describe("The /api/auth endpoint", () => {
});
});
describe("in the Authorization header", () => {
it("echoes back the auth payload", done => {
describe('in the Authorization header', () => {
it('echoes back the auth payload', done => {
const scopes = { some: { scope: true } };
withAuthHeader(scopes, header => {
request(server)
.get("/api/auth")
.get('/api/auth')
.set({ Authorization: header })
.end((err, res) => {
expect(res.body).toHaveProperty("auth");
expect(res.body).toHaveProperty('auth');
expect(res.body.auth).toBeDefined();
expect(res.body.auth.scopes).toMatchObject(scopes);
done();

View File

@ -1,22 +1,22 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const clearBlacklist = require("./utils/clearBlacklist");
const withToken = require("./utils/withToken");
const createServer = require('../createServer');
const clearBlacklist = require('./utils/clearBlacklist');
const withToken = require('./utils/withToken');
describe("The /api/blacklist endpoint", () => {
describe('The /api/blacklist endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("POST /api/blacklist", () => {
describe('POST /api/blacklist', () => {
afterEach(clearBlacklist);
describe("with no auth", () => {
it("is forbidden", done => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.post("/api/blacklist")
.post('/api/blacklist')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -25,11 +25,11 @@ describe("The /api/blacklist endpoint", () => {
});
describe('with the "blacklist.add" scope', () => {
it("can add to the blacklist", done => {
it('can add to the blacklist', done => {
withToken({ blacklist: { add: true } }, token => {
request(server)
.post("/api/blacklist")
.send({ token, packageName: "bad-package" })
.post('/api/blacklist')
.send({ token, packageName: 'bad-package' })
.end((err, res) => {
expect(res.statusCode).toBe(200);
expect(res.body.ok).toBe(true);
@ -40,11 +40,11 @@ describe("The /api/blacklist endpoint", () => {
});
});
describe("GET /api/blacklist", () => {
describe("with no auth", () => {
it("is forbidden", done => {
describe('GET /api/blacklist', () => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.get("/api/blacklist")
.get('/api/blacklist')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -53,10 +53,10 @@ describe("The /api/blacklist endpoint", () => {
});
describe('with the "blacklist.read" scope', () => {
it("can read the blacklist", done => {
it('can read the blacklist', done => {
withToken({ blacklist: { read: true } }, token => {
request(server)
.get("/api/blacklist?token=" + token)
.get('/api/blacklist?token=' + token)
.end((err, res) => {
expect(res.statusCode).toBe(200);
done();
@ -66,11 +66,11 @@ describe("The /api/blacklist endpoint", () => {
});
});
describe("DELETE /api/blacklist", () => {
describe("with no auth", () => {
it("is forbidden", done => {
describe('DELETE /api/blacklist', () => {
describe('with no auth', () => {
it('is forbidden', done => {
request(server)
.delete("/api/blacklist")
.delete('/api/blacklist')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
@ -79,11 +79,11 @@ describe("The /api/blacklist endpoint", () => {
});
describe('with the "blacklist.remove" scope', () => {
it("can remove a package from the blacklist", done => {
it('can remove a package from the blacklist', done => {
withToken({ blacklist: { remove: true } }, token => {
request(server)
.delete("/api/blacklist")
.send({ token, packageName: "bad-package" })
.delete('/api/blacklist')
.send({ token, packageName: 'bad-package' })
.end((err, res) => {
expect(res.statusCode).toBe(200);
expect(res.body.ok).toBe(true);
@ -92,11 +92,11 @@ describe("The /api/blacklist endpoint", () => {
});
});
it("can remove a scoped package from the blacklist", done => {
it('can remove a scoped package from the blacklist', done => {
withToken({ blacklist: { remove: true } }, token => {
request(server)
.delete("/api/blacklist")
.send({ token, packageName: "@scope/bad-package" })
.delete('/api/blacklist')
.send({ token, packageName: '@scope/bad-package' })
.end((err, res) => {
expect(res.statusCode).toBe(200);
expect(res.body.ok).toBe(true);

View File

@ -1,17 +1,17 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const createServer = require('../createServer');
describe("The /api/publicKey endpoint", () => {
describe('The /api/publicKey endpoint', () => {
let server;
beforeEach(() => {
server = createServer();
});
describe("GET /api/publicKey", () => {
it("echoes the public key", done => {
describe('GET /api/publicKey', () => {
it('echoes the public key', done => {
request(server)
.get("/api/publicKey")
.get('/api/publicKey')
.end((err, res) => {
expect(res.text).toMatch(/PUBLIC KEY/);
done();

View File

@ -1,62 +1,62 @@
const request = require("supertest");
const request = require('supertest');
const createServer = require("../createServer");
const createServer = require('../createServer');
const clearBlacklist = require("./utils/clearBlacklist");
const withBlacklist = require("./utils/withBlacklist");
const clearBlacklist = require('./utils/clearBlacklist');
const withBlacklist = require('./utils/withBlacklist');
describe("The server", () => {
describe('The server', () => {
let server;
beforeEach(() => {
server = createServer();
});
it("redirects /_meta to ?meta", done => {
it('redirects /_meta to ?meta', done => {
request(server)
.get("/_meta/react")
.get('/_meta/react')
.end((err, res) => {
expect(res.statusCode).toBe(301);
expect(res.headers.location).toBe("/react?meta");
expect(res.headers.location).toBe('/react?meta');
done();
});
});
it("redirects ?json to ?meta", done => {
it('redirects ?json to ?meta', done => {
request(server)
.get("/react?json")
.get('/react?json')
.end((err, res) => {
expect(res.statusCode).toBe(301);
expect(res.headers.location).toBe("/react?meta");
expect(res.headers.location).toBe('/react?meta');
done();
});
});
it("redirects invalid query params", done => {
it('redirects invalid query params', done => {
request(server)
.get("/react?main=index&invalid")
.get('/react?main=index&invalid')
.end((err, res) => {
expect(res.statusCode).toBe(302);
expect(res.headers.location).toBe("/react?main=index");
expect(res.headers.location).toBe('/react?main=index');
done();
});
});
it("rejects invalid package names", done => {
it('rejects invalid package names', done => {
request(server)
.get("/_invalid/index.js")
.get('/_invalid/index.js')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();
});
});
describe("blacklisted packages", () => {
describe('blacklisted packages', () => {
afterEach(clearBlacklist);
it("does not serve blacklisted packages", done => {
withBlacklist(["bad-package"], () => {
it('does not serve blacklisted packages', done => {
withBlacklist(['bad-package'], () => {
request(server)
.get("/bad-package/index.js")
.get('/bad-package/index.js')
.end((err, res) => {
expect(res.statusCode).toBe(403);
done();

View File

@ -1,3 +1,3 @@
const closeDatabase = require("./utils/closeDatabase");
const closeDatabase = require('./utils/closeDatabase');
afterAll(closeDatabase);

View File

@ -1,4 +1,4 @@
const BlacklistAPI = require("../../BlacklistAPI");
const BlacklistAPI = require('../../BlacklistAPI');
function clearBlacklist(done) {
BlacklistAPI.removeAllPackages().then(done, done);

View File

@ -1,7 +1,7 @@
const withToken = require("./withToken");
const withToken = require('./withToken');
function encodeBase64(token) {
return Buffer.from(token).toString("base64");
return Buffer.from(token).toString('base64');
}
function withAuthHeader(scopes, done) {

View File

@ -1,4 +1,4 @@
const BlacklistAPI = require("../../BlacklistAPI");
const BlacklistAPI = require('../../BlacklistAPI');
function withBlacklist(blacklist, done) {
Promise.all(blacklist.map(BlacklistAPI.addPackage)).then(done);

View File

@ -1,5 +1,5 @@
const withToken = require("./withToken");
const AuthAPI = require("../../AuthAPI");
const withToken = require('./withToken');
const AuthAPI = require('../../AuthAPI');
function withRevokedToken(scopes, done) {
withToken(scopes, token => {

View File

@ -1,4 +1,4 @@
const AuthAPI = require("../../AuthAPI");
const AuthAPI = require('../../AuthAPI');
function withToken(scopes, done) {
AuthAPI.createToken(scopes).then(done);