mirror of
https://github.com/kou029w/quot.git
synced 2025-01-18 16:08:03 +00:00
fixed dev api server
This commit is contained in:
parent
2e05578e9a
commit
70006ba31c
4 changed files with 40 additions and 26 deletions
|
@ -7,15 +7,17 @@ interface Config {
|
|||
apiEndpoint: string;
|
||||
viewsDir: string;
|
||||
rootUrl: URL;
|
||||
openid: {
|
||||
issuer: string;
|
||||
client: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
};
|
||||
request: HttpOptions;
|
||||
};
|
||||
key: KeyObject;
|
||||
openid:
|
||||
| false
|
||||
| {
|
||||
issuer: string;
|
||||
client: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
};
|
||||
request: HttpOptions;
|
||||
};
|
||||
key: false | KeyObject;
|
||||
}
|
||||
|
||||
export type { Config };
|
||||
|
@ -31,18 +33,20 @@ function defaultConfig(): Config {
|
|||
apiUrl: new URL(process.env.QUOT_API_URL ?? "http://127.0.0.1:3000"),
|
||||
apiEndpoint: process.env.QUOT_API_ENDPOINT ?? "/api",
|
||||
viewsDir: "views",
|
||||
openid: {
|
||||
issuer: process.env.QUOT_OPENID_ISSUER ?? "",
|
||||
openid: Boolean(process.env.QUOT_OPENID_ISSUER) && {
|
||||
issuer: process.env.QUOT_OPENID_ISSUER!,
|
||||
client: {
|
||||
client_id: process.env.QUOT_OPENID_CLIENT_ID ?? "",
|
||||
client_secret: process.env.QUOT_OPENID_CLIENT_SECRET ?? "",
|
||||
client_id: process.env.QUOT_OPENID_CLIENT_ID!,
|
||||
client_secret: process.env.QUOT_OPENID_CLIENT_SECRET!,
|
||||
},
|
||||
request: { timeout: 5_000 },
|
||||
},
|
||||
key: crypto.createPrivateKey({
|
||||
key: JSON.parse(process.env.QUOT_JWK ?? "{}"),
|
||||
format: "jwk",
|
||||
}),
|
||||
key:
|
||||
Boolean(process.env.QUOT_JWK) &&
|
||||
crypto.createPrivateKey({
|
||||
key: JSON.parse(process.env.QUOT_JWK!),
|
||||
format: "jwk",
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -3,9 +3,21 @@ import { SignJWT } from "jose";
|
|||
import type { FastifyInstance } from "fastify";
|
||||
|
||||
async function login(fastify: FastifyInstance) {
|
||||
custom.setHttpOptionsDefaults(fastify.config.openid.request);
|
||||
const issuer = await Issuer.discover(fastify.config.openid.issuer);
|
||||
const client = new issuer.Client(fastify.config.openid.client);
|
||||
const key = fastify.config.key;
|
||||
if (!key) {
|
||||
fastify.log.warn("The key is required to use login endpoint.");
|
||||
return;
|
||||
}
|
||||
const openid = fastify.config.openid;
|
||||
if (!openid) {
|
||||
fastify.log.warn(
|
||||
"The openid parameters is required to use login endpoint."
|
||||
);
|
||||
return;
|
||||
}
|
||||
custom.setHttpOptionsDefaults(openid.request);
|
||||
const issuer = await Issuer.discover(openid.issuer);
|
||||
const client = new issuer.Client(openid.client);
|
||||
|
||||
fastify.get("/login", async (request, reply) => {
|
||||
const params = client.callbackParams(request.raw);
|
||||
|
@ -22,7 +34,7 @@ async function login(fastify: FastifyInstance) {
|
|||
.setProtectedHeader({ typ: "JWT", alg: "RS256" })
|
||||
.setExpirationTime("30days")
|
||||
.setSubject(userUrl.href)
|
||||
.sign(fastify.config.key);
|
||||
.sign(key);
|
||||
const url = new URL(fastify.config.rootUrl);
|
||||
url.hash = new URLSearchParams({ jwt }).toString();
|
||||
return reply.redirect(url.href);
|
||||
|
|
|
@ -11,13 +11,12 @@ async function updatePage(
|
|||
content: Pages.RequestContentPage
|
||||
): Promise<boolean> {
|
||||
const jwt = window.localStorage.getItem("jwt");
|
||||
if (!jwt) return false;
|
||||
const res = await fetch(
|
||||
`${import.meta.env.QUOT_API_ENDPOINT}/pages?id=eq.${id}`,
|
||||
{
|
||||
method: "PUT",
|
||||
headers: {
|
||||
authorization: `Bearer ${jwt}`,
|
||||
...(jwt ? { authorization: `Bearer ${jwt}` } : {}),
|
||||
"content-type": "application/json",
|
||||
},
|
||||
body: JSON.stringify(content),
|
||||
|
@ -28,12 +27,11 @@ async function updatePage(
|
|||
|
||||
async function deletePage(id: number): Promise<boolean> {
|
||||
const jwt = window.localStorage.getItem("jwt");
|
||||
if (!jwt) return false;
|
||||
const res = await fetch(
|
||||
`${import.meta.env.QUOT_API_ENDPOINT}/pages?id=eq.${id}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: { authorization: `Bearer ${jwt}` },
|
||||
headers: jwt ? { authorization: `Bearer ${jwt}` } : {},
|
||||
}
|
||||
);
|
||||
return res.ok;
|
||||
|
|
|
@ -22,8 +22,8 @@ services:
|
|||
restart: unless-stopped
|
||||
ports: ["3000:3000"]
|
||||
environment:
|
||||
QUOT_JWK: ${QUOT_JWK:?} # https://mkjwk.org
|
||||
DATABASE_URL: postgresql://postgres:${POSTGRES_PASSWORD}@/postgres?host=/var/run/postgresql
|
||||
PGRST_DB_ANON_ROLE: postgres
|
||||
volumes:
|
||||
- postgres_socket:/var/run/postgresql
|
||||
depends_on:
|
||||
|
|
Loading…
Add table
Reference in a new issue