update nix hash

add api route for querying user information
hack together change password page
2023-05-10 22:37:38 +00:00 · 2023-05-10 18:29:11 -04:00 · 2023-05-09 19:01:52 -07:00 · 2023-05-09 17:56:36 -07:00 · 2023-05-09 16:21:20 -07:00 · 2023-05-09 16:26:36 -04:00
45 changed files with 1922 additions and 1808 deletions
--- a/dex/robots.txt
+++ b/dex/robots.txt
@ -1,5 +0,0 @@
 User-agent: *
 Disallow: /
 User-agent: LUN-4
 Allow: *
--- a/dex/static/main.css
+++ b/dex/static/main.css
@ -1,17 +0,0 @@
 body,
 html {
  margin: 0;
  padding: 0;
  width: 100vw;
  height: 100vh;
  overflow: hidden;
 }
 iframe {
  width: 100vw;
  height: 100vh;
  border: none;
  margin: 0;
  padding: 0;
 }
--- a/dex/templates/approval.html
+++ b/dex/templates/approval.html
@ -1,74 +0,0 @@
 {{ template "header.html" . }}
 <script>
  let source = null;
  function sendToGluestick(msg) {
    source.postMessage(msg, {
      targetOrigin: '{{ print (extra "gluestick_url") }}'
    });
  }
  document.addEventListener("DOMContentLoaded", () => {
    window.addEventListener(
      "message",
      (e) => {
        if (e.origin != '{{ print (extra "gluestick_url") }}') return;
        switch (e.data.type) {
          case "appResult":
            submitApproval(e.data.success);
            break;
        }
      },
      false
    );
    const iframe = document.querySelector("iframe");
    iframe.addEventListener("load", () => {
      source = iframe.contentWindow;
      sendToGluestick({ type: "hello" });
      sendToGluestick({
        type: "appInfo",
        client: "{{ .Client }}",
        scopes:
        {{ if .Scopes }}
          [
          {{ range $scope := .Scopes }}
            "{{ $scope }}",
          {{ end }}
          ]
        {{ else }}
          null
        {{ end }}
      });
    });
  });
  async function submitApproval(doesApprove) {
    const params = new URLSearchParams();
    params.append("req", "{{ .AuthReqID }}");
    params.append("approval", doesApprove ? "approve" : "rejected");
    // cursed shit to work about cors
    const form = document.createElement("form");
    form.method = "POST";
    const hiddenReq = document.createElement("input");
    hiddenReq.type = "hidden";
    hiddenReq.name = "req";
    hiddenReq.value = "{{ .AuthReqID }}";
    form.appendChild(hiddenReq);
    const hiddenApproval = document.createElement("input");
    hiddenApproval.type = "hidden";
    hiddenApproval.name = "approval";
    hiddenApproval.value = doesApprove ? "approve" : "rejected";
    form.appendChild(hiddenApproval);
    document.body.appendChild(form);
    form.submit();
  }
 </script>
 <iframe src='{{ print (extra "gluestick_url") "/dex/approval" }}'></iframe>
 {{ template "footer.html" . }}
--- a/dex/templates/device.html
+++ b/dex/templates/device.html
@ -1 +0,0 @@
 {{ template "header.html" . }} {{ template "footer.html" . }}
--- a/dex/templates/device_success.html
+++ b/dex/templates/device_success.html
@ -1 +0,0 @@
 {{ template "header.html" . }} {{ template "footer.html" . }}
--- a/dex/templates/error.html
+++ b/dex/templates/error.html
@ -1 +0,0 @@
 {{ template "header.html" . }} {{ template "footer.html" . }}
--- a/dex/templates/footer.html
+++ b/dex/templates/footer.html
@ -1,2 +0,0 @@
  </body>
 </html>
--- a/dex/templates/header.html
+++ b/dex/templates/header.html
@ -1,11 +0,0 @@
 <!DOCTYPE html>
 <html>
  <head>
    <meta charset="utf-8" />
    <title>gluestick</title>
    <link rel="icon" href='{{ print (extra "gluestick_url") "/icon.svg" }}' />
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
    <link href='{{ url .ReqPath "static/main.css" }}' rel="stylesheet" />
  </head>
  <body>
--- a/dex/templates/login.html
+++ b/dex/templates/login.html
@ -1 +0,0 @@
 {{ template "header.html" . }} {{ template "footer.html" . }}
--- a/dex/templates/oob.html
+++ b/dex/templates/oob.html
@ -1 +0,0 @@
 {{ template "header.html" . }} {{ template "footer.html" . }}
--- a/dex/templates/password.html
+++ b/dex/templates/password.html
@ -1,61 +0,0 @@
 {{ template "header.html" . }}
 <script>
  let source = null;
  function sendToGluestick(msg) {
    source.postMessage(msg, {
      targetOrigin: '{{ print (extra "gluestick_url") }}'
    });
  }
  document.addEventListener("DOMContentLoaded", () => {
    window.addEventListener(
      "message",
      (e) => {
        if (e.origin != '{{ print (extra "gluestick_url") }}') return;
        switch (e.data.type) {
          case "passwordSubmit":
            const { username, password } = e.data;
            submitLogin(username, password);
            break;
        }
      },
      false
    );
    const iframe = document.querySelector("iframe");
    iframe.addEventListener("load", () => {
      source = iframe.contentWindow;
      sendToGluestick({ type: "hello" });
    });
  });
  async function submitLogin(username, password) {
    const params = new URLSearchParams();
    params.append("login", username);
    params.append("password", password);
    const req = await fetch("{{ .PostURL }}", {
      headers: {
        "Content-Type": "application/x-www-form-urlencoded"
      },
      body: params,
      method: "POST",
      redirect: "follow"
    });
    if (req.ok && req.redirected) {
      window.location.href = req.url;
      return;
    }
    sendToGluestick({
      type: "passwordSubmitResult",
      success: req.ok
    });
  }
 </script>
 <iframe src='{{ print (extra "gluestick_url") "/dex/password" }}'></iframe>
 {{ template "footer.html" . }}
--- a/environment.d.ts
+++ b/environment.d.ts
@ -27,7 +27,7 @@ declare global {
      GITHUB_ORG: string;
      BASE_DOMAIN: string;
-      DEX_DOMAIN: string;
+      API_TOKEN?: string;
    }
  }
 }
