sveltekit-auth-example 1.0.14 → 1.0.18

package/CHANGELOG.md

@@ -1,9 +1,22 @@
 # Backlog
-* [Bug] Address TypeScript issues found during `npm run check` (11 errors) - most related to use of Action type
+* Add username and Avatar icon to menu bar
+* [Possible Bug] Getting HTTP 401 on https://play.google.com/log?format=json&hasfast=true&authuser=0 from google-auth-library. As I didn't explicitly request logging, it could be that Safari is preventing Google from further invading our privacy. Will require some investigation. The site works regardless.
 * Consider not setting defaultUser in loginSession as it would simplify +layout.svelte.
 * Refactor $env/dynamic/private and public
 * Add password complexity checking on /register and /profile pages (only checks for length currently despite what the pages say)
 
+# 1.0.18
+* Bump dependencies
+
+# 1.0.17
+* Bump dependencies
+
+# 1.0.16
+* [Bug] Fixed LayoutServerLoad typing
+
+# 1.0.15
+* [Bug] Replaced use of Action type in +server.ts files (only works for +page.server.ts)
+
 # 1.0.14
 * Refactor routing to be folder, not file-based - https://github.com/sveltejs/kit/discussions/5774 (file system router). More info: https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3294867
 * Move bootstrap SCSS import to JavaScript in +layout.svelte

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sveltekit-auth-example",
   "description": "SvelteKit Authentication Example",
-  "version": "1.0.14",
+  "version": "1.0.18",
   "private": false,
   "author": "Nate Stuyvesant",
   "license": "https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE",
@@ -34,13 +34,13 @@
   },
   "engines": {
     "node": "~18.8.0",
-    "npm": "^8.18.0"
+    "npm": "^8.19.1"
   },
   "type": "module",
   "dependencies": {
     "cookie": "^0.5.0",
-    "dotenv": "^16.0.1",
-    "google-auth-library": "^8.4.0",
+    "dotenv": "^16.0.2",
+    "google-auth-library": "^8.5.1",
     "jsonwebtoken": "^8.5.1",
     "pg": "^8.8.0"
   },
@@ -52,8 +52,8 @@
     "@types/google.accounts": "0.0.2",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/pg": "^8.6.5",
-    "@typescript-eslint/eslint-plugin": "^5.35.0",
-    "@typescript-eslint/parser": "^5.35.0",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
     "bootstrap": "^5.2.0",
     "bootstrap-icons": "^1.9.1",
     "eslint": "^8.23.0",
@@ -61,12 +61,12 @@
     "eslint-plugin-svelte3": "^4.0.0",
     "prettier": "^2.7.1",
     "prettier-plugin-svelte": "^2.7.0",
-    "sass": "^1.54.5",
-    "svelte": "^3.49.0",
-    "svelte-check": "^2.8.1",
+    "sass": "^1.54.8",
+    "svelte": "^3.50.0",
+    "svelte-check": "^2.9.0",
     "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",
-    "vite": "^3.0.9"
+    "vite": "^3.1.0"
   }
 }

package/src/routes/+layout.server.ts

@@ -1,6 +1,7 @@
 import type { LayoutServerLoad } from './$types'
 
-export function load({ locals }): LayoutServerLoad {
+export const load: LayoutServerLoad = (event) => {
+  const locals = event.locals
   const { user }: { user: User } = locals // locals.user set by hooks.ts/handle(), undefined if not logged in
   return {
     user

package/src/routes/+layout.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import type { LayoutData } from './$types'
+  import type { LayoutServerData } from './$types'
   import { goto } from '$app/navigation'
   import { page } from '$app/stores'
   import { loginSession, toast } from '../stores'
   import useAuth from '$lib/auth'
   import 'bootstrap/scss/bootstrap.scss' // preferred way to load Bootstrap SCSS for hot module reloading
 
-	export let data: LayoutData
+	export let data: LayoutServerData
 
   // If returning from different website, runs once (as it's an SPA) to restore user session if session cookie is still valid
   const { user } = data

package/src/routes/api/v1/user/+server.ts

@@ -1,8 +1,8 @@
-import { error, json } from '@sveltejs/kit'
-import type { Action } from './$types'
+import { error, json} from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import { query } from '../../../_db'
 
-export const PUT: Action = async event => {
+export const PUT: RequestHandler = async event => {
   const { user } = event.locals
 
   if (!user)

package/src/routes/auth/[slug]/+server.ts

@@ -1,8 +1,8 @@
 import { error, json } from '@sveltejs/kit'
-import type { Action } from './$types'
+import type { RequestHandler } from './$types'
 import { query } from '../../_db'
 
-export const POST: Action = async (event) => {
+export const POST: RequestHandler = async (event) => {
 	const { slug } = event.params
 
 	let result

package/src/routes/auth/forgot/+server.ts

@@ -1,4 +1,4 @@
-import type { Action } from './$types'
+import type { RequestHandler } from './$types'
 import type { Secret } from 'jsonwebtoken'
 import jwt from 'jsonwebtoken'
 import dotenv from 'dotenv'
@@ -9,7 +9,7 @@ dotenv.config()
 const DOMAIN = process.env.DOMAIN
 const JWT_SECRET = process.env.JWT_SECRET
 
-export const POST: Action = async event => {
+export const POST: RequestHandler = async event => {
   const body = await event.request.json()
   const sql = `SELECT id as "userId" FROM users WHERE email = $1 LIMIT 1;`
   const { rows } = await query(sql, [body.email])

package/src/routes/auth/google/+server.ts

@@ -1,5 +1,5 @@
 import { error } from '@sveltejs/kit'
-import type { Action } from './$types'
+import type { RequestHandler } from './$types'
 import { OAuth2Client } from 'google-auth-library'
 import { query } from '../../_db';
 import { config } from '$lib/config'
@@ -42,7 +42,7 @@ async function upsertGoogleUser(user: Partial<User>): Promise<UserSession> {
 }
 
 // Returns local user if Google user authenticated (and authorized our app)
-export const POST: Action = async event => {
+export const POST: RequestHandler = async event => {
   try {
     const { token } = await event.request.json()
     const user = await getGoogleUserFromJWT(token)

package/src/routes/auth/reset/+server.ts

@@ -1,6 +1,6 @@
 import { json as json$1 } from '@sveltejs/kit';
 import dotenv from 'dotenv'
-import type { RequestHandler } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import type  { JwtPayload } from 'jsonwebtoken'
 import jwt from 'jsonwebtoken'
 import { query } from '../../_db'

package/src/routes/register/+page.server.ts

@@ -1,10 +1,10 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect } from '@sveltejs/kit'
 import type { PageServerLoad } from './$types'
 
 export const load: PageServerLoad = ({ locals }) => {
 	const { user } = locals
 	if (user) { // Redirect to home if user is logged in already
-		throw redirect(302, '/');
+		throw redirect(302, '/')
 	}
 	return {}
 }