Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 17 Pull requests Projects Releases 36 Packages Wiki Activity Actions

renaming api module to webapi

Browse source
This commit is contained in:
Julian Krauser 2025-01-22 09:39:31 +01:00
parent 0b40b9d92c
commit 313785b4ac
21 changed files with 247 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/controller/admin/user/apiController.ts → src/controller/admin/user/webapiController.ts
View file

@ -1,12 +1,16 @@
import { Request, Response } from "express";
import ApiService from "../../../service/user/apiService";
import ApiFactory from "../../../factory/admin/user/api";
import ApiPermissionService from "../../../service/user/apiPermissionService";
import WebapiService from "../../../service/user/webapiService";
import ApiFactory from "../../../factory/admin/user/webapi";
import WebapiPermissionService from "../../../service/user/webapiPermissionService";
import PermissionHelper from "../../../helpers/permissionHelper";
import { CreateApiCommand, DeleteApiCommand, UpdateApiCommand } from "../../../command/user/api/apiCommand";
import ApiCommandHandler from "../../../command/user/api/apiCommandHandler";
import { UpdateApiPermissionsCommand } from "../../../command/user/api/apiPermissionCommand";
import ApiPermissionCommandHandler from "../../../command/user/api/apiPermissionCommandHandler";
import {
CreateWebapiCommand,
DeleteWebapiCommand,
UpdateWebapiCommand,
} from "../../../command/user/webapi/webapiCommand";
import WebapiCommandHandler from "../../../command/user/webapi/webapiCommandHandler";
import { UpdateWebapiPermissionsCommand } from "../../../command/user/webapi/webapiPermissionCommand";
import WebapiPermissionCommandHandler from "../../../command/user/webapi/webapiPermissionCommandHandler";
import { JWTHelper } from "../../../helpers/jwtHelper";
import { CLUB_NAME } from "../../../env.defaults";
import { StringHelper } from "../../../helpers/stringHelper";
@ -17,8 +21,8 @@ import { StringHelper } from "../../../helpers/stringHelper";
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function getAllApis(req: Request, res: Response): Promise<any> {
let apis = await ApiService.getAll();
export async function getAllWebapis(req: Request, res: Response): Promise<any> {
let apis = await WebapiService.getAll();
res.json(ApiFactory.mapToBase(apis));
}
@ -29,9 +33,9 @@ export async function getAllApis(req: Request, res: Response): Promise<any> {
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function getApiById(req: Request, res: Response): Promise<any> {
export async function getWebapiById(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let api = await ApiService.getById(id);
let api = await WebapiService.getById(id);
res.json(ApiFactory.mapToSingle(api));
}
@ -42,9 +46,9 @@ export async function getApiById(req: Request, res: Response): Promise<any> {
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function getApiTokenById(req: Request, res: Response): Promise<any> {
export async function getWebapiTokenById(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let { token } = await ApiService.getTokenById(id);
let { token } = await WebapiService.getTokenById(id);
res.send(token);
}
@ -55,9 +59,9 @@ export async function getApiTokenById(req: Request, res: Response): Promise<any>
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function getApiPermissions(req: Request, res: Response): Promise<any> {
export async function getWebapiPermissions(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let permissions = await ApiPermissionService.getByApi(id);
let permissions = await WebapiPermissionService.getByApi(id);
res.json(PermissionHelper.convertToObject(permissions.map((p) => p.permission)));
}
@ -68,7 +72,7 @@ export async function getApiPermissions(req: Request, res: Response): Promise<an
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function createApi(req: Request, res: Response): Promise<any> {
export async function createWebapi(req: Request, res: Response): Promise<any> {
let title = req.body.title;
let expiry = req.body.expiry;
@ -79,12 +83,12 @@ export async function createApi(req: Request, res: Response): Promise<any> {
aud: StringHelper.random(32),
});
let createApi: CreateApiCommand = {
let createApi: CreateWebapiCommand = {
token: token,
title: title,
expiry: expiry,
};
await ApiCommandHandler.create(createApi);
await WebapiCommandHandler.create(createApi);
res.sendStatus(204);
}
@ -95,17 +99,17 @@ export async function createApi(req: Request, res: Response): Promise<any> {
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function updateApi(req: Request, res: Response): Promise<any> {
export async function updateWebapi(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let title = req.body.title;
let expiry = req.body.expiry;
let updateApi: UpdateApiCommand = {
let updateApi: UpdateWebapiCommand = {
id: id,
title: title,
expiry: expiry,
};
await ApiCommandHandler.update(updateApi);
await WebapiCommandHandler.update(updateApi);
res.sendStatus(204);
}
@ -116,17 +120,17 @@ export async function updateApi(req: Request, res: Response): Promise<any> {
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function updateApiPermissions(req: Request, res: Response): Promise<any> {
export async function updateWebapiPermissions(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let permissions = req.body.permissions;
let permissionStrings = PermissionHelper.convertToStringArray(permissions);
let updateApiPermissions: UpdateApiPermissionsCommand = {
let updateApiPermissions: UpdateWebapiPermissionsCommand = {
apiId: id,
permissions: permissionStrings,
};
await ApiPermissionCommandHandler.updatePermissions(updateApiPermissions);
await WebapiPermissionCommandHandler.updatePermissions(updateApiPermissions);
res.sendStatus(204);
}
@ -137,13 +141,13 @@ export async function updateApiPermissions(req: Request, res: Response): Promise
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function deleteApi(req: Request, res: Response): Promise<any> {
export async function deleteWebapi(req: Request, res: Response): Promise<any> {
const id = parseInt(req.params.id);
let deleteApi: DeleteApiCommand = {
let deleteApi: DeleteWebapiCommand = {
id: id,
};
await ApiCommandHandler.delete(deleteApi);
await WebapiCommandHandler.delete(deleteApi);
res.sendStatus(204);
}

6
src/controller/apiController.ts → src/controller/webapiController.ts
View file

@ -8,7 +8,7 @@ import UserService from "../service/user/userService";
import speakeasy from "speakeasy";
import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
import RefreshService from "../service/refreshService";
import ApiService from "../service/user/apiService";
import WebapiService from "../service/user/webapiService";
import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
/**
@ -20,13 +20,13 @@ import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
export async function getWebApiAccess(req: Request, res: Response): Promise<any> {
const bearer = req.headers.authorization?.split(" ")?.[1] ?? undefined;
let { expiry } = await ApiService.getByToken(bearer);
let { expiry } = await WebapiService.getByToken(bearer);
if (new Date() > new Date(expiry)) {
throw new ForbiddenRequestException("api token expired");
}
let accessToken = await JWTHelper.buildApiToken(bearer);
let accessToken = await JWTHelper.buildWebapiToken(bearer);
res.json({
accessToken,