--- a/flake.nix
+++ b/flake.nix
@ -29,7 +29,7 @@
            pname = "gluestick";
            version = "0.1.0";
            src = ./.;
-            npmDepsHash = "sha256-keOreamXKunlJzU2AKJo0J02ZxQrjLdoCIMCaiwEU4Y=";
+            npmDepsHash = "sha256-JPsXIPyiGycT/4dcg78qAz+qqIRYpSR24NWeu+5jLk0=";
            nativeBuildInputs = inputs;
            buildInputs = inputs;
--- a/next.config.js
+++ b/next.config.js
@ -3,18 +3,7 @@ const nextConfig = {
  experimental: {
    appDir: true
  },
-  output: "standalone",
+  output: "standalone"
  // Allow Dex to use gluestick in an iframe
  headers: async () => {
    return [{
      source: "/dex/(.*)",
      headers: [{
        key: "Content-Security-Policy",
        value: `frame-ancestors 'self' ${process.env.DEX_DOMAIN}`
      }]
    }]
  }
 };
 module.exports = nextConfig;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -25,14 +25,15 @@
    "formik": "^2.2.9",
    "graphql": "^16.6.0",
    "ldapts": "^4.2.5",
-    "next": "13.3.1",
+    "next": "^13.4.2-canary.4",
    "pino": "^8.11.0",
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "sharp": "^0.32.0",
    "typescript": "5.0.4",
    "uuid": "^9.0.0",
-    "yup": "^1.1.1"
+    "zod": "^3.21.4",
    "zod-formik-adapter": "^1.2.0"
  },
  "devDependencies": {
    "@graphql-codegen/cli": "^3.3.1",
--- a/src/actions/changePassword.ts
+++ b/src/actions/changePassword.ts
@ -0,0 +1,29 @@
 "use server";
 import { getUser } from "@/auth/auth";
 import { getUserInfo, setPassword, validateUser } from "@/ldap";
 import { ActionResponse } from ".";
 import { PasswordUpdateSchema, passwordUpdateSchema } from "@/schemas";
 export default async function changePassword(
  data: PasswordUpdateSchema
 ): Promise<ActionResponse> {
  const user = await getUser();
  if (user == null) return { ok: false, error: "noUser" };
  const userInfo = await getUserInfo(user);
  if (userInfo == null) {
    return { ok: false, error: "notRegisteredYet" };
  }
  const { password, newPassword } = passwordUpdateSchema.parse(data);
  const passwordMatches = await validateUser(user.username!, password);
  if (!passwordMatches) {
    return { ok: false, error: "incorrectPassword" };
  }
  await setPassword(user.username!, newPassword);
  return { ok: true };
 }
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@ -0,0 +1,4 @@
 export type ActionResponse = {
  ok: boolean;
  error?: string;
 };
--- a/src/actions/login.ts
+++ b/src/actions/login.ts
@ -0,0 +1,26 @@
 "use server";
 import * as ldap from "@/ldap";
 import { LoginSchema, loginSchema } from "@/schemas";
 import { ActionResponse } from ".";
 import { getLogger } from "@/logger";
 import { authTicketLogin } from "@/auth/auth";
 type Response = ActionResponse & {
  ticket?: string;
 };
 export default async function login(data: LoginSchema): Promise<Response> {
  const { username, password } = await loginSchema.parse(data);
  const valid = await ldap.validateUser(username, password);
  if (!valid) {
    return {
      ok: false,
      error: "invalidCredentials"
    };
  }
  const [_, ticket] = await authTicketLogin(username);
  return { ok: true, ticket: ticket.ticket };
 }
--- a/src/app/api/register/route.ts
+++ b/src/app/api/register/route.ts
@ -1,38 +1,47 @@
 "use server";
 import * as ldap from "@/ldap";
 import prisma from "@/prisma";
 import { getUser } from "@/auth/auth";
 import { getLogger } from "@/logger";
-import { registerServerSchema } from "@/schemas";
+import { RegisterSchema, registerSchema } from "@/schemas";
 import { ActionResponse } from ".";
-const logger = getLogger("/api/register");
+const logger = getLogger("/actions/register");
-export async function POST(request: Request) {
+export default async function register(
  data: RegisterSchema
 ): Promise<ActionResponse> {
  const user = await getUser();
  if (user == null) return new Response(null, { status: 401 });
-  // user already has an account, don't re-register
+  if (user == null) {
    return { ok: false, error: "invalidAuth" };
  }
  if (user.username != null) {
    logger.info(
      { username: user.username, id: user.id },
      `user tried to register twice`
    );
-    return new Response(null, { status: 403 });
+    return { ok: false, error: "invalidAuth" };
  }
  const { username, displayName, email, password, avatar } =
-    await registerServerSchema.validate(await request.json());
+    await registerSchema.parse(data);
-  let avatarBuf = avatar != null ? Buffer.from(avatar, "base64") : null;
+  let avatarBuf = null;
  if (avatar != null) {
    const parts = avatar.split(",");
    const data = parts.length === 2 ? parts[1] : parts[0];
    avatarBuf = Buffer.from(data, "base64");
  }
  const users = await ldap.getUsers();
  for (const user of users) {
    if (user.id.toLowerCase() === username.toLowerCase()) {
-      return new Response(
+      return {
-        JSON.stringify({
+        ok: false,
-          ok: false,
+        error: "usernameTaken"
-          error: "usernameTaken"
+      };
        }),
        { status: 400 }
      );
    }
  }
@ -49,10 +58,5 @@ export async function POST(request: Request) {
  });
  logger.info(outputUser, "registered user");
-  return new Response(
+  return { ok: true };
    JSON.stringify({
      ok: true
    }),
    { status: 201 }
  );
 }
--- a/src/app/api/unlink/route.ts
+++ b/src/app/api/unlink/route.ts
@ -1,3 +1,6 @@
 "use server";
 import { ValidAuthProvider } from "@/auth/AuthProvider";
 import {
  AuthState,
  getAuthState,
@ -35,8 +38,7 @@ async function deleteUser(id: number) {
    }
  });
 }
