const common = require('./common');
const Enum = require('./enum');
const Manager = require('./manager');
-const SessionManager = require('./session-manager');
-const Authenticator = require('./authenticator');
+const { Authenticator, SessionManager } = require('@squeep/authentication-module');
const path = require('path');
const _fileScope = common.fileScope(__filename);
this.on(['GET', 'HEAD'], '/admin', this.handlerRedirect.bind(this), `${options.dingus.proxyPrefix}/admin/`);
this.on(['GET', 'HEAD'], '/admin/', this.handlerGetAdminOverview.bind(this));
this.on(['GET', 'HEAD'], '/admin/topic/:topicId', this.handlerGetAdminTopicDetails.bind(this));
+ this.on(['GET', 'HEAD'], '/admin/topic/:topicId/history.svg', this.handlerGetHistorySVG.bind(this));
// Private data-editing endpoints
this.on(['PATCH', 'DELETE'], '/admin/topic/:topicId', this.handlerUpdateTopic.bind(this));
*/
async handlerPostRoot(req, res, ctx) {
const _scope = _fileScope('handlerPostRoot');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
await this.ingestBody(req, res, ctx);
const responseTypes = [
Enum.ContentType.TextHTML,
];
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
Dingus.setHeadHandler(req, res, ctx);
this.setResponseType(responseTypes, req, res, ctx);
+ await this.authenticator.sessionOptional(req, res, ctx, this.loginPath);
+
await this.manager.getRoot(req, res, ctx);
}
*/
async handlerGetHealthcheck(req, res, ctx) {
const _scope = _fileScope('handlerGetHealthcheck');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
Dingus.setHeadHandler(req, res, ctx);
*/
async handlerGetInfo(req, res, ctx) {
const _scope = _fileScope('handlerGetInfo');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
const responseTypes = [...this.responseTypes, Enum.ContentType.ImageSVG];
}
+ async handlerGetHistorySVG(req, res, ctx) {
+ const _scope = _fileScope('handlerGetHist');
+ this.logger.debug(_scope, 'called', { req, ctx });
+
+ const responseTypes = [Enum.ContentType.ImageSVG];
+
+ Dingus.setHeadHandler(req, res, ctx);
+
+ this.setResponseType(responseTypes, req, res, ctx);
+
+ await this.manager.getHistorySVG(res, ctx);
+ }
+
+
/**
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
*/
async handlerGetAdminOverview(req, res, ctx) {
const _scope = _fileScope('handlerGetAdminOverview');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
Dingus.setHeadHandler(req, res, ctx);
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.required(req, res, ctx, this.loginPath);
-
- await this.manager.getAdminOverview(res, ctx);
+ if (await this.authenticator.sessionRequired(req, res, ctx, this.loginPath)) {
+ await this.manager.getAdminOverview(res, ctx);
+ }
}
*/
async handlerGetAdminTopicDetails(req, res, ctx) {
const _scope = _fileScope('handlerGetAdminTopicDetails');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
Dingus.setHeadHandler(req, res, ctx);
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.required(req, res, ctx, this.loginPath);
-
- await this.manager.getTopicDetails(res, ctx);
+ if (await this.authenticator.sessionRequired(req, res, ctx, this.loginPath)) {
+ await this.manager.getTopicDetails(res, ctx);
+ }
}
/**
- * Same as super.ingestBody, but if no body was sent, do not parse (and
- * thus avoid possible unsupported media type error).
+ * If no body was sent, do not parse (and thus avoid possible unsupported media type error).
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
*/
async maybeIngestBody(req, res, ctx) {
- ctx.rawBody = await this.bodyData(req);
- const contentType = Dingus.getRequestContentType(req);
- if (ctx.rawBody) {
- this.parseBody(contentType, ctx);
- }
+ return super.ingestBody(req, res, ctx, {
+ parseEmptyBody: false,
+ });
}
*/
async handlerUpdateTopic(req, res, ctx) {
const _scope = _fileScope('handlerUpdateTopic');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.requiredLocal(req, res, ctx, this.loginPath);
+ await this.authenticator.apiRequiredLocal(req, res, ctx);
await this.maybeIngestBody(req, res, ctx);
ctx.method = req.method;
*/
async handlerUpdateSubscription(req, res, ctx) {
const _scope = _fileScope('handlerUpdateSubscription');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.requiredLocal(req, res, ctx, this.loginPath);
+ await this.authenticator.apiRequiredLocal(req, res, ctx);
await this.maybeIngestBody(req, res, ctx);
ctx.method = req.method;
*/
async handlerPostAdminProcess(req, res, ctx) {
const _scope = _fileScope('handlerPostAdminProcess');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.requiredLocal(req, res, ctx, this.loginPath);
+ await this.authenticator.apiRequiredLocal(req, res, ctx);
await this.manager.processTasks(res, ctx);
}
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
*/
async handlerGetAdminLogin(req, res, ctx) {
const _scope = _fileScope('handlerGetAdminLogin');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
Dingus.setHeadHandler(req, res, ctx);
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
*/
async handlerPostAdminLogin(req, res, ctx) {
const _scope = _fileScope('handlerPostAdminLogin');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
+ await this.authenticator.sessionOptionalLocal(req, res, ctx);
+
await this.maybeIngestBody(req, res, ctx);
await this.sessionManager.postAdminLogin(res, ctx);
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
*/
async handlerGetAdminLogout(req, res, ctx) {
const _scope = _fileScope('handlerGetAdminLogout');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);
+ await this.authenticator.sessionOptionalLocal(req, res, ctx);
+
await this.sessionManager.getAdminLogout(res, ctx);
}
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
*/
async handlerGetAdminIA(req, res, ctx) {
const _scope = _fileScope('handlerGetAdminIA');
- this.logger.debug(_scope, 'called', { req: common.requestLogData(req), ctx });
+ this.logger.debug(_scope, 'called', { req, ctx });
this.setResponseType(this.responseTypes, req, res, ctx);