Fixed partial handling and added cookies
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
import { AppProperties } from "$root/defaults/interfaces.ts";
|
||||
|
||||
const properties: AppProperties = {
|
||||
name: "Students",
|
||||
icon: "badge",
|
||||
pages: {
|
||||
index: "Homepage",
|
||||
upload: "Upload students",
|
||||
},
|
||||
adminOnly: ["upload"],
|
||||
hint: "See student information",
|
||||
};
|
||||
|
||||
export default properties;
|
||||
@@ -0,0 +1,22 @@
|
||||
import { Handlers } from "$fresh/server.ts";
|
||||
|
||||
export const handler: Handlers = {
|
||||
async POST(request, context) {
|
||||
if (request.headers.get("content-type") != "application/json") {
|
||||
return new Response(null, {
|
||||
status: 400,
|
||||
});
|
||||
}
|
||||
|
||||
const responseBody = {
|
||||
requestBody: await request.json(),
|
||||
context,
|
||||
};
|
||||
|
||||
return new Response(JSON.stringify(responseBody), {
|
||||
headers: {
|
||||
"content-type": "application/json",
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,2 @@
|
||||
import makeIndex from "$root/defaults/makeIndex.ts";
|
||||
export default makeIndex(import.meta.dirname!);
|
||||
@@ -0,0 +1,14 @@
|
||||
import {
|
||||
getPartialsConfig,
|
||||
makePartials,
|
||||
} from "$root/defaults/makePartials.tsx";
|
||||
import { FreshContext } from "$fresh/server.ts";
|
||||
import { State } from "$root/routes/_middleware.ts";
|
||||
|
||||
// deno-lint-ignore require-await
|
||||
export async function Index(_request: Request, context: FreshContext<State>) {
|
||||
return <h2>Welcome to {context.state.session?.displayName}.</h2>;
|
||||
}
|
||||
|
||||
export const config = getPartialsConfig();
|
||||
export default makePartials(Index);
|
||||
@@ -1,7 +1,7 @@
|
||||
import { FreshContext } from "$fresh/server.ts";
|
||||
import { getCookies } from "$std/http/cookie.ts";
|
||||
import { getJwtPayload, isJwtValid } from "@popov/jwt";
|
||||
import { LoginJWT } from "$root/routes/login.tsx";
|
||||
import { CasContent, LoginJWT } from "$root/defaults/interfaces.ts";
|
||||
|
||||
const PUBLIC_ROUTES = [
|
||||
"/",
|
||||
@@ -16,6 +16,7 @@ const jwtKeyCache: Record<string, string> = {};
|
||||
|
||||
export interface State {
|
||||
isAuthenticated: boolean;
|
||||
session: CasContent;
|
||||
}
|
||||
|
||||
function isRoutePublic(route: string) {
|
||||
@@ -44,12 +45,16 @@ export const handler = [
|
||||
}
|
||||
|
||||
const content = getJwtPayload(cookies["sessionToken"]) as LoginJWT;
|
||||
const key = getKey(content.user.uid as string);
|
||||
const key = getKey(content.user.uid);
|
||||
|
||||
context.state.isAuthenticated = await isJwtValid(
|
||||
cookies["sessionToken"],
|
||||
key,
|
||||
);
|
||||
const session: CasContent =
|
||||
(getJwtPayload(cookies["sessionToken"]) as LoginJWT).user;
|
||||
|
||||
context.state.session = session;
|
||||
|
||||
return await context.next();
|
||||
},
|
||||
|
||||
+14
-30
@@ -1,10 +1,12 @@
|
||||
import { Handlers } from "$fresh/server.ts";
|
||||
import { State } from "$root/routes/_middleware.ts";
|
||||
import { parse, type RegularTagNode } from "@melvdouc/xml-parser";
|
||||
import {
|
||||
parse,
|
||||
type RegularTagNode,
|
||||
type TextNode,
|
||||
} from "@melvdouc/xml-parser";
|
||||
CasContent,
|
||||
CasResponse,
|
||||
CasTagNode,
|
||||
LoginJWT,
|
||||
} from "$root/defaults/interfaces.ts";
|
||||
import { createJwt } from "@popov/jwt";
|
||||
import { setCookie } from "$std/http/cookie.ts";
|
||||
import { getKey } from "$root/routes/_middleware.ts";
|
||||
@@ -12,26 +14,6 @@ import { getKey } from "$root/routes/_middleware.ts";
|
||||
const SERVICE = "https://localhost/login";
|
||||
const CAS = "https://ident.univ-amu.fr/cas";
|
||||
|
||||
interface CasTagNode extends RegularTagNode {
|
||||
children: [TextNode];
|
||||
}
|
||||
|
||||
interface CasGroupNode extends RegularTagNode {
|
||||
children: CasTagNode[];
|
||||
}
|
||||
|
||||
interface CasResponse extends RegularTagNode {
|
||||
children: [TextNode, CasGroupNode];
|
||||
}
|
||||
|
||||
export interface LoginJWT {
|
||||
iss: "PolyMPR";
|
||||
iat: number;
|
||||
exp: number;
|
||||
aud: "PolyMPR";
|
||||
user: Record<string, string | string[]>;
|
||||
}
|
||||
|
||||
function getTag(tag: CasTagNode): [string, string] {
|
||||
return [
|
||||
tag.tagName.replace("cas:", ""),
|
||||
@@ -43,11 +25,13 @@ function createUserJWT(casResponse: CasResponse): Promise<string> {
|
||||
const nodes = casResponse.children[1].children.map(getTag);
|
||||
const fullUserInfos: Record<string, string | string[]> = {};
|
||||
|
||||
nodes.forEach(([key, value]) => {
|
||||
if (fullUserInfos[key] && Array.isArray(fullUserInfos[key])) {
|
||||
nodes.forEach(([key, value]: [string, string]) => {
|
||||
if (typeof fullUserInfos[key] == "string") {
|
||||
fullUserInfos[key] = [fullUserInfos[key]];
|
||||
}
|
||||
|
||||
if (Array.isArray(fullUserInfos[key])) {
|
||||
fullUserInfos[key].push(value);
|
||||
} else if (fullUserInfos[key]) {
|
||||
fullUserInfos[key] = [fullUserInfos[key], value];
|
||||
} else {
|
||||
fullUserInfos[key] = value;
|
||||
}
|
||||
@@ -56,12 +40,12 @@ function createUserJWT(casResponse: CasResponse): Promise<string> {
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const oneHour = 60 * 60;
|
||||
|
||||
const payload = {
|
||||
const payload: LoginJWT = {
|
||||
iss: "PolyMPR",
|
||||
iat: now,
|
||||
exp: now + oneHour,
|
||||
aud: "PolyMPR",
|
||||
user: fullUserInfos,
|
||||
user: fullUserInfos as unknown as CasContent,
|
||||
};
|
||||
|
||||
const key = getKey(fullUserInfos.uid as string);
|
||||
|
||||
Reference in New Issue
Block a user