Compare commits

..

No commits in common. "main" and "nix" have entirely different histories.
main ... nix

30 changed files with 1468 additions and 1995 deletions

1
environment.d.ts vendored
View file

@ -27,7 +27,6 @@ declare global {
GITHUB_ORG: string;
BASE_DOMAIN: string;
API_TOKEN?: string;
}
}
}

View file

@ -29,7 +29,7 @@
pname = "gluestick";
version = "0.1.0";
src = ./.;
npmDepsHash = "sha256-JPsXIPyiGycT/4dcg78qAz+qqIRYpSR24NWeu+5jLk0=";
npmDepsHash = "sha256-keOreamXKunlJzU2AKJo0J02ZxQrjLdoCIMCaiwEU4Y=";
nativeBuildInputs = inputs;
buildInputs = inputs;
@ -148,11 +148,6 @@
export PORT=${toString cfg.port}
export NODE_ENV=production
export DATABASE_URL="file:${cfg.databaseFile}"
set -a
source ${cfg.envFile}
set +a
${pkg}/bin/gluestick
'';
@ -161,6 +156,7 @@
Group = cfg.group;
Restart = "always";
WorkingDirectory = "/var/lib/gluestick";
EnvironmentFile = cfg.envFile;
};
};

2538
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -25,15 +25,14 @@
"formik": "^2.2.9",
"graphql": "^16.6.0",
"ldapts": "^4.2.5",
"next": "^13.4.2-canary.4",
"next": "13.3.1",
"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",
"zod": "^3.21.4",
"zod-formik-adapter": "^1.2.0"
"yup": "^1.1.1"
},
"devDependencies": {
"@graphql-codegen/cli": "^3.3.1",

View file

@ -1,29 +0,0 @@
"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 };
}

View file

@ -1,4 +0,0 @@
export type ActionResponse = {
ok: boolean;
error?: string;
};

View file

@ -1,26 +0,0 @@
"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 };
}

View file

@ -0,0 +1,29 @@
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 }));
}

View file

@ -1,47 +1,38 @@
"use server";
import * as ldap from "@/ldap";
import prisma from "@/prisma";
import { getUser } from "@/auth/auth";
import { getLogger } from "@/logger";
import { RegisterSchema, registerSchema } from "@/schemas";
import { ActionResponse } from ".";
import { registerServerSchema } from "@/schemas";
const logger = getLogger("/actions/register");
const logger = getLogger("/api/register");
export default async function register(
data: RegisterSchema
): Promise<ActionResponse> {
export async function POST(request: Request) {
const user = await getUser();
if (user == null) return new Response(null, { status: 401 });
if (user == null) {
return { ok: false, error: "invalidAuth" };
}
// user already has an account, don't re-register
if (user.username != null) {
logger.info(
{ username: user.username, id: user.id },
`user tried to register twice`
);
return { ok: false, error: "invalidAuth" };
return new Response(null, { status: 403 });
}
const { username, displayName, email, password, avatar } =
await registerSchema.parse(data);
let avatarBuf = null;
if (avatar != null) {
const parts = avatar.split(",");
const data = parts.length === 2 ? parts[1] : parts[0];
avatarBuf = Buffer.from(data, "base64");
}
await registerServerSchema.validate(await request.json());
let avatarBuf = avatar != null ? Buffer.from(avatar, "base64") : null;
const users = await ldap.getUsers();
for (const user of users) {
if (user.id.toLowerCase() === username.toLowerCase()) {
return {
ok: false,
error: "usernameTaken"
};
return new Response(
JSON.stringify({
ok: false,
error: "usernameTaken"
}),
{ status: 400 }
);
}
}
@ -58,5 +49,10 @@ export default async function register(
});
logger.info(outputUser, "registered user");
return { ok: true };
return new Response(
JSON.stringify({
ok: true
}),
{ status: 201 }
);
}

View file

@ -1,6 +1,3 @@
"use server";
import { ValidAuthProvider } from "@/auth/AuthProvider";
import {
AuthState,
getAuthState,
@ -38,7 +35,8 @@ 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) {
@ -51,22 +49,30 @@ export default async function unlink(provider?: ValidAuthProvider) {
await deleteUser(registeringUser.id);
return;
return new Response(null, { status: 200 });
}
const user = await getUser();
if (user == null) return;
if (user == null) return new Response(null, { status: 401 });
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;
if (discord == null) return new Response(null, { status: 400 });
await unlinkDiscord(await discord.getId());
break;
case "GitHub":
case "github":
const github = await user.getGitHub();
if (github == null) return;
if (github == null) return new Response(null, { status: 400 });
await unlinkGitHub(await github.getId());
break;
default:
return new Response(null, { status: 400 });
}
return new Response(null, { status: 200 });
}

