diff --git a/src/routes/(app)/rss/entries.json/+server.ts b/src/routes/(app)/rss/entries.json/+server.ts
index 595322855..284336660 100644
--- a/src/routes/(app)/rss/entries.json/+server.ts
+++ b/src/routes/(app)/rss/entries.json/+server.ts
@@ -1,13 +1,12 @@
import { error, json, type RequestHandler } from '@sveltejs/kit';
import { db } from '$lib/db';
-import { auth } from '$lib/lucia';
+import { auth } from '$lib/server/lucia';
export const GET: RequestHandler = async ({ url, locals, request }) => {
const cursor = url.searchParams.get('cursor');
const unread = url.searchParams.get('unread');
const have = url.searchParams.get('have')?.split(',') || [];
try {
- const { user } = await auth.validateRequestByCookie(request);
- console.log({ user });
+ const session = await auth.validateRequest(request);
if (cursor) {
const items = await db.rssFeedItem.findMany({
where: {
@@ -17,7 +16,7 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
feed: {
users: {
some: {
- id: user['user_id'],
+ id: session['userId'],
},
},
},
@@ -33,7 +32,7 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
include: {
interactions: {
where: {
- userId: user['user_id'],
+ userId: session['userId'],
},
},
feed: {
@@ -53,13 +52,13 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
cursor: items[items.length - 1]?.id,
});
} else {
- console.log({ user });
+ console.log({ user: session });
const items = await db.rssFeedItem.findMany({
where: {
feed: {
users: {
some: {
- id: user['user_id'],
+ id: session['userId'],
},
},
},
@@ -83,7 +82,7 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
// feed: {
// users: {
// some: {
- // id: user['user_id'],
+ // id: user['userId'],
// },
// },
// },
@@ -92,7 +91,7 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
// ? {
// some: {
// user: {
- // id: user['user_id'],
+ // id: user['userId'],
// },
// is_read: false,
// },
@@ -103,7 +102,7 @@ export const GET: RequestHandler = async ({ url, locals, request }) => {
// include: {
// interactions: {
// where: {
- // userId: user['user_id'],
+ // userId: user['userId'],
// },
// },
// feed: {
diff --git a/src/routes/(app)/rss/entries/+page.ts b/src/routes/(app)/rss/entries/+page.ts
index f63a2f13e..410afae69 100644
--- a/src/routes/(app)/rss/entries/+page.ts
+++ b/src/routes/(app)/rss/entries/+page.ts
@@ -1,6 +1,6 @@
import { browser } from '$app/environment';
import { user } from '$lib/stores/user';
-import type { RssFeedItemModel } from '$lib/types/schemas/prisma';
+import type { RssFeedItemModel } from '$lib/types/schemas/rssfeeditem';
import type { z } from 'zod';
import { currentList } from '../store';
import type { PageLoad } from './$types';
diff --git a/src/routes/(app)/rss/podcasts/[add]/+page.svelte b/src/routes/(app)/rss/podcasts/[add]/+page.svelte
index 24f939fc3..02ee4eb08 100644
--- a/src/routes/(app)/rss/podcasts/[add]/+page.svelte
+++ b/src/routes/(app)/rss/podcasts/[add]/+page.svelte
@@ -48,6 +48,8 @@
diff --git a/src/routes/(app)/tags/[name]/+page.server.ts b/src/routes/(app)/tags/[name]/+page.server.ts
index b37b9e628..bc954e56b 100644
--- a/src/routes/(app)/tags/[name]/+page.server.ts
+++ b/src/routes/(app)/tags/[name]/+page.server.ts
@@ -9,16 +9,16 @@ export const load: PageServerLoad = async ({ params }) => {
const tag = await db.tag.findFirst({
where: {
name: {
- equals: params.name
+ equals: params.name,
// mode: 'insensitive' <- for when i use postgres
- }
+ },
},
include: {
articles: {
- select: ArticleListSelect
+ select: ArticleListSelect,
},
- favorite: true
- }
+ favorite: true,
+ },
});
console.log({ tag });
return { tag };
@@ -30,11 +30,11 @@ export const PATCH: Action = async ({ params, request }) => {
console.log({ json });
const tag = await db.tag.update({
where: {
- name: params.name
+ name: params.name,
},
data: {
- ...json
- }
+ ...json,
+ },
});
if (!tag) {
throw error(400);
diff --git a/src/routes/(login)/login/+page.server.ts b/src/routes/(login)/login/+page.server.ts
index a253c2bab..c4b9472cd 100644
--- a/src/routes/(login)/login/+page.server.ts
+++ b/src/routes/(login)/login/+page.server.ts
@@ -1,45 +1,34 @@
-import type { Action } from '@sveltejs/kit';
-import { auth } from '$lib/lucia';
+import { invalid, redirect, type Actions } from '@sveltejs/kit';
+import { auth } from '$lib/server/lucia';
-export const POST: Action = async ({ request, setHeaders }) => {
- const form = await request.formData();
- const username = form.get('username');
- const password = form.get('password');
- if (!username || !password || typeof username !== 'string' || typeof password !== 'string') {
- return {
- errors: {
- message: 'Invalid input',
- },
- };
- }
- try {
- const authenticateUser = await auth.authenticateUser('username', username, password);
- console.log({ authenticateUser });
- setHeaders({
- 'set-cookie': authenticateUser.cookies,
- });
- return {
- location: '/inbox',
- };
- } catch (e) {
- const error = e as Error;
- if (
- error.message === 'AUTH_INVALID_IDENTIFIER_TOKEN' ||
- error.message === 'AUTH_INVALID_PASSWORD'
- ) {
- return {
- errors: {
- message: 'Incorrect username or password.',
- },
- };
+export const actions: Actions = {
+ default: async ({ request, cookies }) => {
+ const form = await request.formData();
+ const email = form.get('email');
+ const password = form.get('password');
+ console.log({ email, password });
+ if (!email || !password || typeof email !== 'string' || typeof password !== 'string') {
+ return invalid(400, {
+ message: 'invalid input',
+ });
}
- // database connection error
- console.log(error);
- return {
- status: 500,
- errors: {
+ try {
+ const user = await auth.authenticateUser('email', email, password);
+ const { setSessionCookie } = await auth.createSession(user.userId);
+ setSessionCookie(cookies);
+ } catch (e) {
+ const error = e as Error;
+ if (
+ error.message === 'AUTH_INVALID_IDENTIFIER_TOKEN' ||
+ error.message === 'AUTH_INVALID_PASSWORD'
+ ) {
+ return invalid(400, { message: 'Incorrect email or password.' });
+ }
+ console.error(error);
+ return invalid(500, {
message: 'Unknown error.',
- },
- };
- }
+ });
+ }
+ throw redirect(302, '/login');
+ },
};
diff --git a/src/routes/(login)/login/+page.svelte b/src/routes/(login)/login/+page.svelte
index 64e27ff03..77a79f941 100644
--- a/src/routes/(login)/login/+page.svelte
+++ b/src/routes/(login)/login/+page.svelte
@@ -1,37 +1,43 @@
Log in to Margins
diff --git a/src/routes/(login)/login/+page.ts b/src/routes/(login)/login/+page.ts
index fd3ff820a..b05e89d26 100644
--- a/src/routes/(login)/login/+page.ts
+++ b/src/routes/(login)/login/+page.ts
@@ -1,7 +1,9 @@
import { redirect } from '@sveltejs/kit';
+import { getUser } from 'lucia-sveltekit/load';
import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ parent }) => {
- const { lucia } = await parent();
- if (lucia) throw redirect(302, '/inbox');
+export const load: PageLoad = async (event) => {
+ const user = await getUser(event);
+ if (user) throw redirect(302, '/inbox');
+ return {};
};
diff --git a/src/routes/(login)/signup/+page.server.ts b/src/routes/(login)/signup/+page.server.ts
index 08252eed9..9198b9fc5 100644
--- a/src/routes/(login)/signup/+page.server.ts
+++ b/src/routes/(login)/signup/+page.server.ts
@@ -1,51 +1,42 @@
-import type { Action } from './$types';
-import { auth } from '$lib/lucia';
+import { auth } from '$lib/server/lucia';
+import { invalid, redirect, type Actions } from '@sveltejs/kit';
-export const POST: Action = async ({ request, setHeaders }) => {
- const form = await request.formData();
- const username = form.get('username');
- const password = form.get('password');
- if (!username || !password || typeof username !== 'string' || typeof password !== 'string') {
- return {
- errors: {
+export const actions: Actions = {
+ default: async ({ request, cookies }) => {
+ const form = await request.formData();
+ const email = form.get('email');
+ const password = form.get('password');
+ // check for empty
+ if (!email || !password || typeof email !== 'string' || typeof password !== 'string') {
+ return invalid(400, {
message: 'Invalid input',
- username: '',
- },
- };
- }
- try {
- const createUser = await auth.createUser('username', username, {
- password,
- user_data: {
- username,
- },
- });
- console.log({ createUser });
- setHeaders({
- 'set-cookie': createUser.cookies,
- });
- return {
- location: '/inbox',
- };
- } catch (e) {
- const error = e as Error;
- if (
- error.message === 'AUTH_DUPLICATE_IDENTIFIER_TOKEN' ||
- error.message === 'AUTH_DUPLICATE_USER_DATA'
- ) {
- return {
- errors: {
- username: 'Username already taken',
- message: '',
+ });
+ }
+ try {
+ const user = await auth.createUser('email', email, {
+ password,
+ attributes: {
+ email,
},
- };
+ });
+ console.log({ user });
+ const { setSessionCookie } = await auth.createSession(user.userId);
+ setSessionCookie(cookies);
+ } catch (e) {
+ const error = e as Error;
+ if (
+ error.message === 'AUTH_DUPLICATE_IDENTIFIER_TOKEN' ||
+ error.message === 'AUTH_DUPLICATE_USER_DATA'
+ ) {
+ return invalid(400, {
+ message: 'Email unavailable',
+ });
+ }
+ console.error(error);
+ return invalid(500, {
+ message: 'Unknown error occurred',
+ });
}
- return {
- status: 500,
- errors: {
- message: 'Unknown error',
- username: '',
- },
- };
- }
+ throw redirect(302, '/login');
+ },
};
diff --git a/src/routes/(login)/signup/+page.svelte b/src/routes/(login)/signup/+page.svelte
index 373697fdd..275834c40 100644
--- a/src/routes/(login)/signup/+page.svelte
+++ b/src/routes/(login)/signup/+page.svelte
@@ -1,45 +1,43 @@
Let's create an account for Margins