-
Online Services
-
- {#if data?.token && data?.user && data.user.username}
-
Username: {data.user.username}
-
Token: {base64Token}
-
- {:else}
-
- It appears you don't have an account; please register one to access suyu's online
- services.
-
-
-
-
-
- {/if}
-
-
Rooms
-
- {#if data.rooms.length > 0}
- {#each data.rooms as room}
-
- {/each}
- {:else}
-
No rooms are currently being hosted.
- {/if}
-
+
+ a
-
-
diff --git a/src/routes/api/user/+server.ts b/src/routes/api/user/+server.ts
index d0b4b64..1dcc58e 100644
--- a/src/routes/api/user/+server.ts
+++ b/src/routes/api/user/+server.ts
@@ -12,6 +12,10 @@ import type {
} from "$types/api";
import crypto from "crypto";
import { promisify } from "util";
+import { verify } from "hcaptcha";
+import { PUBLIC_SITE_KEY } from "$env/static/public";
+import { HCAPTCHA_KEY } from "$env/static/private";
+import validator from "validator";
const randomBytes = promisify(crypto.randomBytes);
@@ -27,24 +31,42 @@ async function genKey(username: string) {
return apiKey;
}
-export async function POST({ request }) {
+export async function POST({ request, getClientAddress }) {
const body: CreateAccountRequest = await request.json();
- if (!body.username) {
+ if (!body.username || !body.email || !body.captchaToken) {
return json
({
success: false,
- error: "username is required",
+ error: "missing fields",
+ });
+ }
+ if (!validator.isEmail(body.email)) {
+ return json({
+ success: false,
+ error: "invalid email",
+ });
+ }
+ const res = await verify(HCAPTCHA_KEY, body.captchaToken, getClientAddress(), PUBLIC_SITE_KEY);
+ if (!res.success) {
+ return json({
+ success: false,
+ error: "missing fields!",
});
}
// check if user exists
const user = await userRepo.findOne({
- where: {
- username: body.username,
- },
+ where: [
+ {
+ username: body.username,
+ },
+ {
+ email: body.email,
+ },
+ ],
});
if (user) {
return json({
success: false,
- error: "username already exists",
+ error: "user already exists",
});
}
// the api key can only be 80 characters total, including the username and colon
@@ -55,6 +77,7 @@ export async function POST({ request }) {
displayName: body.username,
roles: serializeRoles(["user"]),
apiKey: key,
+ email: body.email,
});
await userRepo.save(createdUser);
return json({
diff --git a/src/routes/signup/+page.server.ts b/src/routes/signup/+page.server.ts
new file mode 100644
index 0000000..2dc64e8
--- /dev/null
+++ b/src/routes/signup/+page.server.ts
@@ -0,0 +1,13 @@
+import { RoomManager } from "$lib/server/class/Room.js";
+import { useAuth } from "$lib/util/api";
+
+export async function load(opts) {
+ const apiKey = opts.cookies.get("token");
+ const user = await useAuth(apiKey || "unused");
+ const rooms = RoomManager.getRooms().map((r) => r.toJSON());
+ return {
+ user: { ...user },
+ rooms,
+ token: apiKey,
+ };
+}
diff --git a/src/routes/signup/+page.svelte b/src/routes/signup/+page.svelte
new file mode 100644
index 0000000..bc5e8f5
--- /dev/null
+++ b/src/routes/signup/+page.svelte
@@ -0,0 +1,64 @@
+
+
+
+
+
Sign up
+
+
+ suyu believes in user privacy; as such, usernames are distributed on a first-come,
+ first-serve basis, with no password required. Accounts are used for:
+
+
+ - Creating rooms
+ - Adding friends
+
+
+ Lost your account? Contact us.
+
+
+
+
+
+
+
+