Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-10-01 01:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support access token auth in the query string

Browse Source
This commit is contained in:
Travis Ralston 2019-06-30 19:13:01 -06:00
parent 293097f6fb
commit fbc1173529
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/security/MSCSecurity.ts
View File

@ -10,6 +10,7 @@ export interface IMSCUser {
} }
export const ROLE_MSC_USER = "ROLE_MSC_USER"; export const ROLE_MSC_USER = "ROLE_MSC_USER";
export const ROLE_MSC_TERMS_SIGNED = "ROLE_MSC_TERMS_SIGNED";
export default class MSCSecurity implements ServiceAuthenticator { export default class MSCSecurity implements ServiceAuthenticator {
@ -23,21 +24,27 @@ export default class MSCSecurity implements ServiceAuthenticator {
getMiddleware(): RequestHandler { getMiddleware(): RequestHandler {
return (async (req: Request, res: Response, next: () => void) => { return (async (req: Request, res: Response, next: () => void) => {
try { try {
let token = null;
if (req.headers.authorization) { if (req.headers.authorization) {
const header = req.headers.authorization; const header = req.headers.authorization;
if (!header.startsWith("Bearer ")) { if (!header.startsWith("Bearer ")) {
return res.status(401).json({errcode: "M_INVALID_TOKEN", error: "Invalid token"}); return res.status(401).json({errcode: "M_INVALID_TOKEN", error: "Invalid token"});
} }
token = header.substring("Bearer ".length);
} else if (req.query && req.query.access_token) {
token = req.query.access_token;
}
const token = header.substring("Bearer ".length); if (token) {
req.user = <IMSCUser>{ req.user = <IMSCUser>{
userId: await this.accountController.getTokenOwner(token), userId: await this.accountController.getTokenOwner(token),
token: token, token: token,
}; };
return next(); return next();
} else {
return res.status(401).json({errcode: "M_INVALID_TOKEN", error: "Invalid token"});
} }
console.log(req.query);
} catch (e) { } catch (e) {
if (e instanceof ApiError) { if (e instanceof ApiError) {
// TODO: Proper error message // TODO: Proper error message