View file

@ -1,28 +1,30 @@
"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";
const logger = getLogger("/actions/update");
type RequestBody = {
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 { ok: false, error: "invalidAuth" };
}
if (user == null) return new Response(null, { status: 401 });
const userInfo = await getUserInfo(user);
if (userInfo == null) {
// no user info = hasn't registered yet
return { ok: false, error: "invalidAuth" };
return new Response(null, { status: 409 });
}
const { displayName, email, avatar } = await aboutMeSchema.parse(data);
const {
displayName,
email,
avatar: avatarBase64
} = (await request.json()) as RequestBody;
let changeDisplayName = false;
if (
@ -45,24 +47,25 @@ export default async function update(
let avatarBuf = undefined;
if (
avatar !== undefined &&
typeof avatar === "string" &&
avatar !== userInfo.avatar
avatarBase64 !== undefined &&
typeof avatarBase64 === "string" &&
avatarBase64 !== userInfo.avatar
) {
const parts = avatar.split(",");
const data = parts.length === 2 ? parts[1] : parts[0];
avatarBuf = Buffer.from(data, "base64");
avatarBuf = Buffer.from(avatarBase64, "base64");
if (avatarBuf.length > 2_000_000) {
return {
ok: false,
error: "avatarBig"
};
return new Response(
JSON.stringify({
ok: false,
error: "avatarBig"
}),
{ status: 400 }
);
}
}
if (!changeDisplayName && !changeEmail && !avatarBuf) {
return { ok: true };
return new Response(null, { status: 200 });
}
await updateUser(
@ -82,5 +85,12 @@ export default async function update(
"updated user"
);
return { ok: true };
return new Response(
JSON.stringify({
ok: true
}),
{
status: 200
}
);
}

View file

@ -1,41 +0,0 @@
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
})
);
}

View file

