projects
/
websub-hub
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor of authentication and html-templates into separate modules
[websub-hub]
/
src
/
service.js
diff --git
a/src/service.js
b/src/service.js
index a0043f7d24caa49a71c85341dc4fadca6ea563d2..6dcde1ec201b1a212beb704d99c61edebcd75be9 100644
(file)
--- a/
src/service.js
+++ b/
src/service.js
@@
-9,8
+9,7
@@
const { Dingus } = require('@squeep/api-dingus');
const common = require('./common');
const Enum = require('./enum');
const Manager = require('./manager');
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);
const path = require('path');
const _fileScope = common.fileScope(__filename);
@@
-155,7
+154,7
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, ctx);
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.
r
equired(req, res, ctx, this.loginPath);
+ await this.authenticator.
sessionR
equired(req, res, ctx, this.loginPath);
await this.manager.getAdminOverview(res, ctx);
}
await this.manager.getAdminOverview(res, ctx);
}
@@
-174,7
+173,7
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, ctx);
this.setResponseType(this.responseTypes, req, res, ctx);
- await this.authenticator.
r
equired(req, res, ctx, this.loginPath);
+ await this.authenticator.
sessionR
equired(req, res, ctx, this.loginPath);
await this.manager.getTopicDetails(res, ctx);
}
await this.manager.getTopicDetails(res, ctx);
}
@@
-209,7
+208,7
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, 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;
await this.maybeIngestBody(req, res, ctx);
ctx.method = req.method;
@@
-228,7
+227,7
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, 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;
await this.maybeIngestBody(req, res, ctx);
ctx.method = req.method;
@@
-247,13
+246,14
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, 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);
}
/**
await this.manager.processTasks(res, ctx);
}
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
@@
-271,6
+271,7
@@
class Service extends Dingus {
/**
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
@@
-281,6
+282,8
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, 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);
await this.maybeIngestBody(req, res, ctx);
await this.sessionManager.postAdminLogin(res, ctx);
@@
-288,6
+291,7
@@
class Service extends Dingus {
/**
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
@@
-298,11
+302,14
@@
class Service extends Dingus {
this.setResponseType(this.responseTypes, req, res, ctx);
this.setResponseType(this.responseTypes, req, res, ctx);
+ await this.authenticator.sessionOptionalLocal(req, res, ctx);
+
await this.sessionManager.getAdminLogout(res, ctx);
}
/**
await this.sessionManager.getAdminLogout(res, ctx);
}
/**
+ * Delegate login to authentication module.
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx
* @param {http.ClientRequest} req
* @param {http.ServerResponse} res
* @param {Object} ctx