Hello, ${username}! You have requested a password reset on ${PUBLIC_SITE_NAME}.
+ +In order to change your password, please click on the following link.
+ +Change your password: ${url}
+ +If you did not request a password change on ${PUBLIC_SITE_NAME}, you can safely ignore this email.
+ ` +}); diff --git a/src/lib/server/email/templates/index.ts b/src/lib/server/email/templates/index.ts new file mode 100644 index 0000000..33f22bd --- /dev/null +++ b/src/lib/server/email/templates/index.ts @@ -0,0 +1,3 @@ +export * from './forgot-password.email'; +export * from './invitation.email'; +export * from './registration.email'; diff --git a/src/lib/server/email/templates/invitation.email.ts b/src/lib/server/email/templates/invitation.email.ts new file mode 100644 index 0000000..a654e3c --- /dev/null +++ b/src/lib/server/email/templates/invitation.email.ts @@ -0,0 +1,23 @@ +import { PUBLIC_SITE_NAME } from '$env/static/public'; +import type { EmailTemplate } from '../template.interface'; + +export const InvitationEmail = (url: string): EmailTemplate => ({ + text: ` +${PUBLIC_SITE_NAME} + +Please click on the following link to create an account on ${PUBLIC_SITE_NAME}. + +Create your account here: ${url} + +This email was sent to you because you have requested an account on ${PUBLIC_SITE_NAME}. If you did not request this, you may safely ignore this email. + `, + html: /* html */ ` +Please click on the following link to create an account on ${PUBLIC_SITE_NAME}.
+ +Create your account here: ${url}
+ +This email was sent to you because you have requested an account on ${PUBLIC_SITE_NAME}. If you did not request this, you may safely ignore this email.
+ ` +}); diff --git a/src/lib/server/email/templates/registration.email.ts b/src/lib/server/email/templates/registration.email.ts new file mode 100644 index 0000000..82f6f97 --- /dev/null +++ b/src/lib/server/email/templates/registration.email.ts @@ -0,0 +1,27 @@ +import { PUBLIC_SITE_NAME } from '$env/static/public'; +import type { EmailTemplate } from '../template.interface'; + +export const RegistrationEmail = (username: string, url: string): EmailTemplate => ({ + text: ` +${PUBLIC_SITE_NAME} + +Welcome to ${PUBLIC_SITE_NAME}, ${username}! + +In order to proceed with logging in, please click on the following link to activate your account. + +Activate your account: ${url} + +This email was sent to you because you have created an account on ${PUBLIC_SITE_NAME}. If you did not create an account, you may contact us or just let the account expire. + `, + html: /* html */ ` +Welcome to ${PUBLIC_SITE_NAME}, ${username}!
+ +In order to proceed with logging in, please click on the following link to activate your account.
+ +Activate your account: ${url}
+ +This email was sent to you because you have created an account on ${PUBLIC_SITE_NAME}. If you did not create an account, you may contact us or just let the account expire.
+ ` +}); diff --git a/src/lib/server/oauth2/model/client.ts b/src/lib/server/oauth2/model/client.ts index c885e47..4d91523 100644 --- a/src/lib/server/oauth2/model/client.ts +++ b/src/lib/server/oauth2/model/client.ts @@ -124,7 +124,7 @@ export class OAuth2Clients { }); if (scope.includes('management')) { - allowedScopes.push('management', 'admin'); + allowedScopes.push('management'); } // TODO: client picture diff --git a/src/lib/server/users/index.ts b/src/lib/server/users/index.ts index c13c885..fd4c330 100644 --- a/src/lib/server/users/index.ts +++ b/src/lib/server/users/index.ts @@ -1,8 +1,13 @@ import bcrypt from 'bcryptjs'; -import { and, eq, or } from 'drizzle-orm'; -import { db, user, type User } from '../drizzle'; +import { and, eq, gt, or, sql } from 'drizzle-orm'; +import { db, user, userToken, type User } from '../drizzle'; import type { UserSession } from './types'; import { redirect } from '@sveltejs/kit'; +import { CryptoUtils } from '../crypto-utils'; +import { EMAIL_ENABLED } from '$env/static/private'; +import { Emails, ForgotPasswordEmail, InvitationEmail, RegistrationEmail } from '../email'; +import { PUBLIC_SITE_NAME, PUBLIC_URL } from '$env/static/public'; +import { UserTokens } from './tokens'; export class Users { static async getById(id: number): Promise{$t('common.description')}
+{$t('common.description', { siteName: PUBLIC_SITE_NAME })}
{@html $t('common.cookieDisclaimer')}
{$t('common.siteName')}
+ {PUBLIC_SITE_NAME}
{$t('oauth2.authorize.title')}
diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts
new file mode 100644
index 0000000..54b7bc2
--- /dev/null
+++ b/src/routes/register/+page.server.ts
@@ -0,0 +1,107 @@
+import { REGISTRATIONS } from '$env/static/private';
+import { Changesets } from '$lib/server/changesets.js';
+import { Users } from '$lib/server/users/index.js';
+import { emailRegex, passwordRegex, usernameRegex } from '$lib/validators.js';
+import { fail, redirect } from '@sveltejs/kit';
+
+interface RegisterData {
+ username: string;
+ displayName: string;
+ email: string;
+ password: string;
+}
+
+const fields: (keyof RegisterData)[] = ['username', 'displayName', 'email', 'password'];
+
+export const actions = {
+ default: async ({ request, locals }) => {
+ // Logged in users cannot make more accounts
+ if (locals.session.data?.user || REGISTRATIONS === 'false') {
+ return redirect(303, '/');
+ }
+
+ const body = await request.formData();
+ const changes = Changesets.take(fields, body);
+ const { username, displayName, email, password } = changes;
+ // Each field must be present
+ if (!username || !displayName || !email || !password) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['required'],
+ fields: fields.reduce(
+ (missing, field) => (!changes[field] ? [...missing, field] : missing),
+ []
+ )
+ });
+ }
+
+ if (!usernameRegex.test(username)) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['invalidUsername'],
+ fields: ['username']
+ });
+ }
+
+ if (displayName.length < 3 || displayName.length > 32) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['invalidDisplayName'],
+ fields: ['displayName']
+ });
+ }
+
+ if (!emailRegex.test(email)) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['invalidEmail'],
+ fields: ['email']
+ });
+ }
+
+ if (!passwordRegex.test(password)) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['invalidPassword'],
+ fields: ['password']
+ });
+ }
+
+ if (!(await Users.checkRegistration(username, email))) {
+ return fail(400, {
+ username,
+ displayName,
+ email,
+ errors: ['existingRegistration'],
+ fields: ['username', 'email']
+ });
+ }
+
+ // TODO: check for registration token
+ const newUser = await Users.register({ username, displayName, password, email });
+
+ return {
+ success: newUser.activated ? 'userCreated' : 'emailSent'
+ };
+ }
+};
+
+export const load = ({ locals }) => {
+ if (locals.session.data?.user) {
+ return redirect(301, '/');
+ }
+
+ return {
+ enabled: REGISTRATIONS === 'true'
+ };
+};
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
new file mode 100644
index 0000000..4230a9b
--- /dev/null
+++ b/src/routes/register/+page.svelte
@@ -0,0 +1,134 @@
+
+
+
+ {$t('account.register.title')} - {PUBLIC_SITE_NAME}
+
+
+
+ {PUBLIC_SITE_NAME}
+ {$t('account.register.title')}
+
+
+ {#if !data.enabled}
+ {$t('account.register.disabled')}
+ {:else if form?.success}
+ {$t(`account.register.${form.success}`)}
+ {:else}
+
+ {/if}
+
+
+