@ -48,16 +48,6 @@
:root {
--theme-transition: 0.5s ease;
/* Defined here for Firefox, which doesn't support @property */
--bg: #2d2a2e;
--bg-dark: #403e41;
--bg-darker: #221f22;
--fg: #fcfcfa;
--fg-dark: #727072;
--fg-darker: #5b595c;
--error: #ff6188;
--warning: #ffd866;
}
* {

View file

@ -1,34 +1,54 @@
"use client";
import login from "@/actions/login";
import Input from "@/components/Input";
import PrettyForm from "@/components/PrettyForm";
import { LoginSchema, loginSchema } from "@/schemas";
import { LoginFormValues, 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(
data: LoginSchema,
{ setSubmitting }: FormikHelpers<LoginSchema>
{ username, password }: LoginFormValues,
{ setSubmitting }: FormikHelpers<LoginFormValues>
) {
setSubmitting(true);
if (data.username === "greets") {
if (username === "greets") {
window.location.href = "/sekrit";
return;
}
const res = await login(data);
if (res.ok) {
document.cookie = `ticket=${res.ticket}; path=/;`;
window.location.href = "/me";
} else {
// only error is invalidCredentials, I am lazy
setGlobalError("Invalid credentials.");
const req = await fetch("/api/login", {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
username,
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);
}
}
@ -37,7 +57,7 @@ export default function LoginForm() {
<Formik
initialValues={{ username: "", password: "" }}
onSubmit={handleFormSubmit}
validationSchema={toFormikValidationSchema(loginSchema)}
validationSchema={loginSchema}
>
{({ isSubmitting }) => (
<Form>

View file

@ -7,7 +7,6 @@
display: grid;
grid-template-columns: 300px 1fr;
column-gap: 2rem;
max-width: 100vw;
}
.profileTower *:first-child {
@ -59,6 +58,29 @@
height: 100%;
}
/* the !importants here piss me off but it wouldn't accept the property otherwise */
.progress {
background: linear-gradient(
to right,
var(--fg-darker) 50%,
var(--bg-dark) 50%
) !important;
background-size: 200% 100% !important;
background-position: right bottom !important;
transition: all 0s linear !important;
border: 0;
border-radius: 0.15rem;
cursor: pointer;
padding: 0.5em 1em;
}
/* when clicked */
.progress:active {
transition: all 3s linear !important;
background-position: left bottom !important;
}
.multiButtons {
margin: 1rem 0;
white-space: nowrap;
@ -72,19 +94,3 @@
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;
}
}

View file

@ -5,8 +5,14 @@ import { UserInfo } from "@/ldap";
import React from "react";
import styles from "./AboutMe.module.css";
import AvatarChanger from "@/components/AvatarChanger";
import Input, { Hint, Label } from "@/components/Input";
import Input, { 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";
@ -15,10 +21,11 @@ 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";
import update from "@/actions/update";
import { toFormikValidationSchema } from "zod-formik-adapter";
import { useRouter } from "next/navigation";
type UpdateResponse = {
ok: boolean;
error?: string;
};
export default function AboutMe({
info,
@ -31,9 +38,8 @@ 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: AboutMeSchema = {
const initialValues: AboutMeFormValues = {
username: info.username,
displayName: info.displayName,
email: info.email,
@ -41,20 +47,77 @@ export default function AboutMe({
};
async function handleFormSubmit(
data: AboutMeSchema,
{ setSubmitting }: FormikHelpers<AboutMeSchema>
{ displayName, email, avatar }: AboutMeFormValues,
{ setSubmitting }: FormikHelpers<AboutMeFormValues>
) {
setMadeChanges(false);
setSubmitting(true);
const res = await update(data);
const req = await fetch("/api/update", {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
displayName,
email,
avatar: avatar != null ? avatar.split(",")[1] : null
})
});
setSubmitting(false);
if (res.ok) {
setMadeChanges(true);
} else {
if (res.error != undefined) {
setGlobalError("Unknown error: " + res.error);
try {
const res: UpdateResponse = await req.json();
if (!res.ok && res.error !== null) {
switch (res.error) {
case "avatarBig":
break;
}
}
setMadeChanges(true);
} catch {
console.error(req);
}
}
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);
}
}
@ -64,7 +127,7 @@ export default function AboutMe({
<Formik
initialValues={initialValues}
onSubmit={handleFormSubmit}
validationSchema={toFormikValidationSchema(aboutMeSchema)}
validationSchema={aboutMeSchema}
>
{({ isSubmitting }) => (
<Form className={styles.profileGrid}>
@ -87,7 +150,7 @@ export default function AboutMe({
<div>
<h2 className={styles.userName}>{info.username}</h2>
<div className={styles.rightGrid}>
<div className={styles.profile}>
<div>
{madeProfileChanges ? (
<Toast>Saved your changes.</Toast>
) : null}
@ -122,14 +185,7 @@ export default function AboutMe({
/>
<div className={styles.multiButtons}>
<button
type="button"
onClick={() => {
router.push("/me/change-password");
}}
>
Change password
</button>
<button type="button">Change Password</button>
<button
type="button"
@ -148,8 +204,6 @@ export default function AboutMe({
<div className={styles.connections}>
<Label>Connections</Label>
<Hint>Click to link, hold to unlink.</Hint>
<Connection
service="Discord"
authState={discordState}
@ -177,6 +231,69 @@ 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>
);
}

View file

@ -1,76 +0,0 @@
"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>
</>
);
}

View file

@ -1,11 +0,0 @@
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>
);
}

View file

@ -1,8 +1,6 @@
import { DiscordAuthProvider } from "@/auth/discord";
import { v4 } from "uuid";
export const dynamic = "force-dynamic";
export async function GET(request: Request) {
let url = `https://discord.com/oauth2/authorize`;
let state = v4();

View file

@ -1,8 +1,6 @@
import { GitHubAuthProvider } from "@/auth/github";
import { v4 } from "uuid";
export const dynamic = "force-dynamic";
export async function GET(request: Request) {
let url = `https://github.com/login/oauth/authorize`;
let state = v4();

View file

@ -2,17 +2,20 @@
import React from "react";
import styles from "./RegisterForm.module.css";
import { Form, Formik, FormikHelpers } from "formik";
import { registerSchema, RegisterSchema } from "@/schemas";
import { Form, Formik, FormikHelpers, yupToFormErrors } from "formik";
import { RegisterFormValues, 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";
import register from "@/actions/register";
import unlink from "@/actions/unlink";
type RegisterResponse = {
ok: boolean;
error?: string;
};
export default function RegisterForm({
initialDisplayName,
@ -28,7 +31,7 @@ export default function RegisterForm({
const [globalError, setGlobalError] = React.useState<string | null>(null);
const router = useRouter();
const initialValues: RegisterSchema = {
const initialValues: RegisterFormValues = {
username: "",
displayName: initialDisplayName ?? "",
email: initialEmail ?? "",
@ -38,33 +41,49 @@ export default function RegisterForm({
};
async function handleFormSubmit(
data: RegisterSchema,
{ setFieldError, setSubmitting }: FormikHelpers<RegisterSchema>
{ avatar, username, displayName, email, password }: RegisterFormValues,
{ setFieldError, setSubmitting }: FormikHelpers<RegisterFormValues>
) {
setSubmitting(true);
const res = await register(data);
if (res.ok) {
router.replace("/me");
} else {
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;
const resp = await fetch(`/api/register`, {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify({
username,
displayName,
email,
password,
avatar: avatar != null ? avatar.split(",")[1] : undefined
})
});
case "usernameTaken":
setFieldError("username", "Username is already taken.");
break;
try {
const res: RegisterResponse = await resp.json();
default:
setGlobalError("Unknown error: " + res.error);
break;
if (res.ok) {
router.replace("/me");
} else {
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);
@ -75,7 +94,7 @@ export default function RegisterForm({
<Formik
initialValues={initialValues}
onSubmit={handleFormSubmit}
validationSchema={toFormikValidationSchema(registerSchema)}
validationSchema={registerSchema}
enableReinitialize
>
{({ isSubmitting }) => (
@ -144,7 +163,7 @@ export default function RegisterForm({
<a
className={styles.bail}
onClick={async () => {
await unlink();
await fetch("/api/unlink", { method: "POST" });
document.cookie =
"ticket=; expires=" + new Date().toUTCString() + "; path=/";
window.location.href = "/";

View file

@ -2,7 +2,7 @@ export type ValidAuthProvider = "Discord" | "GitHub";
// Can't send the providers across the wire, do this instead
export type AuthProviderState = {
name: ValidAuthProvider;
name: string;
} & ({ connected: false } | { connected: true; id: string; username: string });
export abstract class AuthProvider {

View file

@ -41,7 +41,7 @@ export default function AvatarChanger({
alt="Your avatar"
/>
) : (
<UserIcon className={styles.currentAvatar} />
<UserIcon />
)}
<button

View file

@ -11,17 +11,12 @@
text-align: left;
}
.connection .iconContainer > svg {
.connection svg {
width: 3rem;
height: 3rem;
margin-left: auto;
}
.connection > svg {
height: 1.5rem;
margin-left: auto;
}
.connection .dot {
width: 1rem;
height: 1rem;
@ -60,21 +55,3 @@
opacity: 0.5;
cursor: not-allowed;
}
/* the !importants here piss me off but it wouldn't accept the property otherwise */
.progress {
background: linear-gradient(
to right,
var(--fg-darker) 50%,
var(--bg-dark) 50%
) !important;
background-size: 200% 100% !important;
background-position: right bottom !important;
transition: all 0s linear !important;
}
/* when clicked */
.progress:active {
transition: all 3s linear !important;
background-position: left bottom !important;
}

View file

@ -5,7 +5,6 @@ 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,
@ -19,43 +18,39 @@ export default function Connection({
icon?: () => JSX.Element;
}) {
const router = useRouter();
const [changing, setChanging] = React.useState(false);
const holdTime = authState?.connected ? 3000 : 0;
const interval = React.useRef<NodeJS.Timeout | null>();
// TODO: Reimplement hold-to-unlink.
const execute = async () => {
const name = authState?.name;
if (!authState?.connected) {
router.push(`/oauth/${name?.toLowerCase()}/login`);
async function handleClick(event: React.MouseEvent<HTMLButtonElement>) {
event.preventDefault();
if (unavailable) return;
const provider = service.toLowerCase();
if (authState?.connected === false) {
setChanging(true);
router.push(`/oauth/${provider}/login`);
} else {
await unlink(name);
router.refresh();
setChanging(true);
if (confirm(`Unlink your ${service} account?`)) {
await fetch(`/api/unlink?provider=${provider}`, { method: "POST" });
window.location.reload();
} else {
setChanging(false);
}
}
};
const down = (e: React.MouseEvent | React.TouchEvent) => {
e.preventDefault();
interval.current = setTimeout(execute, holdTime);
};
const up = (e: React.MouseEvent | React.TouchEvent) => {
e.preventDefault();
if (interval.current) clearTimeout(interval.current);
};
}
return (
<button
type="button"
className={classnames(
styles.connection,
unavailable ? styles.unavailable : null,
!authState?.connected ? styles.disconnected : styles.progress
!authState?.connected ? styles.disconnected : null
)}
disabled={unavailable}
onMouseDown={down}
onMouseUp={up}
onTouchStart={down}
onTouchEnd={up}
onClick={handleClick}
disabled={changing}
>
<div className={styles.iconContainer}>
{icon ? icon() : <span className={styles.dot}></span>}

View file

@ -23,17 +23,6 @@ export function Label({
);
}
export function Hint({
children,
...props
}: LabelHTMLAttributes<HTMLLabelElement>) {
return (
<label className={classnames(styles.hint, props.className)} {...props}>
{children}
</label>
);
}
export default function Input<T>(
props: CustomInputProps<T> &
FieldAttributes<{ hint?: string; label?: string; disabled?: boolean }>
@ -74,6 +63,7 @@ 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);

View file

@ -1,3 +1,3 @@
.logo {
max-width: 700px;
width: 700px;
}

View file

@ -5,7 +5,7 @@ export default function PrettyForm({
globalError,
children
}: {
globalError?: string | null;
globalError: string | null;
children: React.ReactNode;
}) {
return (

View file

@ -1,13 +1,12 @@
import React from "react";
export default function UserIcon(props: React.SVGProps<SVGSVGElement>) {
export default function UserIcon() {
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>

View file

@ -1,71 +1,107 @@
import { z } from "zod";
import * as Yup from "yup";
const USERNAME = z
.string()
.min(1, "Username is too short.")
.regex(/^[a-z0-9]+$/, "Username must be lowercase alphanumeric.");
const DISPLAY_NAME = z.string().min(1, "Display name is too short.");
const EMAIL = z.string().email("Not an email.");
const PASSWORD = z
.string()
const REQUIRED = "Required.";
const USERNAME = Yup.string()
.required(REQUIRED)
.min(1, "Username is too short.");
const DISPLAY_NAME = Yup.string()
.required(REQUIRED)
.min(1, "Display name is too short.");
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 AVATAR = z.string().refine(
(val) => {
const parts = val.split(",");
const data = parts.length === 2 ? parts[1] : parts[0];
const CONFIRM_PASSWORD = (name: string) =>
Yup.string()
.required(REQUIRED)
.oneOf([Yup.ref(name, {})], "Passwords must match.");
const AVATAR = Yup.string().test(
"file-size",
"File is bigger than 2 MB.",
(value) => {
if (value == null) return true;
try {
const buf = Buffer.from(data, "base64");
const buf = Buffer.from(value, "base64");
return buf.length <= 2_000_000;
} catch (e) {
return false;
}
},
{
message: "File is bigger than 2 MB.",
path: ["avatar"]
}
);
export const loginSchema = z.object({
export const loginSchema = Yup.object().shape({
username: USERNAME,
password: PASSWORD
});
export type LoginSchema = z.infer<typeof loginSchema>;
export const registerSchema = z
.object({
export type LoginFormValues = {
username: string;
password: string;
};
export const registerSchema: Yup.Schema<RegisterFormValues> =
Yup.object().shape({
username: USERNAME,
displayName: DISPLAY_NAME,
email: EMAIL,
password: PASSWORD,
confirmPassword: PASSWORD,
avatar: AVATAR.optional()
})
.refine((data) => data.password === data.confirmPassword, {
message: "Passwords do not match.",
path: ["confirmPassword"]
confirmPassword: CONFIRM_PASSWORD("password"),
avatar: AVATAR
});
export type RegisterSchema = z.infer<typeof registerSchema>;
export interface RegisterFormValues {
username: string;
displayName: string;
email: string;
password: string;
confirmPassword: string;
avatar?: string;
}
export const aboutMeSchema = z.object({
export const aboutMeSchema: Yup.Schema<AboutMeFormValues> = Yup.object().shape({
username: USERNAME,
displayName: DISPLAY_NAME,
email: EMAIL,
avatar: AVATAR.optional()
avatar: AVATAR
});
export type AboutMeSchema = z.infer<typeof aboutMeSchema>;
export const passwordUpdateSchema = z
.object({
export interface AboutMeFormValues {
username: string;
displayName: string;
email: string;
avatar?: string;
}
export const passwordUpdateSchema: Yup.Schema<PasswordUpdateFormValues> =
Yup.object().shape({
password: PASSWORD,
newPassword: PASSWORD,
confirmPassword: PASSWORD
})
.refine((data) => data.newPassword === data.confirmPassword, {
message: "Passwords do not match.",
path: ["confirmPassword"]
confirmPassword: CONFIRM_PASSWORD("newPassword")
});
export type PasswordUpdateSchema = z.infer<typeof passwordUpdateSchema>;
export interface PasswordUpdateFormValues {
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;
}