asonix/matrix-dimension
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move admin routes to their own API namespace

Browse source
This commit is contained in:
Travis Ralston 2018-03-23 21:36:43 -06:00
parent 73acbb586f
commit 7a2627ad76
7 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -7,9 +7,9 @@
"scripts": {
"start:web": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
"start:app": "npm run-script build && node build/app/index.js",
"build": "rimraf build && npm run-script build:web && npm run-script build:app",
"build:web": "webpack --progress --profile --bail",
"build:app": "tsc -p tsconfig-app.json",
"build": "npm run-script build:web && npm run-script build:app",
"build:web": "rimraf build/web && webpack --progress --profile --bail",
"build:app": "rimraf build/app && tsc -p tsconfig-app.json",
"lint": "npm run-script lint:app && npm run-script lint:web",
"lint:app": "tslint --project ./tsconfig-app.json -t stylish",
"lint:web": "tslint --project ./tsconfig.json -t stylish"

2
src/api/Webserver.ts
View file

@ -20,7 +20,7 @@ export default class Webserver {
}
private loadRoutes() {
const apis = ["scalar", "dimension", "matrix"].map(a => path.join(__dirname, a, "*.js"));
const apis = ["scalar", "dimension", "admin", "matrix"].map(a => path.join(__dirname, a, "*.js"));
const router = express.Router();
apis.forEach(a => Server.loadServices(router, [a]));
const routes = _.uniq(router.stack.map(r => r.route.path));

12
src/api/dimension/DimensionAppserviceAdminService.ts → src/api/admin/AdminAppserviceService.ts
View file

@ -1,5 +1,5 @@
import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
import { DimensionAdminService } from "./DimensionAdminService";
import { AdminService } from "./AdminService";
import AppService from "../../db/models/AppService";
import { AppserviceStore } from "../../db/AppserviceStore";
import { ApiError } from "../ApiError";
@ -28,19 +28,19 @@ interface AppserviceCreateRequest {
}
@Path("/api/v1/dimension/admin/appservices")
export class DimensionAppserviceAdminService {
export class AdminAppserviceService {
@GET
@Path("all")
public async getAppservices(@QueryParam("scalar_token") scalarToken: string): Promise<AppserviceResponse[]> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
return (await AppService.findAll()).map(a => this.mapAppservice(a));
}
@POST
@Path("new")
public async createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
// Trim off the @ sign if it's on the prefix
if (request.userPrefix[0] === "@") {
@ -59,14 +59,14 @@ export class DimensionAppserviceAdminService {
@GET
@Path(":appserviceId/users")
public async getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
return (await AppserviceStore.getUsers(asId)).map(u => this.mapUser(u));
}
@POST
@Path(":appserviceId/users/register")
public async registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const user = await AppserviceStore.registerUser(asId, request.userId);
return this.mapUser(user);

12
src/api/dimension/DimensionIntegrationsAdminService.ts → src/api/admin/AdminIntegrationsService.ts
View file

@ -1,7 +1,7 @@
import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
import { ApiError } from "../ApiError";
import { DimensionAdminService } from "./DimensionAdminService";
import { DimensionIntegrationsService, IntegrationsResponse } from "./DimensionIntegrationsService";
import { AdminService } from "./AdminService";
import { DimensionIntegrationsService, IntegrationsResponse } from "../dimension/DimensionIntegrationsService";
import { WidgetStore } from "../../db/WidgetStore";
import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
@ -14,12 +14,12 @@ interface SetOptionsRequest {
}
@Path("/api/v1/dimension/admin/integrations")
export class DimensionIntegrationsAdminService {
export class AdminIntegrationsService {
@POST
@Path(":category/:type/options")
public async setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
if (category === "widget") await WidgetStore.setOptions(type, body.options);
else throw new ApiError(400, "Unrecognized category");
@ -32,7 +32,7 @@ export class DimensionIntegrationsAdminService {
@POST
@Path(":category/:type/enabled")
public async setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
if (category === "widget") await WidgetStore.setEnabled(type, body.enabled);
else throw new ApiError(400, "Unrecognized category");
@ -44,7 +44,7 @@ export class DimensionIntegrationsAdminService {
@GET
@Path("all")
public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
return DimensionIntegrationsService.getIntegrations(null);
}
}

12
src/api/dimension/DimensionNebAdminService.ts → src/api/admin/AdminNebService.ts
View file

@ -1,5 +1,5 @@
import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
import { DimensionAdminService } from "./DimensionAdminService";
import { AdminService } from "./AdminService";
import { Cache, CACHE_NEB } from "../../MemoryCache";
import { NebStore } from "../../db/NebStore";
import { NebConfig } from "../../models/neb";
@ -21,12 +21,12 @@ interface SetEnabledRequest {
@Path("/api/v1/dimension/admin/neb")
export class DimensionNebAdminService {
export class AdminNebService {
@GET
@Path("all")
public async getNebConfigs(@QueryParam("scalar_token") scalarToken: string): Promise<NebConfig[]> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const cachedConfigs = Cache.for(CACHE_NEB).get("configurations");
if (cachedConfigs) return cachedConfigs;
@ -48,7 +48,7 @@ export class DimensionNebAdminService {
@POST
@Path(":id/integration/:type/enabled")
public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const integration = await NebStore.getOrCreateIntegration(nebId, integrationType);
integration.isEnabled = request.enabled;
@ -61,7 +61,7 @@ export class DimensionNebAdminService {
@POST
@Path("new/upstream")
public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
try {
const neb = await NebStore.createForUpstream(request.upstreamId);
@ -76,7 +76,7 @@ export class DimensionNebAdminService {
@POST
@Path("new/appservice")
public async newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
try {
const neb = await NebStore.createForAppservice(request.appserviceId, request.adminUrl);

10
src/api/dimension/DimensionAdminService.ts → src/api/admin/AdminService.ts
View file

@ -20,7 +20,7 @@ interface DimensionConfigResponse {
}
@Path("/api/v1/dimension/admin")
export class DimensionAdminService {
export class AdminService {
public static isAdmin(userId: string) {
return config.admins.indexOf(userId) >= 0;
@ -28,7 +28,7 @@ export class DimensionAdminService {
public static async validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
const userId = await ScalarService.getTokenOwner(scalarToken, true);
if (!DimensionAdminService.isAdmin(userId))
if (!AdminService.isAdmin(userId))
throw new ApiError(401, "You must be an administrator to use this API");
return userId;
}
@ -36,21 +36,21 @@ export class DimensionAdminService {
@GET
@Path("check")
public async checkIfAdmin(@QueryParam("scalar_token") scalarToken: string): Promise<{}> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
return {}; // A 200 OK essentially means "you're an admin".
}
@GET
@Path("version")
public async getVersion(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionVersionResponse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
return {version: CURRENT_VERSION};
}
@GET
@Path("config")
public async getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
return {

8
src/api/dimension/DimensionUpstreamAdminService.ts → src/api/admin/AdminUpstreamService.ts
View file

@ -1,5 +1,5 @@
import { GET, Path, POST, QueryParam } from "typescript-rest";
import { DimensionAdminService } from "./DimensionAdminService";
import { AdminService } from "./AdminService";
import { Cache, CACHE_UPSTREAM } from "../../MemoryCache";
import Upstream from "../../db/models/Upstream";
@ -19,12 +19,12 @@ interface NewUpstreamRequest {
}
@Path("/api/v1/dimension/admin/upstreams")
export class DimensionUpstreamAdminService {
export class AdminUpstreamService {
@GET
@Path("all")
public async getUpstreams(@QueryParam("scalar_token") scalarToken: string): Promise<UpstreamRepsonse[]> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const cachedUpstreams = Cache.for(CACHE_UPSTREAM).get("upstreams");
if (cachedUpstreams) return cachedUpstreams;
@ -38,7 +38,7 @@ export class DimensionUpstreamAdminService {
@POST
@Path("new")
public async createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
await AdminService.validateAndGetAdminTokenOwner(scalarToken);
const upstream = await Upstream.create({
name: request.name,