versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-03-13 05:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(api): 🔥 Remove old @versia/client version

Browse source
This commit is contained in:
Jesse Wierzbinski 2025-03-22 18:04:47 +01:00
parent 54e282b03c
commit 8d1af1b0cd
No known key found for this signature in database
121 changed files with 649 additions and 756 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/openid/index.ts
View file

@ -1,4 +1,5 @@
import { z } from "@hono/zod-openapi";
import { RolePermission } from "@versia/client/schemas";
import { Hooks, Plugin } from "@versia/kit";
import { User } from "@versia/kit/db";
import { getCookie } from "hono/cookie";
@ -6,7 +7,6 @@ import { jwtVerify } from "jose";
import { JOSEError, JWTExpired } from "jose/errors";
import { keyPair, sensitiveString } from "~/classes/config/schema.ts";
import { ApiError } from "~/classes/errors/api-error.ts";
import { RolePermissions } from "~/drizzle/schema.ts";
import authorizeRoute from "./routes/authorize.ts";
import jwksRoute from "./routes/jwks.ts";
import ssoLoginCallbackRoute from "./routes/oauth/callback.ts";
@ -91,10 +91,10 @@ plugin.registerRoute("/admin/*", (app) => {
const user = await User.fromId(sub);
if (!user?.hasPermission(RolePermissions.ManageInstanceFederation)) {
if (!user?.hasPermission(RolePermission.ManageInstanceFederation)) {
throw new ApiError(
403,
`Missing '${RolePermissions.ManageInstanceFederation}' permission`,
`Missing '${RolePermission.ManageInstanceFederation}' permission`,
);
}

4
plugins/openid/routes/authorize.test.ts
View file

@ -1,7 +1,7 @@
import { afterAll, describe, expect, test } from "bun:test";
import { randomString } from "@/math";
import { RolePermission } from "@versia/client/schemas";
import { Application } from "@versia/kit/db";
import { RolePermissions } from "@versia/kit/tables";
import { SignJWT } from "jose";
import { config } from "~/config.ts";
import { fakeRequest, getTestUsers } from "~/tests/utils";
@ -268,7 +268,7 @@ describe("/oauth/authorize", () => {
const params = new URLSearchParams(location.search);
expect(params.get("error")).toBe("unauthorized");
expect(params.get("error_description")).toBe(
`User missing required '${RolePermissions.OAuth}' permission`,
`User missing required '${RolePermission.OAuth}' permission`,
);
config.permissions.default = oldPermissions;

4
plugins/openid/routes/authorize.ts
View file

@ -1,8 +1,8 @@
import { auth, jsonOrForm } from "@/api";
import { randomString } from "@/math";
import { z } from "@hono/zod-openapi";
import { RolePermission } from "@versia/client/schemas";
import { Application, Token, User } from "@versia/kit/db";
import { RolePermissions } from "@versia/kit/tables";
import { type JWTPayload, SignJWT, jwtVerify } from "jose";
import { JOSEError } from "jose/errors";
import { errorRedirect, errors } from "../errors.ts";
@ -161,7 +161,7 @@ export default (plugin: PluginType): void =>
);
}
if (!user.hasPermission(RolePermissions.OAuth)) {
if (!user.hasPermission(RolePermission.OAuth)) {
return errorRedirect(
context,
errors.MissingOauthPermission,

9
plugins/openid/routes/oauth/callback.ts
View file

@ -1,9 +1,10 @@
import { randomString } from "@/math.ts";
import { createRoute, z } from "@hono/zod-openapi";
import { Account as AccountSchema } from "@versia/client-ng/schemas";
import { Account as AccountSchema } from "@versia/client/schemas";
import { RolePermission } from "@versia/client/schemas";
import { Media, Token, User, db } from "@versia/kit/db";
import { type SQL, and, eq, isNull } from "@versia/kit/drizzle";
import { OpenIdAccounts, RolePermissions, Users } from "@versia/kit/tables";
import { OpenIdAccounts, Users } from "@versia/kit/tables";
import { setCookie } from "hono/cookie";
import { SignJWT } from "jose";
import { ApiError } from "~/classes/errors/api-error.ts";
@ -268,11 +269,11 @@ export default (plugin: PluginType): void => {
);
}
if (!user.hasPermission(RolePermissions.OAuth)) {
if (!user.hasPermission(RolePermission.OAuth)) {
errorSearchParams.append("error", "invalid_request");
errorSearchParams.append(
"error_description",
`User does not have the '${RolePermissions.OAuth}' permission`,
`User does not have the '${RolePermission.OAuth}' permission`,
);
return context.redirect(

7
plugins/openid/routes/sso/:id/index.ts
View file

@ -1,9 +1,10 @@
import { auth } from "@/api";
import { proxyUrl } from "@/response";
import { createRoute, z } from "@hono/zod-openapi";
import { RolePermission } from "@versia/client/schemas";
import { db } from "@versia/kit/db";
import { type SQL, eq } from "@versia/kit/drizzle";
import { OpenIdAccounts, RolePermissions } from "@versia/kit/tables";
import { OpenIdAccounts } from "@versia/kit/tables";
import { ApiError } from "~/classes/errors/api-error";
import type { PluginType } from "~/plugins/openid";
import { ErrorSchema } from "~/types/api";
@ -18,7 +19,7 @@ export default (plugin: PluginType): void => {
middleware: [
auth({
auth: true,
permissions: [RolePermissions.OAuth],
permissions: [RolePermission.OAuth],
}),
plugin.middleware,
] as const,
@ -103,7 +104,7 @@ export default (plugin: PluginType): void => {
middleware: [
auth({
auth: true,
permissions: [RolePermissions.OAuth],
permissions: [RolePermission.OAuth],
}),
plugin.middleware,
] as const,

7
plugins/openid/routes/sso/index.ts
View file

@ -1,7 +1,8 @@
import { auth } from "@/api";
import { z } from "@hono/zod-openapi";
import { RolePermission } from "@versia/client/schemas";
import { Application, db } from "@versia/kit/db";
import { OpenIdLoginFlows, RolePermissions } from "@versia/kit/tables";
import { OpenIdLoginFlows } from "@versia/kit/tables";
import {
calculatePKCECodeChallenge,
generateRandomCodeVerifier,
@ -20,7 +21,7 @@ export default (plugin: PluginType): void => {
middleware: [
auth({
auth: true,
permissions: [RolePermissions.OAuth],
permissions: [RolePermission.OAuth],
}),
plugin.middleware,
] as const,
@ -67,7 +68,7 @@ export default (plugin: PluginType): void => {
middleware: [
auth({
auth: true,
permissions: [RolePermissions.OAuth],
permissions: [RolePermission.OAuth],
}),
plugin.middleware,
] as const,