Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redirect from /collections/ to /collections #85

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/handlers/get-collection-by-id.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,23 @@ const getIiifCollectionById = async (event) => {
});
};

const isEmpty = (string) => {
return string === undefined || string === null || string === "";
};

/**
* Get a colletion by id
*/
exports.handler = wrap(async (event) => {
if (isEmpty(event.pathParameters.id)) {
return {
statusCode: 301,
headers: {
location: "/collections",
},
};
}

return event.queryStringParameters?.as === "iiif"
? getIiifCollectionById(event)
: getCollectionById(event);
Expand Down
4 changes: 3 additions & 1 deletion src/handlers/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ const wrap = function (handler) {
event = __processRequest(event);
response = await handler(event, context);
} catch (error) {
await Honeybadger.notifyAsync(error);
if (Honeybadger.config.enableUncaught) {
await Honeybadger.notifyAsync(error);
}
response = _convertErrorToResponse(error);
}
return __processResponse(event, response);
Expand Down
2 changes: 2 additions & 0 deletions src/honeybadger-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Honeybadger.configure({
apiKey: process.env.HONEYBADGER_API_KEY || "DEVELOPMENT_MODE",
environment: process.env.HONEYBADGER_ENV || "development",
revision: process.env.HONEYBADGER_REVISION,
enableUncaught: !process.env.HONEYBADGER_DISABLED,
enableUnhandledRejection: !process.env.HONEYBADGER_DISABLED,
});

Honeybadger.beforeNotify((notice) => {
Expand Down
10 changes: 10 additions & 0 deletions test/integration/get-collection-by-id.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,15 @@ describe("Retrieve collection by id", () => {
expect(resultBody.type).to.eq("Collection");
expect(resultBody.label.none[0]).to.eq("Collection Title");
});

it("redirects to /collections when id is missing or empty", async () => {
const event = helpers
.mockEvent("GET", "/collections/{id}")
.pathParams({ id: "" })
.render();
const result = await handler(event);
expect(result.statusCode).to.eq(301);
expect(result).to.have.header("location", "/collections");
});
});
});
18 changes: 11 additions & 7 deletions test/integration/middleware.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,30 @@ const { wrap, __Honeybadger } = requireSource("handlers/middleware.js");
describe("middleware", () => {
helpers.saveEnvironment();

beforeEach(function () {
__Honeybadger.configure({ enableUncaught: true });
});

afterEach(function () {
__Honeybadger.configure({ enableUncaught: false });
sinon.restore();
});

it("reports uncaught errors to Honeybadger", async () => {
const event = helpers.mockEvent("GET", "/error").render();

sinon.replace(
__Honeybadger,
"notifyAsync",
sinon.fake((error) => {
expect(error.message).to.eq("Catch this!");
})
);
let fakeNotify = sinon.fake((error) => {
expect(error.message).to.eq("Catch this!");
});

sinon.replace(__Honeybadger, "notifyAsync", fakeNotify);

const handler = wrap(async (_event) => {
throw new Error("Catch this!");
});

const result = await handler(event);
expect(result.statusCode).to.eq(400);
sinon.assert.calledOnce(fakeNotify);
});
});
1 change: 1 addition & 0 deletions test/test-helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const nock = require("nock");
const path = require("path");
const EventBuilder = require("./event-builder.js");

process.env.HONEYBADGER_DISABLED = "true";
process.env.HONEYBADGER_ENV = "test";

function requireSource(module) {
Expand Down