-
+export default async function unlink(provider?: ValidAuthProvider) {
 export async function POST(request: Request) {
  const authState = await getAuthState();
  if (authState == AuthState.Registering) {
@ -49,30 +51,22 @@ export async function POST(request: Request) {
    await deleteUser(registeringUser.id);
-    return new Response(null, { status: 200 });
+    return;
  }
  const user = await getUser();
-  if (user == null) return new Response(null, { status: 401 });
+  if (user == null) return;
  const { searchParams } = new URL(request.url);
  const provider = searchParams.get("provider");
  switch (provider) {
-    case "discord":
+    case "Discord":
      const discord = await user.getDiscord();
-      if (discord == null) return new Response(null, { status: 400 });
+      if (discord == null) return;
      await unlinkDiscord(await discord.getId());
      break;
-    case "github":
+    case "GitHub":
      const github = await user.getGitHub();
-      if (github == null) return new Response(null, { status: 400 });
+      if (github == null) return;
      await unlinkGitHub(await github.getId());
      break;
    default:
      return new Response(null, { status: 400 });
  }
  return new Response(null, { status: 200 });
 }
--- a/src/app/api/update/route.ts
+++ b/src/app/api/update/route.ts
@ -1,30 +1,28 @@
 "use server";
 import { AboutMeSchema, aboutMeSchema } from "@/schemas";
 import { ActionResponse } from ".";
 import { getLogger } from "@/logger";
 import { getUser } from "@/auth/auth";
 import { getUserInfo, updateUser } from "@/ldap";
 import { getLogger } from "@/logger";
-type RequestBody = {
+const logger = getLogger("/actions/update");
  displayName?: string;
  email?: string;
  avatar?: string;
 };
 export async function POST(request: Request) {
  const logger = getLogger("/api/update");
 export default async function update(
  data: AboutMeSchema
 ): Promise<ActionResponse> {
  const user = await getUser();
-  if (user == null) return new Response(null, { status: 401 });
+  if (user == null) {
    return { ok: false, error: "invalidAuth" };
  }
  const userInfo = await getUserInfo(user);
  if (userInfo == null) {
    // no user info = hasn't registered yet
-    return new Response(null, { status: 409 });
+    return { ok: false, error: "invalidAuth" };
  }
-  const {
+  const { displayName, email, avatar } = await aboutMeSchema.parse(data);
    displayName,
    email,
    avatar: avatarBase64
  } = (await request.json()) as RequestBody;
  let changeDisplayName = false;
  if (
@ -47,25 +45,24 @@ export async function POST(request: Request) {
  let avatarBuf = undefined;
  if (
-    avatarBase64 !== undefined &&
+    avatar !== undefined &&
-    typeof avatarBase64 === "string" &&
+    typeof avatar === "string" &&
-    avatarBase64 !== userInfo.avatar
+    avatar !== userInfo.avatar
  ) {
-    avatarBuf = Buffer.from(avatarBase64, "base64");
+    const parts = avatar.split(",");
    const data = parts.length === 2 ? parts[1] : parts[0];
    avatarBuf = Buffer.from(data, "base64");
    if (avatarBuf.length > 2_000_000) {
-      return new Response(
+      return {
-        JSON.stringify({
+        ok: false,
-          ok: false,
+        error: "avatarBig"
-          error: "avatarBig"
+      };
        }),
        { status: 400 }
      );
    }
  }
  if (!changeDisplayName && !changeEmail && !avatarBuf) {
-    return new Response(null, { status: 200 });
+    return { ok: true };
  }
  await updateUser(
@ -85,12 +82,5 @@ export async function POST(request: Request) {
    "updated user"
  );
-  return new Response(
+  return { ok: true };
    JSON.stringify({
      ok: true
    }),
    {
      status: 200
    }
  );
 }
--- a/src/app/api/login/route.ts
+++ b/src/app/api/login/route.ts
@ -1,29 +0,0 @@
 import { authTicketLogin } from "@/auth/auth";
 import * as ldap from "@/ldap";
 import { loginSchema } from "@/schemas";
 type RequestBody = {
  username: string;
  password: string;
 };
 export async function POST(request: Request) {
  const { username, password } = await loginSchema.validate(
    await request.json()
  );
  const valid = await ldap.validateUser(username, password);
  if (!valid) {
    return new Response(
      JSON.stringify({
        ok: false,
        error: "invalidCredentials"
      }),
      { status: 401 }
    );
  }
  const [_, ticket] = await authTicketLogin(username);
  // not confident if we can set-cookie and I cba to try
  return new Response(JSON.stringify({ ok: true, ticket: ticket.ticket }));
 }
--- a/src/app/api/user/[username]/route.ts
+++ b/src/app/api/user/[username]/route.ts
@ -0,0 +1,41 @@
 import { NextRequest } from "next/server";
 import prisma from "@/prisma";
 import * as ldap from "@/ldap";
 export const dynamic = "force-dynamic";
 export async function GET(
  request: NextRequest,
  { params }: { params: { username: string } }
 ) {
  const { username } = params;
  if (
    process.env.API_TOKEN == null ||
    process.env.API_TOKEN !== request.headers.get("Authorization")
  ) {
    return new Response(null, { status: 401 });
  }
  const user = await prisma.user.findUnique({
    where: { username: username as string }
  });
  if (user == null) {
    return new Response(null, { status: 404 });
  }
  const ldapUser = await ldap.getUserInfo(user);
  if (ldapUser == null) {
    return new Response(null, { status: 404 });
  }
  return new Response(
    JSON.stringify({
      ...ldapUser,
      avatar: ldapUser.avatar ?? null,
      discordId: ldapUser.discordId ?? null,
      githubId: ldapUser.githubId ?? null
    })
  );
 }
--- a/src/app/dex/approval/DexApprovalForm.module.css
+++ b/src/app/dex/approval/DexApprovalForm.module.css
@ -1,10 +0,0 @@
 .buttons {
  display: flex;
  width: 100%;
  justify-content: center;
  gap: 1rem;
 }
 .approvalText {
  padding: 1rem 0;
 }
--- a/src/app/dex/approval/DexApprovalForm.tsx
+++ b/src/app/dex/approval/DexApprovalForm.tsx
@ -1,59 +0,0 @@
 "use client";
 import React from "react";
 import { AppInfo, useDex } from "../dex";
 import styles from "./DexApprovalForm.module.css";
 export default function DexApprovalForm({ domain }: { domain: string }) {
  const [appInfo, setAppInfo] = React.useState<AppInfo | null>(null);
  const sendToDex = useDex(domain, (msg) => {
    switch (msg.type) {
      case "appInfo":
        setAppInfo(msg);
        break;
    }
  });
  if (appInfo === null) return <></>;
  // Stolen from LoginForm
  return (
    <div>
      <h1>Sign into {appInfo.client}</h1>
      <div className={styles.approvalText}>
        {appInfo.scopes != null ? (
          <>
            <p>{appInfo.client} would like to:</p>
            <ul>
              {appInfo.scopes.map((scope) => (
                <li key={scope}>{scope}</li>
              ))}
            </ul>
          </>
        ) : (
          <p>{appInfo.client} doesn't have any special permissions.</p>
        )}
      </div>
      <div className={styles.buttons}>
        <input
          type="submit"
          value="Allow"
          onClick={() => {
            sendToDex({ type: "appResult", success: true });
          }}
        />
        <input
          type="submit"
          value="Deny"
          onClick={() => {
            sendToDex({ type: "appResult", success: false });
          }}
        />
      </div>
    </div>
  );
 }
--- a/src/app/dex/approval/page.tsx
+++ b/src/app/dex/approval/page.tsx
@ -1,10 +0,0 @@
 import styles from "@/app/page.module.css";
 import DexApprovalForm from "./DexApprovalForm";
 export default async function Page() {
  return (
    <main className={styles.main}>
      <DexApprovalForm domain={process.env.DEX_DOMAIN} />
    </main>
  );
 }
--- a/src/app/dex/dex.tsx
+++ b/src/app/dex/dex.tsx
@ -1,41 +0,0 @@
 import React from "react";
 export type AppInfo = {
  type: "appInfo";
  client: string;
  scopes: string[] | null;
 };
 export type Message =
  | { type: "hello" }
  | { type: "passwordSubmit"; username: string; password: string }
  | { type: "passwordSubmitResult"; success: boolean }
  | AppInfo
  | { type: "appResult"; success: boolean };
 export function useDex(domain: string, handler: (msg: Message) => void) {
  const [source, setSource] = React.useState<MessageEventSource | null>(null);
  const sendToDex = (msg: Message, maybeSource?: MessageEventSource) => {
    let realSource = maybeSource ?? source;
    realSource!.postMessage(msg, {
      targetOrigin: domain
    });
  };
  React.useEffect(() => {
    window.addEventListener("message", (e) => {
      if (e.origin !== domain) return;
      const message: Message = e.data;
      setSource(e.source);
      if (message.type === "hello") {
        sendToDex({ type: "hello" }, e.source!);
      }
      handler(message);
    });
  }, []);
  return sendToDex;
 }
--- a/src/app/dex/password/DexPasswordForm.tsx
+++ b/src/app/dex/password/DexPasswordForm.tsx
@ -1,60 +0,0 @@
 "use client";
 import React from "react";
 import { useDex } from "../dex";
 import { LoginFormValues, loginSchema } from "@/schemas";
 import { Form, Formik } from "formik";
 import PrettyForm from "@/components/PrettyForm";
 import Input from "@/components/Input";
 export default function DexPasswordForm({ domain }: { domain: string }) {
  const [globalError, setGlobalError] = React.useState<string | null>(null);
  const [submitting, setSubmitting] = React.useState(false);
  const sendToDex = useDex(domain, (msg) => {
    switch (msg.type) {
      case "passwordSubmitResult":
        setSubmitting(false);
        if (!msg.success) setGlobalError("Invalid credentials.");
        break;
    }
  });
  async function handleFormSubmit({ username, password }: LoginFormValues) {
    setSubmitting(true);
    sendToDex({
      type: "passwordSubmit",
      username,
      password
    });
  }
  // Stolen from LoginForm
  return (
    <PrettyForm globalError={globalError}>
      <Formik
        initialValues={{ username: "", password: "" }}
        onSubmit={handleFormSubmit}
        validationSchema={loginSchema}
      >
        {() => (
          <Form>
            <Input
              type="text"
              placeholder="julian"
              name="username"
              label="Username"
            />
            <Input
              type="password"
              placeholder="deeznuts47"
              name="password"
              label="Password"
            />
            <input type="submit" value="Login" disabled={submitting} />
          </Form>
        )}
      </Formik>
    </PrettyForm>
  );
 }
--- a/src/app/dex/password/page.tsx
+++ b/src/app/dex/password/page.tsx
@ -1,10 +0,0 @@
 import styles from "@/app/page.module.css";
 import DexPasswordForm from "./DexPasswordForm";
 export default async function Page() {
  return (
    <main className={styles.main}>
      <DexPasswordForm domain={process.env.DEX_DOMAIN} />
    </main>
  );
 }
--- a/src/app/login/LoginForm.tsx
+++ b/src/app/login/LoginForm.tsx
@ -1,54 +1,34 @@
 "use client";
 import login from "@/actions/login";
 import Input from "@/components/Input";
 import PrettyForm from "@/components/PrettyForm";
-import { LoginFormValues, loginSchema } from "@/schemas";
+import { LoginSchema, loginSchema } from "@/schemas";
 import { Form, Formik, FormikHelpers, FormikValues } from "formik";
 import React from "react";
 import { toFormikValidationSchema } from "zod-formik-adapter";
 export default function LoginForm() {
  const [globalError, setGlobalError] = React.useState<string | null>(null);
  async function handleFormSubmit(
-    { username, password }: LoginFormValues,
+    data: LoginSchema,
-    { setSubmitting }: FormikHelpers<LoginFormValues>
+    { setSubmitting }: FormikHelpers<LoginSchema>
  ) {
    setSubmitting(true);
-    if (username === "greets") {
+    if (data.username === "greets") {
      window.location.href = "/sekrit";
      return;
    }
-    const req = await fetch("/api/login", {
+    const res = await login(data);
-      method: "POST",
+    if (res.ok) {
-      headers: {
+      document.cookie = `ticket=${res.ticket}; path=/;`;
-        "Content-Type": "application/json"
+      window.location.href = "/me";
-      },
+    } else {
-      body: JSON.stringify({
+      // only error is invalidCredentials, I am lazy
-        username,
+      setGlobalError("Invalid credentials.");
        password
      })
    });
    try {
      const res: {
        ok: boolean;
        error?: string;
        ticket: string;
      } = await req.json();
      if (res.ok) {
        document.cookie = `ticket=${res.ticket}; path=/;`;
        window.location.href = "/me";
      } else {
        // only error is invalidCredentials, I am lazy
        setGlobalError("Invalid credentials.");
      }
    } catch (err) {
      console.error(err);
      setGlobalError("shits fucked up yo");
      setSubmitting(false);
    }
  }
@ -57,7 +37,7 @@ export default function LoginForm() {
      <Formik
        initialValues={{ username: "", password: "" }}
        onSubmit={handleFormSubmit}
-        validationSchema={loginSchema}
+        validationSchema={toFormikValidationSchema(loginSchema)}
      >
        {({ isSubmitting }) => (
          <Form>
--- a/src/app/me/AboutMe.module.css
+++ b/src/app/me/AboutMe.module.css
@ -7,6 +7,7 @@
  display: grid;
  grid-template-columns: 300px 1fr;
  column-gap: 2rem;
  max-width: 100vw;
 }
 .profileTower *:first-child {
@ -71,3 +72,19 @@
  width: 100%;
  margin: 1rem 0;
 }
 /* stack if we're out of space */
@media (max-width: 800px) {
  .profileGrid {
    grid-template-columns: 1fr;
  }
  .profileGrid > * {
    max-width: 100vw;
  }
  .rightGrid {
    display: flex;
    flex-direction: column;
  }
 }
--- a/src/app/me/AboutMe.tsx
+++ b/src/app/me/AboutMe.tsx
@ -7,12 +7,6 @@ import styles from "./AboutMe.module.css";
 import AvatarChanger from "@/components/AvatarChanger";
 import Input, { Hint, Label } from "@/components/Input";
 import { Form, Formik, FormikHelpers } from "formik";
 import {
  AboutMeFormValues,
  PasswordUpdateFormValues,
  aboutMeSchema,
  passwordUpdateSchema
 } from "@/schemas";
 import PrettyForm from "@/components/PrettyForm";
 import Toast from "@/components/Toast";
 import { AuthProviderState } from "@/auth/AuthProvider";
@ -21,11 +15,10 @@ import DiscordIcon from "@/components/icons/DiscordIcon";
 import GitHubIcon from "@/components/icons/GitHubIcon";
 import TailscaleIcon from "@/components/icons/TailscaleIcon";
 import MigaduIcon from "@/components/icons/MigaduIcon";
-
+import { AboutMeSchema, aboutMeSchema } from "@/schemas";
-type UpdateResponse = {
+import update from "@/actions/update";
-  ok: boolean;
+import { toFormikValidationSchema } from "zod-formik-adapter";
-  error?: string;
+import { useRouter } from "next/navigation";
 };
 export default function AboutMe({
  info,
@ -38,8 +31,9 @@ export default function AboutMe({
  const [globalError, setGlobalError] = React.useState<string | null>(null);
  const [madeProfileChanges, setMadeChanges] = React.useState(false);
  const [madePasswordChanges, setMadePasswordChanges] = React.useState(false);
  const router = useRouter();
-  const initialValues: AboutMeFormValues = {
+  const initialValues: AboutMeSchema = {
    username: info.username,
    displayName: info.displayName,
    email: info.email,
@ -47,77 +41,20 @@ export default function AboutMe({
  };
  async function handleFormSubmit(
-    { displayName, email, avatar }: AboutMeFormValues,
+    data: AboutMeSchema,
-    { setSubmitting }: FormikHelpers<AboutMeFormValues>
+    { setSubmitting }: FormikHelpers<AboutMeSchema>
  ) {
    setMadeChanges(false);
    setSubmitting(true);
-    const req = await fetch("/api/update", {
+    const res = await update(data);
      method: "POST",
      headers: {
        "Content-Type": "application/json"
      },
      body: JSON.stringify({
        displayName,
        email,
        avatar: avatar != null ? avatar.split(",")[1] : null
      })
    });
    setSubmitting(false);
-    try {
+    if (res.ok) {
      const res: UpdateResponse = await req.json();
      if (!res.ok && res.error !== null) {
        switch (res.error) {
          case "avatarBig":
            break;
        }
      }
      setMadeChanges(true);
-    } catch {
+    } else {
-      console.error(req);
+      if (res.error != undefined) {
-    }
+        setGlobalError("Unknown error: " + res.error);
  }
  const [passwordError, setPasswordError] = React.useState<string | null>(null);
  const initialPasswordValues: PasswordUpdateFormValues = {
    password: "",
    newPassword: "",
    confirmPassword: ""
  };
  async function handlePasswordSubmit(
    { password, newPassword }: PasswordUpdateFormValues,
    { setFieldError, setSubmitting }: FormikHelpers<PasswordUpdateFormValues>
  ) {
    setMadePasswordChanges(false);
    setSubmitting(true);
    const req = await fetch("/api/changePassword", {
      method: "POST",
      headers: {
        "Content-Type": "application/json"
      },
      body: JSON.stringify({
        currentPassword: password,
        newPassword: newPassword
      })
    });
    setSubmitting(false);
    try {
      const res: UpdateResponse = await req.json();
      if (!res.ok && res.error !== null) {
        switch (res.error) {
          case "incorrectPassword":
            setFieldError("password", "Incorrect password.");
            break;
        }
      }
      setMadePasswordChanges(true);
    } catch {
      console.error(req);
    }
  }
@ -127,7 +64,7 @@ export default function AboutMe({
        <Formik
          initialValues={initialValues}
          onSubmit={handleFormSubmit}
-          validationSchema={aboutMeSchema}
+          validationSchema={toFormikValidationSchema(aboutMeSchema)}
        >
          {({ isSubmitting }) => (
            <Form className={styles.profileGrid}>
@ -150,7 +87,7 @@ export default function AboutMe({
              <div>
                <h2 className={styles.userName}>{info.username}</h2>
                <div className={styles.rightGrid}>
-                  <div>
+                  <div className={styles.profile}>
                    {madeProfileChanges ? (
                      <Toast>Saved your changes.</Toast>
                    ) : null}
@ -185,7 +122,14 @@ export default function AboutMe({
                    />
                    <div className={styles.multiButtons}>
-                      <button type="button">Change password</button>
+                      <button
                        type="button"
                        onClick={() => {
                          router.push("/me/change-password");
                        }}
                      >
                        Change password
                      </button>
                      <button
                        type="button"
@ -233,69 +177,6 @@ export default function AboutMe({
          )}
        </Formik>
      </PrettyForm>
      {/*<PrettyForm globalError={passwordError}>
        <Formik
          initialValues={initialPasswordValues}
          onSubmit={handlePasswordSubmit}
          validationSchema={passwordUpdateSchema}
        >
          {({ isSubmitting }) => (
            <Form>
              {madePasswordChanges ? (
                <Toast>Changed your password.</Toast>
              ) : null}
              <Input
                type="password"
                name="password"
                label="Current"
                minLength={12}
                required
              />
              <Input
                type="password"
                name="newPassword"
                label="New"
                minLength={12}
                required
              />
              <Input
                type="password"
                name="confirmPassword"
                label="Confirm"
                minLength={12}
                required
              />
              <input
                type="submit"
                value="Save"
                className={styles.fancyInput}
                disabled={isSubmitting}
              />
            </Form>
          )}
        </Formik>
      </PrettyForm>
      <h2 className={styles.header}>Connections</h2>
      <div className={styles.authProviderList}>
        {providers.map((provider) => (
          <AuthProviderEntry provider={provider} key={provider.name} />
        ))}
      </div>
      <input
        type="button"
        value="Log out"
        className={styles.logout}
        onClick={async () => {
          document.cookie =
            "ticket=; expires=" + new Date().toUTCString() + "; path=/";
          window.location.href = "/";
        }}
      />*/}
    </div>
  );
 }
--- a/src/app/me/change-password/ChangePasswordForm.tsx
+++ b/src/app/me/change-password/ChangePasswordForm.tsx
@ -0,0 +1,76 @@
 "use client";
 import changePassword from "@/actions/changePassword";
 import Input from "@/components/Input";
 import PrettyForm from "@/components/PrettyForm";
 import { PasswordUpdateSchema, passwordUpdateSchema } from "@/schemas";
 import { Form, Formik, FormikHelpers } from "formik";
 import { useRouter } from "next/navigation";
 import React from "react";
 import { toFormikValidationSchema } from "zod-formik-adapter";
 export default function ChangePasswordForm({
  onSuccess
 }: {
  onSuccess?: () => void;
 }) {
  const [globalError, setGlobalError] = React.useState<string | null>(null);
  const router = useRouter();
  const initialValues: PasswordUpdateSchema = {
    password: "",
    newPassword: "",
    confirmPassword: ""
  };
  async function handleFormSubmit(
    data: PasswordUpdateSchema,
    helpers: FormikHelpers<PasswordUpdateSchema>
  ) {
    helpers.setSubmitting(true);
    setGlobalError(null);
    const res = await changePassword(data);
    if (!res.ok) {
      setGlobalError(res.error!); // should probably make this more human readable :trolley:
    } else {
      if (onSuccess == null) {
        console.log("changed password :3");
        router.push("/me");
      } else {
        onSuccess();
      }
    }
    helpers.setSubmitting(false);
  }
  return (
    <>
      <PrettyForm globalError={globalError}>
        <Formik
          initialValues={initialValues}
          onSubmit={handleFormSubmit}
          validationSchema={toFormikValidationSchema(passwordUpdateSchema)}
        >
          {({ isSubmitting }) => (
            <Form>
              <Input type="password" name="password" label="Current Password" />
              <Input type="password" name="newPassword" label="New Password" />
              <Input
                type="password"
                name="confirmPassword"
                label="Confirm New Password"
                hint="Re-enter your new password. Better safe than sorry!"
              />
              <button type="submit" disabled={isSubmitting}>
                Change Password
              </button>
            </Form>
          )}
        </Formik>
      </PrettyForm>
    </>
  );
 }
--- a/src/app/me/change-password/page.tsx
+++ b/src/app/me/change-password/page.tsx
@ -0,0 +1,11 @@
 import ChangePasswordForm from "./ChangePasswordForm";
 export default function ChangePassword() {
  return (
    // fuck it im lazy
    <div style={{ maxWidth: "400px", margin: "2rem auto" }}>
      <h1>Change Password</h1>
      <ChangePasswordForm />
    </div>
  );
 }
--- a/src/app/register/RegisterForm.tsx
+++ b/src/app/register/RegisterForm.tsx
@ -2,20 +2,17 @@
 import React from "react";
 import styles from "./RegisterForm.module.css";
-import { Form, Formik, FormikHelpers, yupToFormErrors } from "formik";
+import { Form, Formik, FormikHelpers } from "formik";
-import { RegisterFormValues, registerSchema } from "@/schemas";
+import { registerSchema, RegisterSchema } from "@/schemas";
 import { useRouter } from "next/navigation";
 import { fileAsBase64 } from "@/forms";
 import Input from "@/components/Input";
 import PrettyForm from "@/components/PrettyForm";
 import HugeSubmit from "@/components/HugeSubmit";
 import AvatarChanger from "@/components/AvatarChanger";
 import { ValidAuthProvider } from "@/auth/AuthProvider";
-
+import { toFormikValidationSchema } from "zod-formik-adapter";
-type RegisterResponse = {
+import register from "@/actions/register";
-  ok: boolean;
+import unlink from "@/actions/unlink";
  error?: string;
 };
 export default function RegisterForm({
  initialDisplayName,
@ -31,7 +28,7 @@ export default function RegisterForm({
  const [globalError, setGlobalError] = React.useState<string | null>(null);
  const router = useRouter();
-  const initialValues: RegisterFormValues = {
+  const initialValues: RegisterSchema = {
    username: "",
    displayName: initialDisplayName ?? "",
    email: initialEmail ?? "",
@ -41,49 +38,33 @@ export default function RegisterForm({
  };
  async function handleFormSubmit(
-    { avatar, username, displayName, email, password }: RegisterFormValues,
+    data: RegisterSchema,
-    { setFieldError, setSubmitting }: FormikHelpers<RegisterFormValues>
+    { setFieldError, setSubmitting }: FormikHelpers<RegisterSchema>
  ) {
    setSubmitting(true);
-    const resp = await fetch(`/api/register`, {
+    const res = await register(data);
-      method: "POST",
+    if (res.ok) {
-      headers: {
+      router.replace("/me");
-        "Content-Type": "application/json"
+    } else {
-      },
+      if (res.error !== null) {
-      body: JSON.stringify({
+        switch (res.error) {
-        username,
+          case "avatarBig":
-        displayName,
+            setFieldError(
-        email,
+              "avatar",
-        password,
+              "avatar was too big, but only the server caught you what the fuck are you doing!!"
-        avatar: avatar != null ? avatar.split(",")[1] : undefined
+            );
-      })
+            break;
    });
-    try {
+          case "usernameTaken":
-      const res: RegisterResponse = await resp.json();
+            setFieldError("username", "Username is already taken.");
            break;
-      if (res.ok) {
+          default:
-        router.replace("/me");
+            setGlobalError("Unknown error: " + res.error);
-      } else {
+            break;
        if (res.error !== null) {
          switch (res.error) {
            case "avatarBig":
              setFieldError(
                "avatar",
                "avatar was too big, but only the server caught you what the fuck are you doing!!"
              );
              break;
            case "usernameTaken":
              setFieldError("username", "Username is already taken.");
              break;
          }
        }
      }
    } catch (err) {
      console.error(err);
      setGlobalError("you done fucked up kiddo");
    }
    setSubmitting(false);
@ -94,7 +75,7 @@ export default function RegisterForm({
      <Formik
        initialValues={initialValues}
        onSubmit={handleFormSubmit}
-        validationSchema={registerSchema}
+        validationSchema={toFormikValidationSchema(registerSchema)}
        enableReinitialize
      >
        {({ isSubmitting }) => (
@ -163,7 +144,7 @@ export default function RegisterForm({
            <a
              className={styles.bail}
              onClick={async () => {
-                await fetch("/api/unlink", { method: "POST" });
+                await unlink();
                document.cookie =
                  "ticket=; expires=" + new Date().toUTCString() + "; path=/";
                window.location.href = "/";
--- a/src/auth/AuthProvider.ts
+++ b/src/auth/AuthProvider.ts
@ -2,7 +2,7 @@ export type ValidAuthProvider = "Discord" | "GitHub";
 // Can't send the providers across the wire, do this instead
 export type AuthProviderState = {
-  name: string;
+  name: ValidAuthProvider;
 } & ({ connected: false } | { connected: true; id: string; username: string });
 export abstract class AuthProvider {
--- a/src/components/AvatarChanger.tsx
+++ b/src/components/AvatarChanger.tsx
@ -41,7 +41,7 @@ export default function AvatarChanger({
          alt="Your avatar"
        />
      ) : (
-        <UserIcon />
+        <UserIcon className={styles.currentAvatar} />
      )}
      <button
--- a/src/components/Connection.module.css
+++ b/src/components/Connection.module.css
@ -18,8 +18,7 @@
 }
 .connection > svg {
-  width: 2rem;
+  height: 1.5rem;
  height: 2rem;
  margin-left: auto;
 }
--- a/src/components/Connection.tsx
+++ b/src/components/Connection.tsx
@ -5,6 +5,7 @@ import classnames from "classnames";
 import CheckIcon from "./icons/CheckIcon";
 import { type AuthProviderState } from "@/auth/AuthProvider";
 import { useRouter } from "next/navigation";
 import unlink from "@/actions/unlink";
 export default function Connection({
  service,
@ -23,21 +24,21 @@ export default function Connection({
  const interval = React.useRef<NodeJS.Timeout | null>();
  const execute = async () => {
-    const name = authState?.name.toLowerCase();
+    const name = authState?.name;
    if (!authState?.connected) {
-      router.push(`/oauth/${name}/login`);
+      router.push(`/oauth/${name?.toLowerCase()}/login`);
    } else {
-      await fetch(`/api/unlink?provider=${name}`, { method: "POST" });
+      await unlink(name);
      router.refresh();
    }
  };
-  const mouseDown = (e: React.MouseEvent<HTMLButtonElement>) => {
+  const down = (e: React.MouseEvent | React.TouchEvent) => {
    e.preventDefault();
    interval.current = setTimeout(execute, holdTime);
  };
-  const mouseUp = (e: React.MouseEvent<HTMLButtonElement>) => {
+  const up = (e: React.MouseEvent | React.TouchEvent) => {
    e.preventDefault();
    if (interval.current) clearTimeout(interval.current);
  };
@ -51,8 +52,10 @@ export default function Connection({
        !authState?.connected ? styles.disconnected : styles.progress
      )}
      disabled={unavailable}
-      onMouseDown={mouseDown}
+      onMouseDown={down}
-      onMouseUp={mouseUp}
+      onMouseUp={up}
      onTouchStart={down}
      onTouchEnd={up}
    >
      <div className={styles.iconContainer}>
        {icon ? icon() : <span className={styles.dot}></span>}
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@ -74,7 +74,6 @@ export default function Input<T>(
                  title={props.title}
                  {...inputFields}
                  onChange={(event) => {
                    console.log(event);
                    if (props.customOnChange) {
                      console.log("using custom on change");
                      props.customOnChange(event, form);
--- a/src/components/Logo.module.css
+++ b/src/components/Logo.module.css
@ -1,3 +1,3 @@
 .logo {
-  width: 700px;
+  max-width: 700px;
 }
--- a/src/components/PrettyForm.tsx
+++ b/src/components/PrettyForm.tsx
@ -5,7 +5,7 @@ export default function PrettyForm({
  globalError,
  children
 }: {
-  globalError: string | null;
+  globalError?: string | null;
  children: React.ReactNode;
 }) {
  return (
--- a/src/components/icons/UserIcon.tsx
+++ b/src/components/icons/UserIcon.tsx
@ -1,12 +1,13 @@
 import React from "react";
-export default function UserIcon() {
+export default function UserIcon(props: React.SVGProps<SVGSVGElement>) {
  return (
    <svg
      viewBox="0 0 128 128"
      version="1.1"
      xmlns="http://www.w3.org/2000/svg"
      xmlnsXlink="http://www.w3.org/1999/xlink"
      {...props}
    >
      <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
        <circle fill="currentColor" cx="64" cy="48" r="32"></circle>
--- a/src/schemas.ts
+++ b/src/schemas.ts
@ -1,109 +1,71 @@
-import * as Yup from "yup";
+import { z } from "zod";
-const REQUIRED = "Required.";
+const USERNAME = z
-const USERNAME = Yup.string()
+  .string()
  .required(REQUIRED)
  .min(1, "Username is too short.")
-  .matches(/^[a-z0-9]+$/, "Username must be lowercase letters and numbers.");
+  .regex(/^[a-z0-9]+$/, "Username must be lowercase alphanumeric.");
-
+const DISPLAY_NAME = z.string().min(1, "Display name is too short.");
-const DISPLAY_NAME = Yup.string()
+const EMAIL = z.string().email("Not an email.");
-  .required(REQUIRED)
+const PASSWORD = z
-  .min(1, "Display name is too short.");
+  .string()
 const EMAIL = Yup.string().required(REQUIRED).email("Not an email.");
 const PASSWORD = Yup.string()
  .required(REQUIRED)
  .min(12, "Password must be at least 12 characters long.");
-const CONFIRM_PASSWORD = (name: string) =>
+const AVATAR = z.string().refine(
-  Yup.string()
+  (val) => {
-    .required(REQUIRED)
+    const parts = val.split(",");
-    .oneOf([Yup.ref(name, {})], "Passwords must match.");
+    const data = parts.length === 2 ? parts[1] : parts[0];
 const AVATAR = Yup.string().test(
  "file-size",
  "File is bigger than 2 MB.",
  (value) => {
    if (value == null) return true;
    try {
-      const buf = Buffer.from(value, "base64");
+      const buf = Buffer.from(data, "base64");
      return buf.length <= 2_000_000;
    } catch (e) {
      return false;
    }
  },
  {
    message: "File is bigger than 2 MB.",
    path: ["avatar"]
  }
 );
-export const loginSchema = Yup.object().shape({
+export const loginSchema = z.object({
  username: USERNAME,
  password: PASSWORD
 });
 export type LoginSchema = z.infer<typeof loginSchema>;
-export type LoginFormValues = {
+export const registerSchema = z
-  username: string;
+  .object({
  password: string;
 };
 export const registerSchema: Yup.Schema<RegisterFormValues> =
  Yup.object().shape({
    username: USERNAME,
    displayName: DISPLAY_NAME,
    email: EMAIL,
    password: PASSWORD,
-    confirmPassword: CONFIRM_PASSWORD("password"),
+    confirmPassword: PASSWORD,
-    avatar: AVATAR
+    avatar: AVATAR.optional()
  })
  .refine((data) => data.password === data.confirmPassword, {
    message: "Passwords do not match.",
    path: ["confirmPassword"]
  });
-export interface RegisterFormValues {
+export type RegisterSchema = z.infer<typeof registerSchema>;
  username: string;
  displayName: string;
  email: string;
  password: string;
  confirmPassword: string;
  avatar?: string;
 }
-export const aboutMeSchema: Yup.Schema<AboutMeFormValues> = Yup.object().shape({
+export const aboutMeSchema = z.object({
  username: USERNAME,
  displayName: DISPLAY_NAME,
  email: EMAIL,
-  avatar: AVATAR
+  avatar: AVATAR.optional()
 });
 export type AboutMeSchema = z.infer<typeof aboutMeSchema>;
-export interface AboutMeFormValues {
+export const passwordUpdateSchema = z
-  username: string;
+  .object({
  displayName: string;
  email: string;
  avatar?: string;
 }
 export const passwordUpdateSchema: Yup.Schema<PasswordUpdateFormValues> =
  Yup.object().shape({
    password: PASSWORD,
    newPassword: PASSWORD,
-    confirmPassword: CONFIRM_PASSWORD("newPassword")
+    confirmPassword: PASSWORD
  })
  .refine((data) => data.newPassword === data.confirmPassword, {
    message: "Passwords do not match.",
    path: ["confirmPassword"]
  });
-export interface PasswordUpdateFormValues {
+export type PasswordUpdateSchema = z.infer<typeof passwordUpdateSchema>;
  password: string;
  newPassword: string;
  confirmPassword: string;
 }
 // Types specific to the server, because sometimes we omit fields (like confirmPassword)
 export const registerServerSchema: Yup.Schema<RegisterServerFormValues> =
  Yup.object().shape({
    username: USERNAME,
    displayName: DISPLAY_NAME,
    email: EMAIL,
    password: PASSWORD,
    avatar: AVATAR
  });
 export interface RegisterServerFormValues {
  username: string;
  displayName: string;
  email: string;
  password: string;
  avatar?: string;
 }
Author	SHA1	Message	Date
Julian	940e2621bc	update nix hash	2023-05-10 22:37:38 +00:00
Julian	4ce2931348	add api route for querying user information	2023-05-10 18:29:11 -04:00
Skip R.	33e680a43f	hack together change password page not a modal yet	2023-05-09 19:01:52 -07:00
Skip R.	dac227c937	update packages theres annoying warnings on node 20 that's fixed by doing this	2023-05-09 17:56:36 -07:00
Skip R.	515d874410	(important) shrink checkmark icon to taste looks better imo	2023-05-09 16:21:20 -07:00
Julian	d05961ad15	when that server action hits	2023-05-09 16:26:36 -04:00
Julian	56e11c4d76	fix the logo tooo	2023-05-02 12:16:04 -04:00
Julian	850f4ba9ab	hacky emergency mobile support	2023-05-02 12:14:25 -04:00
		`@ -1 +0,0 @@`
			`{{ template "header.html" . }} {{ template "footer.html" . }}`