Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-03 04:18:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename permissions to the new ones

Browse Source
This commit is contained in:
zkldi
2021-06-25 18:52:58 +01:00
parent 0fda15a9a2
commit ca40fcc705
13 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/pnpm-lock.yaml
Generated
+4 -4
View File
@@ -80,7 +80,7 @@ dependencies:
rate-limit-redis: 2.1.0
redis: 3.1.2
rimraf: 3.0.2
tachi-common: github.com/zkldi/tachi-common/65f1b0a6d7bf9c08d04b35901829df9e4b4207ff_ts-node@10.0.0+typescript@4.3.4
tachi-common: github.com/zkldi/tachi-common/0b3e388dd5f153e18a4cede1c9ba046f45c7a570_ts-node@10.0.0+typescript@4.3.4
typescript: 4.3.4
winston: 3.3.3
@@ -4233,9 +4233,9 @@ packages:
engines: {node: '>=6'}
dev: true
github.com/zkldi/tachi-common/65f1b0a6d7bf9c08d04b35901829df9e4b4207ff_ts-node@10.0.0+typescript@4.3.4:
resolution: {tarball: https://codeload.github.com/zkldi/tachi-common/tar.gz/65f1b0a6d7bf9c08d04b35901829df9e4b4207ff}
id: github.com/zkldi/tachi-common/65f1b0a6d7bf9c08d04b35901829df9e4b4207ff
github.com/zkldi/tachi-common/0b3e388dd5f153e18a4cede1c9ba046f45c7a570_ts-node@10.0.0+typescript@4.3.4:
resolution: {tarball: https://codeload.github.com/zkldi/tachi-common/tar.gz/0b3e388dd5f153e18a4cede1c9ba046f45c7a570}
id: github.com/zkldi/tachi-common/0b3e388dd5f153e18a4cede1c9ba046f45c7a570
name: tachi-common
version: 0.1.0
dependencies:
server/src/server/middleware/auth.test.ts
+2 -2
View File
@@ -11,7 +11,7 @@ t.test("#SetRequestPermissions", (t) => {
userID: 1,
identifier: "Mock API Token",
permissions: {
"create:goal": true,
customise_profile: true,
},
token: "mock_token",
});
@@ -26,7 +26,7 @@ t.test("#SetRequestPermissions", (t) => {
userID: 1,
identifier: "Mock API Token",
permissions: {
"create:goal": true,
customise_profile: true,
},
token: "mock_token",
});
server/src/server/middleware/auth.ts
+2 -3
View File
@@ -15,9 +15,8 @@ const GuestToken: APITokenDocument = {
};
export const AllPermissions: Record<APIPermissions, true> = {
"create:goal": true,
"manage:goal": true,
"submit:score": true,
customise_profile: true,
submit_score: true,
};
/**
server/src/server/router/api/v1/users/_userID/router.ts
+4 -1
View File
@@ -1,8 +1,9 @@
import { Router } from "express";
import db from "../../../../../../external/mongo/db";
import { SYMBOL_TachiData } from "../../../../../../lib/constants/tachi";
import { GetUserFromParam } from "./middleware";
import { GetUserFromParam, RequireAuthedAsUser } from "./middleware";
import gamePTRouter from "./games/_game/_playtype/router";
import { RequirePermissions } from "../../../../../middleware/auth";
const router: Router = Router({ mergeParams: true });
@@ -41,6 +42,8 @@ router.get("/game-stats", async (req, res) => {
});
});
router.put("/pfp", RequireAuthedAsUser, RequirePermissions(""))
router.use("/games/:game/:playtype", gamePTRouter);
export default router;
server/src/server/router/ir/barbatos/router.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { SYMBOL_TachiAPIAuth } from "../../../../lib/constants/tachi";
const router: Router = Router({ mergeParams: true });
router.use(RequirePermissions("submit:score"));
router.use(RequirePermissions("submit_score"));
/**
* Submits a single score document from Barbatos clients.
server/src/server/router/ir/beatoraja/router.test.ts
+2 -2
View File
@@ -13,7 +13,7 @@ t.test("POST /ir/beatoraja/submit-score", (t) => {
userID: 1,
identifier: "Mock API Beatoraja Token",
permissions: {
"submit:score": true,
"submit_score": true,
},
token: "mock_token",
})
@@ -166,7 +166,7 @@ t.test("POST /ir/beatoraja/submit-course", (t) => {
userID: 1,
identifier: "Mock API Beatoraja Token",
permissions: {
"submit:score": true,
"submit_score": true,
},
token: "mock_token",
})
server/src/server/router/ir/chunitachi/router.ts
+1 -1
View File
@@ -11,7 +11,7 @@ const router: Router = Router({ mergeParams: true });
* Submits a single score document from Chunitachi clients.
* @name POST /ir/chunitachi/score/submit
*/
router.post("/import", RequirePermissions("submit:score"), async (req, res) => {
router.post("/import", RequirePermissions("submit_score"), async (req, res) => {
const userDoc = await GetUserWithIDGuaranteed(req[SYMBOL_TachiAPIAuth].userID!);
if (req.body?.head?.game !== "chunithm") {
server/src/server/router/ir/direct-manual/router.test.ts
+3 -3
View File
@@ -12,12 +12,12 @@ t.test("POST /ir/direct-manual/import", async (t) => {
t.beforeEach(ResetDBState);
t.test("Should require submit:score permissions", async (t) => {
t.test("Should require submit_score permissions", async (t) => {
await db["api-tokens"].insert({
token: "foo",
identifier: "bar",
permissions: {
"submit:score": false,
"submit_score": false,
},
userID: 1,
});
@@ -28,7 +28,7 @@ t.test("POST /ir/direct-manual/import", async (t) => {
t.equal(res.body.success, false);
t.match(res.body.description, /submit:score/u);
t.match(res.body.description, /submit_score/u);
t.end();
});
server/src/server/router/ir/direct-manual/router.ts
+1 -1
View File
@@ -14,7 +14,7 @@ const router: Router = Router({ mergeParams: true });
*/
router.post(
"/import",
RequirePermissions("submit:score"),
RequirePermissions("submit_score"),
RequireLoggedInSession,
async (req, res) => {
const userDoc = await GetUserWithIDGuaranteed(req[SYMBOL_TachiAPIAuth].userID!);
server/src/server/router/ir/fervidex/router.ts
+1 -1
View File
@@ -151,7 +151,7 @@ const ValidateModelHeader: RequestHandler = (req, res, next) => {
return next();
};
router.use(RequirePermissions("submit:score"), ValidateFervidexHeader, ValidateModelHeader);
router.use(RequirePermissions("submit_score"), ValidateFervidexHeader, ValidateModelHeader);
/**
* Submits all of a users data to Kamaitachi. This data is extremely minimal,
server/src/server/router/ir/usc/router.test.ts
+2 -2
View File
@@ -13,7 +13,7 @@ async function InsertFakeUSCAuth() {
userID: 1,
identifier: "USC Token",
permissions: {
"submit:score": true,
"submit_score": true,
},
token: "foo",
});
@@ -44,7 +44,7 @@ t.test("GET /ir/usc", async (t) => {
userID: 1,
identifier: "USC Token",
permissions: {
"submit:score": true,
"submit_score": true,
},
token: "foo",
});
server/src/server/router/ir/usc/router.ts
+2 -2
View File
@@ -234,7 +234,7 @@ router.get("/charts/:chartHash/leaderboard", RetrieveChart, async (req, res) =>
* https://uscir.readthedocs.io/en/latest/endpoints/score-submit.html
* @name POST /ir/usc/scores
*/
router.post("/scores", RequirePermissions("submit:score"), async (req, res) => {
router.post("/scores", RequirePermissions("submit_score"), async (req, res) => {
if (typeof req.body.chart !== "object" || req.body.chart === null) {
return res.status(200).json({
statusCode: STATUS_CODES.BAD_REQ,
@@ -316,7 +316,7 @@ router.post("/scores", RequirePermissions("submit:score"), async (req, res) => {
*/
router.post(
"/replays",
RequirePermissions("submit:score"),
RequirePermissions("submit_score"),
CreateMulterSingleUploadMiddleware("replay", ONE_MEGABYTE, logger),
async (req, res) => {
if (typeof req.body.identifier !== "string") {
server/src/test-utils/mock-db/api-tokens.json
+1 -1
View File
@@ -3,7 +3,7 @@
"userID": 1,
"token": "fake_api_token",
"permissions": {
"submit:goal": true
"submit_score": true
},
"identifier": "Mock Token For Testing"
}