- {@render children?.()}
-
diff --git a/src/routes/(unauthenticated)/(auth)/login/LoginScreen.svelte b/src/routes/(unauthenticated)/(auth)/login/LoginScreen.svelte
index b7ff04b647..e050a95720 100644
--- a/src/routes/(unauthenticated)/(auth)/login/LoginScreen.svelte
+++ b/src/routes/(unauthenticated)/(auth)/login/LoginScreen.svelte
@@ -4,6 +4,7 @@
import { browser } from '$app/environment';
import ScriptoriaIcon from '$lib/icons/ScriptoriaIcon.svelte';
import * as m from '$lib/paraglide/messages';
+ import { localizeHref } from '$lib/paraglide/runtime';
let timeout: ReturnType
{@render children?.()}
diff --git a/src/routes/(unauthenticated)/docs/[filename]/+server.ts b/src/routes/(unauthenticated)/docs/[filename]/+server.ts
index 25aaa74db7..8953b234be 100644
--- a/src/routes/(unauthenticated)/docs/[filename]/+server.ts
+++ b/src/routes/(unauthenticated)/docs/[filename]/+server.ts
@@ -2,6 +2,9 @@ import { error } from '@sveltejs/kit';
import { readFile } from 'fs/promises';
import { join } from 'path';
import type { RequestEvent } from './$types';
+import OTEL from '$lib/otel';
+import { stringifyError } from '$lib/utils';
+import { logLocalDev } from '$lib/utils/server';
export async function GET({ params, locals }: RequestEvent) {
locals.security.requireNothing();
@@ -32,7 +35,8 @@ export async function GET({ params, locals }: RequestEvent) {
}
});
} catch (err) {
- console.error('Error reading PDF:', err);
+ OTEL.instance.logger.error(stringifyError(err));
+ logLocalDev?.('Error reading PDF:', err);
throw error(404, 'PDF not found');
}
}
diff --git a/src/routes/(unauthenticated)/our-users/+page.server.ts b/src/routes/(unauthenticated)/our-users/+page.server.ts
new file mode 100644
index 0000000000..2533dd5ac0
--- /dev/null
+++ b/src/routes/(unauthenticated)/our-users/+page.server.ts
@@ -0,0 +1,16 @@
+import type { PageServerLoad } from './$types';
+import { DatabaseReads } from '$lib/server/database';
+
+export const load = (async (event) => {
+ event.locals.security.requireNothing();
+ return {
+ organizations: await DatabaseReads.organizations.findMany({
+ where: { VisibleToPublic: true },
+ select: {
+ Name: true,
+ LogoUrl: true,
+ ContactEmail: true
+ }
+ })
+ };
+}) satisfies PageServerLoad;
diff --git a/src/routes/(unauthenticated)/our-users/+page.svelte b/src/routes/(unauthenticated)/our-users/+page.svelte
new file mode 100644
index 0000000000..29bfa0adbb
--- /dev/null
+++ b/src/routes/(unauthenticated)/our-users/+page.svelte
@@ -0,0 +1,51 @@
+
+
+{m.invitations_ourUsers()}
+
+
+
+
+
diff --git a/src/routes/(unauthenticated)/request-access-for-organization/+page.server.ts b/src/routes/(unauthenticated)/request-access-for-organization/+page.server.ts
index 25b8b1a557..219a2c9f99 100644
--- a/src/routes/(unauthenticated)/request-access-for-organization/+page.server.ts
+++ b/src/routes/(unauthenticated)/request-access-for-organization/+page.server.ts
@@ -1,26 +1,91 @@
+import { trace } from '@opentelemetry/api';
+import { error, redirect } from '@sveltejs/kit';
+import { randomInt, randomUUID } from 'node:crypto';
import { fail, superValidate } from 'sveltekit-superforms';
import { valibot } from 'sveltekit-superforms/adapters';
import * as v from 'valibot';
-import type { Actions } from './$types';
-import { BullMQ, getQueues } from '$lib/server/bullmq';
+import type { Actions, PageServerLoad } from './$types';
+import { env } from '$env/dynamic/private';
+import { m as gp } from '$lib/google-play/paraglide/messages';
+import { type Locale, localizeHref } from '$lib/paraglide/runtime';
+import { getAuthConnection } from '$lib/server/bullmq/queues';
+import { DatabaseReads } from '$lib/server/database';
+import { sendEmail } from '$lib/server/email-service/EmailClient';
+import { resolveToken, verifyToken } from '$lib/turnstile/server';
-const requestSchema = v.object({
- organizationName: v.pipe(v.string(), v.nonEmpty()),
- email: v.pipe(v.string(), v.nonEmpty(), v.email()),
- url: v.pipe(v.string(), v.nonEmpty())
+const tracer = trace.getTracer('OrgInviteRequest');
+
+const requestSchema = v.objectAsync({
+ organizationName: v.pipe(v.string(), v.trim(), v.nonEmpty()),
+ email: v.pipe(v.string(), v.trim(), v.nonEmpty(), v.email()),
+ url: v.pipeAsync(v.string(), v.trim(), v.nonEmpty(), v.url()),
+ turnstileToken: v.pipe(v.string(), v.trim(), v.nonEmpty())
});
+export const load = (async ({ locals }) => {
+ locals.security.requireNothing();
+ return tracer.startActiveSpan('Org Invite - Load Request Page', async (span) => {
+ try {
+ return {
+ publicOrgExists: !!(await DatabaseReads.organizations.findFirst({
+ where: { VisibleToPublic: true },
+ select: {
+ Id: true
+ }
+ })),
+ form: await superValidate(valibot(requestSchema))
+ };
+ } finally {
+ span.end();
+ }
+ });
+}) satisfies PageServerLoad;
+
export const actions = {
- async request(event) {
- event.locals.security.requireNothing();
- const form = await superValidate(event.request, valibot(requestSchema));
- if (!form.valid) return fail(400, { form, ok: false });
- await getQueues().Emails.add('Email SuperAdmins about new org ' + form.data.organizationName, {
- type: BullMQ.JobType.Email_NotifySuperAdminsOfNewOrganizationRequest,
- email: form.data.email,
- organizationName: form.data.organizationName,
- url: form.data.url
+ async request({ locals, request }) {
+ locals.security.requireNothing();
+ return tracer.startActiveSpan('Org Invite - Process Request', async (span) => {
+ try {
+ const formData = await request.formData();
+ resolveToken(formData);
+ const form = await superValidate(formData, valibot(requestSchema));
+ if (!form.valid) return fail(400, { form, ok: false });
+
+ const verifyResult = await verifyToken(
+ form.data.turnstileToken,
+ env.ORG_REQUEST_TURNSTILE_SECRET_KEY
+ );
+
+ if (verifyResult !== 200) {
+ // logging handled in verifyToken
+ form.data.turnstileToken = '';
+ return fail(verifyResult, { form, ok: false });
+ }
+
+ // code to use for exchange
+ const requestId = randomUUID();
+ const code = randomInt(100_000, 1_000_000).toString();
+
+ try {
+ await getAuthConnection().set(
+ `org-invite:${requestId}`,
+ JSON.stringify({ ...form.data, code }),
+ 'EX',
+ 600
+ ); // 10 minute (600 s) TTL
+
+ await sendEmail(
+ [{ email: form.data.email, name: form.data.organizationName }],
+ gp.email_subject({}, { locale: locals.locale as Locale }),
+ gp.email_body({ code }, { locale: locals.locale as Locale })
+ );
+ } catch {
+ error(500, 'Failed to generate request email');
+ }
+ redirect(303, localizeHref(`/request-access-for-organization/verify/${requestId}`));
+ } finally {
+ span.end();
+ }
});
- return { form, ok: true };
}
} satisfies Actions;
diff --git a/src/routes/(unauthenticated)/request-access-for-organization/+page.svelte b/src/routes/(unauthenticated)/request-access-for-organization/+page.svelte
index 733fa7ed30..81270775db 100644
--- a/src/routes/(unauthenticated)/request-access-for-organization/+page.svelte
+++ b/src/routes/(unauthenticated)/request-access-for-organization/+page.svelte
@@ -1,44 +1,174 @@
-
diff --git a/src/routes/(unauthenticated)/request-access-for-organization/success/+page.svelte b/src/routes/(unauthenticated)/request-access-for-organization/success/+page.svelte
index d2eeb93df5..5b4313a5fa 100644
--- a/src/routes/(unauthenticated)/request-access-for-organization/success/+page.svelte
+++ b/src/routes/(unauthenticated)/request-access-for-organization/success/+page.svelte
@@ -3,6 +3,6 @@
| {m.project_org()} | +{m.project_orgContact()} | +
|---|---|
|
+ {#if org.LogoUrl}
+
+
+
+ {/if}
+
+ {org.Name}
+
+ |
+ + {#if org.ContactEmail} + + {org.ContactEmail} + + {:else} + {m.common_notAvailable()} + {/if} + | +
Request sent!
- An email has been sent to the Scriporia team, and you'll receive an invitation after your request + An email has been sent to the Scriptoria team, and you'll receive an invitation after your request has been reviewed.
diff --git a/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.server.ts b/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.server.ts new file mode 100644 index 0000000000..65611eda52 --- /dev/null +++ b/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.server.ts @@ -0,0 +1,97 @@ +import { SpanStatusCode, trace } from '@opentelemetry/api'; +import { redirect } from '@sveltejs/kit'; +import { fail, superValidate } from 'sveltekit-superforms'; +import { valibot } from 'sveltekit-superforms/adapters'; +import * as v from 'valibot'; +import type { Actions, PageServerLoad } from './$types'; +import { localizeHref } from '$lib/paraglide/runtime'; +import { BullMQ, getQueues } from '$lib/server/bullmq'; +import { getAuthConnection } from '$lib/server/bullmq/queues'; + +const tracer = trace.getTracer('OrgInviteRequest'); + +const codeSchema = v.object({ code: v.pipe(v.string(), v.trim(), v.digits(), v.length(6)) }); + +const requestSchema = v.nullable( + v.pipe( + v.string(), + v.parseJson(), + v.object({ + organizationName: v.pipe(v.string(), v.trim(), v.nonEmpty()), + email: v.pipe(v.string(), v.trim(), v.nonEmpty(), v.email()), + url: v.pipe(v.string(), v.trim(), v.nonEmpty(), v.url()), + code: codeSchema.entries.code + }) + ) +); + +export const load = (async ({ locals, params }) => { + locals.security.requireNothing(); + return tracer.startActiveSpan('Org Invite - Load Verification page', async (span) => { + span.setAttribute('org-invite.request-id', params.requestId); + try { + const key = `org-invite:${params.requestId}`; + const request = v.safeParse(requestSchema, await getAuthConnection().get(key)); + + if (request.success && request.output) { + return { + email: request.output.email, + ttl: await getAuthConnection().ttl(key), + form: await superValidate(valibot(codeSchema)) + }; + } else { + redirect(308, localizeHref(`/request-access-for-organization`)); + } + } finally { + span.end(); + } + }); +}) satisfies PageServerLoad; + +export const actions = { + async verifyCode({ locals, request: eventRequest, params }) { + locals.security.requireNothing(); + return tracer.startActiveSpan('Org Invite - Verify Code', async (span) => { + span.setAttribute('org-invite.request-id', params.requestId); + try { + const key = `org-invite:${params.requestId}`; + + const request = v.safeParse(requestSchema, await getAuthConnection().get(key)); + if (!request.success || !request.output) return fail(404, { ok: false }); + + const form = await superValidate(eventRequest, valibot(codeSchema)); + + if (!form.valid || form.data.code !== request.output.code) { + return fail(400, { form, ok: false, codeMatch: false }); + } + + try { + //immediately invalidate + await getAuthConnection().del(key); + } catch { + /* empty */ + } + + await getQueues().Emails.add( + 'Email SuperAdmins about new org ' + request.output.organizationName, + { + type: BullMQ.JobType.Email_NotifySuperAdminsOfNewOrganizationRequest, + email: request.output.email, + organizationName: request.output.organizationName, + url: request.output.url + } + ); + return { form, ok: true }; + } catch (e) { + span.recordException(e as Error); + span.setStatus({ + code: SpanStatusCode.ERROR, + message: (e as Error).message + }); + return fail(500, { ok: false }); + } finally { + span.end(); + } + }); + } +} satisfies Actions; diff --git a/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.svelte b/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.svelte new file mode 100644 index 0000000000..f85b10b7d5 --- /dev/null +++ b/src/routes/(unauthenticated)/request-access-for-organization/verify/[requestId=uuid]/+page.svelte @@ -0,0 +1,95 @@ + + ++ {gp.check_email_description({ email: data.email }, { locale: getLocale() })} +
+ +{m.common_expires()}: {$expireTime}
+ +