This apparently might fix the auth?

2024-08-08 04:15:00 -05:00
parent 4f99bc6027
commit c35322990a
4 changed files with 187 additions and 22 deletions
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1133,6 +1133,9 @@ packages:
  '@ungap/structured-clone@1.2.0':
    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}

+  '@yarnpkg/lockfile@1.1.0':
+    resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==}
+
  acorn-jsx@5.3.2:
    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
    peerDependencies:
@@ -1228,6 +1231,10 @@ packages:
  ast-types-flow@0.0.8:
    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}

+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
  available-typed-arrays@1.0.7:
    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
    engines: {node: '>= 0.4'}
@@ -1293,6 +1300,10 @@ packages:
    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
    engines: {node: '>= 8.10.0'}

+  ci-info@3.9.0:
+    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
+    engines: {node: '>=8'}
+
  class-variance-authority@0.7.0:
    resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==}

@@ -1755,6 +1766,9 @@ packages:
    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
    engines: {node: '>=10'}

+  find-yarn-workspace-root@2.0.0:
+    resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==}
+
  flat-cache@3.2.0:
    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
    engines: {node: ^10.12.0 || >=12.0.0}
@@ -1769,6 +1783,10 @@ packages:
    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
    engines: {node: '>=14'}

+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
  fs.realpath@1.0.0:
    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}

@@ -1951,6 +1969,11 @@ packages:
    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
    engines: {node: '>= 0.4'}

+  is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+
  is-extglob@2.1.1:
    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
    engines: {node: '>=0.10.0'}
@@ -2028,6 +2051,10 @@ packages:
    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
    engines: {node: '>= 0.4'}

+  is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+
  isarray@2.0.5:
    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}

@@ -2071,10 +2098,20 @@ packages:
  json-stable-stringify-without-jsonify@1.0.1:
    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}

+  json-stable-stringify@1.1.1:
+    resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==}
+    engines: {node: '>= 0.4'}
+
  json5@1.0.2:
    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
    hasBin: true

+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  jsonify@0.0.1:
+    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
+
  jsonwebtoken@9.0.2:
    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
    engines: {node: '>=12', npm: '>=6'}
@@ -2092,6 +2129,9 @@ packages:
  keyv@4.5.4:
    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}

+  klaw-sync@6.0.0:
+    resolution: {integrity: sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==}
+
  language-subtag-registry@0.3.23:
    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}

@@ -2307,10 +2347,18 @@ packages:
  once@1.4.0:
    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}

+  open@7.4.2:
+    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
+    engines: {node: '>=8'}
+
  optionator@0.9.4:
    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
    engines: {node: '>= 0.8.0'}

+  os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+
  p-limit@3.1.0:
    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
    engines: {node: '>=10'}
@@ -2625,6 +2673,11 @@ packages:
    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}

+  rimraf@2.7.1:
+    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
  rimraf@3.0.2:
    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
    deprecated: Rimraf versions prior to v4 are no longer supported
@@ -2683,6 +2736,10 @@ packages:
  sisteransi@1.0.5:
    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}

+  slash@2.0.0:
+    resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==}
+    engines: {node: '>=6'}
+
  slash@3.0.0:
    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
    engines: {node: '>=8'}
@@ -2812,6 +2869,10 @@ packages:
    resolution: {integrity: sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==}
    engines: {node: '>=0.12'}

+  tmp@0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
+
  to-regex-range@5.0.1:
    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
    engines: {node: '>=8.0'}
@@ -2888,6 +2949,10 @@ packages:
  undici-types@5.26.5:
    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}

+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
  uri-js@4.4.1:
    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}

@@ -3765,6 +3830,8 @@ snapshots:

  '@ungap/structured-clone@1.2.0': {}

+  '@yarnpkg/lockfile@1.1.0': {}
+
  acorn-jsx@5.3.2(acorn@8.12.1):
    dependencies:
      acorn: 8.12.1
@@ -3882,6 +3949,8 @@ snapshots:

  ast-types-flow@0.0.8: {}

+  at-least-node@1.0.0: {}
+
  available-typed-arrays@1.0.7:
    dependencies:
      possible-typed-array-names: 1.0.0
@@ -3951,6 +4020,8 @@ snapshots:
    optionalDependencies:
      fsevents: 2.3.3

+  ci-info@3.9.0: {}
+
  class-variance-authority@0.7.0:
    dependencies:
      clsx: 2.0.0
@@ -4602,6 +4673,10 @@ snapshots:
      locate-path: 6.0.0
      path-exists: 4.0.0

+  find-yarn-workspace-root@2.0.0:
+    dependencies:
+      micromatch: 4.0.7
+
  flat-cache@3.2.0:
    dependencies:
      flatted: 3.3.1
@@ -4619,6 +4694,13 @@ snapshots:
      cross-spawn: 7.0.3
      signal-exit: 4.1.0

+  fs-extra@9.1.0:
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
  fs.realpath@1.0.0: {}

  fsevents@2.3.3:
@@ -4821,6 +4903,8 @@ snapshots:
    dependencies:
      has-tostringtag: 1.0.2

+  is-docker@2.2.1: {}
+
  is-extglob@2.1.1: {}

  is-finalizationregistry@1.0.2:
@@ -4885,6 +4969,10 @@ snapshots:
      call-bind: 1.0.7
      get-intrinsic: 1.2.4

+  is-wsl@2.2.0:
+    dependencies:
+      is-docker: 2.2.1
+
  isarray@2.0.5: {}

  isexe@2.0.0: {}
