Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: follow Lucia examples a bit more closely #123

Merged
merged 4 commits into from
Oct 15, 2024
Merged

chore: follow Lucia examples a bit more closely #123

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fede7a8
chore: follow Lucia examples a bit more closely
benmccann Oct 14, 2024
a738d1f
restore order to reduce diff
benmccann Oct 15, 2024
1f38070
match nanoid
benmccann Oct 15, 2024
559c323
default length
benmccann Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions packages/adders/lucia/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let schemaPath: string;
export const options = defineAdderOptions({
demo: {
type: 'boolean',
default: false,
default: true,
benmccann marked this conversation as resolved.
Show resolved Hide resolved
question: `Do you want to include a demo? ${colors.dim('(includes a login/register page)')}`
}
});
Expand Down Expand Up @@ -214,9 +214,6 @@ export default defineAdder({
encodeBase32LowerCaseNoPadding: 'encodeBase32LowerCaseNoPadding',
encodeHexLowerCase: 'encodeHexLowerCase'
});
imports.addNamed(ast, '@oslojs/crypto/random', {
generateRandomString: 'generateRandomString'
});
imports.addNamed(ast, '@oslojs/crypto/sha2', { sha256: 'sha256' });
imports.addNamed(ast, 'drizzle-orm', { eq: 'eq' });

Expand All @@ -239,18 +236,6 @@ export default defineAdder({
}`;
ms.append(`\n\n${generateSessionToken}`);
}
if (!ms.original.includes('function generateId')) {
const generateId = dedent`
${ts('', '/**')}
${ts('', ' * @param {number} length')}
${ts('', ' * @returns {string}')}
${ts('', ' */')}
export function generateId(length${ts(': number')})${ts(': string')} {
const alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
return generateRandomString({ read: (bytes) => crypto.getRandomValues(bytes) }, alphabet, length);
}`;
ms.append(`\n\n${generateId}`);
}
if (!ms.original.includes('async function createSession')) {
const createSession = dedent`
${ts('', '/** @param {string} userId */')}
Expand Down Expand Up @@ -278,11 +263,6 @@ export default defineAdder({
}`;
ms.append(`\n\n${invalidateSession}`);
}
if (typescript && !ms.original.includes('export type SessionValidationResult')) {
const sessionType =
'export type SessionValidationResult = Awaited<ReturnType<typeof validateSession>>;';
ms.append(`\n\n${sessionType}`);
}
if (!ms.original.includes('async function validateSession')) {
const validateSession = dedent`
${ts('', '/** @param {string} sessionId */')}
Expand Down Expand Up @@ -321,6 +301,11 @@ export default defineAdder({
}`;
ms.append(`\n\n${validateSession}`);
}
if (typescript && !ms.original.includes('export type SessionValidationResult')) {
const sessionType =
'export type SessionValidationResult = Awaited<ReturnType<typeof validateSession>>;';
ms.append(`\n\n${sessionType}`);
}

return ms.toString();
}
Expand Down Expand Up @@ -373,12 +358,13 @@ export default defineAdder({

const [ts] = utils.createPrinter(typescript);
return dedent`
import { dev } from '$app/environment';
import { fail, redirect } from '@sveltejs/kit';
import { hash, verify } from '@node-rs/argon2';
import { generateRandomString } from '@oslojs/crypto/random';
import { fail, redirect } from '@sveltejs/kit';
import { eq } from 'drizzle-orm';
import { db } from '$lib/server/db';
import { dev } from '$app/environment';
import * as auth from '$lib/server/auth';
import { db } from '$lib/server/db';
import * as table from '$lib/server/db/schema';
${ts(`import type { Actions, PageServerLoad } from './$types';\n`)}
export const load${ts(': PageServerLoad')} = async (event) => {
Expand Down Expand Up @@ -444,7 +430,7 @@ export default defineAdder({
return fail(400, { message: 'Invalid password' });
}

const userId = auth.generateId(15);
const userId = generateUserId();
const passwordHash = await hash(password, {
// recommended minimum parameters
memoryCost: 19456,
Expand All @@ -471,6 +457,12 @@ export default defineAdder({
},
};

const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_';

function generateUserId()${ts(': string')} {
return generateRandomString({ read: (bytes) => crypto.getRandomValues(bytes) }, alphabet, 21);
}
manuel3108 marked this conversation as resolved.
Show resolved Hide resolved

function validateUsername(username${ts(': unknown')})${ts(': username is string')} {
return (
typeof username === 'string' &&
Expand Down