-
+
)
}
diff --git a/leaky-ships/src/server/auth.ts b/leaky-ships/src/server/auth.ts
index 1b49f08..20773c8 100644
--- a/leaky-ships/src/server/auth.ts
+++ b/leaky-ships/src/server/auth.ts
@@ -1,5 +1,4 @@
-import AzureADProvider from "@auth/core/providers/azure-ad"
-import EmailProvider from "@auth/core/providers/email"
+import Discord from "@auth/core/providers/discord"
import { DrizzleAdapter } from "@auth/drizzle-adapter"
import { type SolidAuthConfig } from "@auth/solid-start"
import {
@@ -20,19 +19,14 @@ const customConfig: Config = {
export const authOptions: SolidAuthConfig = {
providers: [
- // @ts-expect-error Types are wrong
- EmailProvider({
- server: process.env.EMAIL_SERVER,
- from: process.env.EMAIL_FROM,
- }),
- AzureADProvider({
- clientId: process.env.AZURE_AD_CLIENT_ID ?? "",
- clientSecret: process.env.AZURE_AD_CLIENT_SECRET ?? "",
- tenantId: process.env.AZURE_AD_TENANT_ID,
+ // @ts-ignore
+ Discord({
+ clientId: import.meta.env.VITE_DISCORD_CLIENT_ID,
+ clientSecret: import.meta.env.VITE_DISCORD_CLIENT_SECRET,
}),
],
adapter: DrizzleAdapter(db),
- secret: process.env.AUTH_SECRET,
+ secret: import.meta.env.VITE_AUTH_SECRET,
callbacks: {
signIn: ({ user, account }) => {
// Custom signIn callback to add username to email provider
@@ -43,6 +37,7 @@ export const authOptions: SolidAuthConfig = {
},
session: ({ session, user }) => {
if (session?.user) {
+ // @ts-ignore
session.user.id = user.id
}
return session
diff --git a/leaky-ships/src/types/env.d.ts b/leaky-ships/src/types/env.d.ts
new file mode 100644
index 0000000..c0ab932
--- /dev/null
+++ b/leaky-ships/src/types/env.d.ts
@@ -0,0 +1,16 @@
+///
+
+interface ImportMetaEnv {
+ readonly VITE_DISCORD_CLIENT_ID: string
+ readonly VITE_DISCORD_CLIENT_SECRET: string
+
+ readonly VITE_AUTH_SECRET: string
+ readonly VITE_AUTH_URL: string | undefined
+
+ readonly VITE_DATABASE_URL: string
+}
+
+// eslint-disable-next-line no-unused-vars
+interface ImportMeta {
+ readonly env: ImportMetaEnv
+}
diff --git a/leaky-ships/tsconfig.eslint.json b/leaky-ships/tsconfig.eslint.json
deleted file mode 100644
index d71e9aa..0000000
--- a/leaky-ships/tsconfig.eslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "include": [".eslintrc.cjs"]
-}
diff --git a/leaky-ships/tsconfig.json b/leaky-ships/tsconfig.json
index d888d62..1b4d6d3 100644
--- a/leaky-ships/tsconfig.json
+++ b/leaky-ships/tsconfig.json
@@ -1,15 +1,17 @@
{
"compilerOptions": {
- "allowSyntheticDefaultImports": true,
- "esModuleInterop": true,
"target": "ESNext",
"module": "ESNext",
"moduleResolution": "node",
- "jsxImportSource": "solid-js",
+ "allowSyntheticDefaultImports": true,
+ "esModuleInterop": true,
"jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowJs": true,
"strict": true,
- "types": ["solid-start/env"],
- "baseUrl": "./",
+ "noEmit": true,
+ "types": ["vinxi/client"],
+ "isolatedModules": true,
"paths": {
"~/*": ["./src/*"]
}
diff --git a/leaky-ships/vite.config.ts b/leaky-ships/vite.config.ts
index b661cb7..04794fb 100644
--- a/leaky-ships/vite.config.ts
+++ b/leaky-ships/vite.config.ts
@@ -1,10 +1,3 @@
-import solid from "solid-start/vite"
-import { defineConfig } from "vite"
+import { defineConfig } from "@solidjs/start/config"
-export default defineConfig({
- plugins: [solid({ ssr: false })],
- server: {
- host: "0.0.0.0",
- strictPort: true,
- },
-})
+export default defineConfig({})