@@ -4931,10 +5019,25 @@ snapshots:

  json-stable-stringify-without-jsonify@1.0.1: {}

+  json-stable-stringify@1.1.1:
+    dependencies:
+      call-bind: 1.0.7
+      isarray: 2.0.5
+      jsonify: 0.0.1
+      object-keys: 1.1.1
+
  json5@1.0.2:
    dependencies:
      minimist: 1.2.8

+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsonify@0.0.1: {}
+
  jsonwebtoken@9.0.2:
    dependencies:
      jws: 3.2.2
@@ -4970,6 +5073,10 @@ snapshots:
    dependencies:
      json-buffer: 3.0.1

+  klaw-sync@6.0.0:
+    dependencies:
+      graceful-fs: 4.2.11
+
  language-subtag-registry@0.3.23: {}

  language-tags@1.0.9:
@@ -5168,6 +5275,11 @@ snapshots:
    dependencies:
      wrappy: 1.0.2

+  open@7.4.2:
+    dependencies:
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+
  optionator@0.9.4:
    dependencies:
      deep-is: 0.1.4
@@ -5177,6 +5289,8 @@ snapshots:
      type-check: 0.4.0
      word-wrap: 1.2.5

+  os-tmpdir@1.0.2: {}
+
  p-limit@3.1.0:
    dependencies:
      yocto-queue: 0.1.0
@@ -5428,6 +5542,10 @@ snapshots:

  reusify@1.0.4: {}

+  rimraf@2.7.1:
+    dependencies:
+      glob: 7.2.3
+
  rimraf@3.0.2:
    dependencies:
      glob: 7.2.3
@@ -5492,6 +5610,8 @@ snapshots:

  sisteransi@1.0.5: {}

+  slash@2.0.0: {}
+
  slash@3.0.0: {}

  source-map-js@1.2.0: {}
@@ -5651,6 +5771,10 @@ snapshots:
      es5-ext: 0.10.64
      next-tick: 1.1.0

+  tmp@0.0.33:
+    dependencies:
+      os-tmpdir: 1.0.2
+
  to-regex-range@5.0.1:
    dependencies:
      is-number: 7.0.0
@@ -5746,6 +5870,8 @@ snapshots:

  undici-types@5.26.5: {}

+  universalify@2.0.1: {}
+
  uri-js@4.4.1:
    dependencies:
      punycode: 2.3.1
--- a/src/auth.config.ts
+++ b/src/auth.config.ts
@@ -1,7 +1,53 @@
-//import Apple from "next-auth/providers/apple"
+import Apple from "next-auth/providers/apple";
+import type { NextAuthConfig } from "next-auth";

-//import type { NextAuthConfig } from "next-auth"
+// Define the AppleProfile type inside or outside this file
+interface AppleProfile {
+  sub: string;    // Unique identifier for the user
+  email?: string; // Email is marked as optional
+  // Add other properties if needed
+}

-//export default {
-  //providers: [Apple],
-//} satisfies NextAuthConfig
+const authConfig: NextAuthConfig = {
+  cookies: {
+    pkceCodeVerifier: {
+      name: "next-auth.pkce.code_verifier",
+      options: {
+        httpOnly: true,
+        sameSite: "none",
+        path: "/",
+        secure: true,
+      },
+    },
+  },
+  providers: [
+    Apple({
+      clientId: process.env.AUTH_APPLE_ID,
+      clientSecret: "" + process.env.AUTH_APPLE_SECRET,  // Convert to string
+      checks: ["pkce"],
+      token: {
+        url: `https://appleid.apple.com/auth/token`,
+      },
+      client: {
+        token_endpoint_auth_method: "client_secret_post",
+      },
+      authorization: {
+        params: {
+          response_mode: "form_post",
+          response_type: "code", // Ensure this is set correctly
+          scope: "name email",
+        },
+      },
+      profile(profile: AppleProfile) {
+        return {
+          id: profile.sub,             // Access sub safely
+          name: "New User",            // Apple's profile doesn't return name
+          email: profile.email,        // Access email safely, handle if optional
+          image: "",                   // Default empty or handle according to need
+        };
+      },
+    }),
+  ],
+};
+
+export default authConfig;
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -1,16 +1,10 @@
 import NextAuth from "next-auth"
-import Apple from "next-auth/providers/apple"
+import { DrizzleAdapter } from "@auth/drizzle-adapter"
+import { db } from "~/server/db/schema"
+import authConfig from "~/auth.config"
 
-export const { handlers, auth, signIn, signOut } = NextAuth({
-  providers: [Apple],
+export const { handlers, signIn, signOut, auth } = NextAuth({
+  adapter: DrizzleAdapter(db),
+  session: { strategy: "jwt" },
+  ...authConfig
 })
-//import NextAuth from "next-auth"
-//import { DrizzleAdapter } from "@auth/drizzle-adapter"
-//import { db } from "~/server/db/schema"
-//import authConfig from "~/auth.config"
- 
-//export const { handlers, signIn, signOut, auth } = NextAuth({
-  //adapter: DrizzleAdapter(db),
-  //session: { strategy: "jwt" },
-  //...authConfig
-//})
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,4 +1,3 @@
-export { auth as middleware } from "~/auth"
-//import authConfig from "~/auth.config"
-//import NextAuth from "next-auth"
-//export const { auth: middleware } = NextAuth(authConfig)
+import authConfig from "~/auth.config"
+import NextAuth from "next-auth"
+export const { auth: middleware } = NextAuth(authConfig)