auth 1.1.1 → 1.2.1

package/README.md

@@ -68,65 +68,72 @@ We have an [OpenCollective](https://opencollective.com/nextauth) for companies a
     <tr>
       <td align="center" valign="top">
         <a href="https://clerk.com?utm_source=sponsorship&utm_medium=github&utm_campaign=authjs&utm_content=sponsor" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/49538330?s=200&v=4" alt="Clerk Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/49538330?s=200&v=4" alt="Clerk Logo" />
         </a><br />
         <div>Clerk</div>
         <sub>💵</sub>
       </td>
+      <td align="center" valign="top">
+        <a href="https://a0.to/signup/nextauthjs" target="_blank">
+          <img height="96" src="https://avatars.githubusercontent.com/u/2824157?v=4" alt="Auth0 Logo" />
+        </a><br />
+        <div>Auth0</div>
+        <sub>💵</sub>
+      </td>
       <td align="center" valign="top">
         <a href="https://fusionauth.io" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/41974756?s=200&v=4" alt="FusionAuth Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/41974756?s=200&v=4" alt="FusionAuth Logo" />
         </a><br />
         <div>FusionAuth</div>
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://www.beyondidentity.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/69811361?s=200&v=4" alt="Beyond Identity Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/69811361?s=200&v=4" alt="Beyond Identity Logo" />
         </a><br />
         <div>Beyond Identity</div>
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://stytch.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/69983493?s=200&v=4" alt="Stytch Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/69983493?s=200&v=4" alt="Stytch Logo" />
         </a><br />
         <div>Stytch</div>
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://prisma.io" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/17219288?s=200&v=4" alt="Prisma Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/17219288?s=200&v=4" alt="Prisma Logo" />
         </a><br />
         <div>Prisma</div>
         <sub>💵</sub>
       </td>
+    </tr>
+    <tr>
       <td align="center" valign="top">
         <a href="https://lowdefy.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/47087496?s=200&v=4" alt="Lowdefy Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/47087496?s=200&v=4" alt="Lowdefy Logo" />
         </a><br />
         <div>Lowdefy</div>
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://www.descope.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/97479186?s=200&v=4" alt="Descope Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/97479186?s=200&v=4" alt="Descope Logo" />
         </a><br />
         <div>Descope</div>
         <sub>💵</sub>
       </td>
-    </tr>
-    <tr>
       <td align="center" valign="top">
         <a href="https://badass.dev" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/136839242?v=4" alt="Badass Courses Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/136839242?v=4" alt="Badass Courses Logo" />
         </a><br />
         <div>Badass Courses</div>
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://github.com/encoredev/encore" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/50438175?v=4" alt="Encore Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/50438175?v=4" alt="Encore Logo" />
         </a><br />
         <div>Encore</div>
         <sub>💵</sub>
@@ -139,29 +146,31 @@ We have an [OpenCollective](https://opencollective.com/nextauth) for companies a
         <sub>💵</sub>
       </td>
       <td align="center" valign="top">
-        <a href="https://checklyhq.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/25982255?s=200&v=4" alt="Checkly Logo" />
+        <a href="https://www.netlight.com/" target="_blank">
+          <img height="96" src="https://avatars.githubusercontent.com/u/1672348?s=200&v=4" alt="Netlight logo" />
         </a><br />
-        <div>Checkly</div>
+        <div>Netlight</div>
         <sub>☁️</sub>
       </td>
+    </tr>
+    <tr>
       <td align="center" valign="top">
-        <a href="https://superblog.ai/" target="_blank">
-          <img width="108" src="https://d33wubrfki0l68.cloudfront.net/cdc4a3833bd878933fcc131655878dbf226ac1c5/10cd6/images/logo_bolt_small.png" alt="superblog Logo" />
+        <a href="https://checklyhq.com" target="_blank">
+          <img height="96" src="https://avatars.githubusercontent.com/u/25982255?s=200&v=4" alt="Checkly Logo" />
         </a><br />
-        <div>superblog</div>
+        <div>Checkly</div>
         <sub>☁️</sub>
       </td>
       <td align="center" valign="top">
-        <a href="https://www.netlight.com/" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/1672348?s=200&v=4" alt="Netlight logo" />
+        <a href="https://superblog.ai/" target="_blank">
+          <img height="96" src="https://d33wubrfki0l68.cloudfront.net/cdc4a3833bd878933fcc131655878dbf226ac1c5/10cd6/images/logo_bolt_small.png" alt="superblog Logo" />
         </a><br />
-        <div>Netlight</div>
+        <div>superblog</div>
         <sub>☁️</sub>
       </td>
       <td align="center" valign="top">
         <a href="https://vercel.com" target="_blank">
-          <img width="108" src="https://avatars.githubusercontent.com/u/14985020?s=200&v=4" alt="Vercel Logo" />
+          <img height="96" src="https://avatars.githubusercontent.com/u/14985020?s=200&v=4" alt="Vercel Logo" />
         </a><br />
         <div>Vercel</div>
         <sub>☁️</sub>

package/commands/add.js

@@ -3,12 +3,33 @@
 import * as y from "yoctocolors"
 import open from "open"
 import clipboard from "clipboardy"
-import { select, input, password } from "@inquirer/prompts"
+import { select, input, password, number } from "@inquirer/prompts"
 import { requireFramework } from "../lib/detect.js"
 import { updateEnvFile } from "../lib/write-env.js"
 import { providers, frameworks } from "../lib/meta.js"
-import { secret } from "./index.js"
 import { link, markdownToAnsi } from "../lib/markdown.js"
+import { appleGenSecret } from "../lib/apple-gen-secret.js"
+
+/**
+ * @param {string} label
+ * @param {string} [defaultValue]
+ */
+async function promptInput(label, defaultValue) {
+  return input({
+    message: `Paste ${y.magenta(label)}:`,
+    validate: (value) => !!value,
+    default: defaultValue,
+  })
+}
+
+/** @param {string} label */
+async function promptPassword(label) {
+  return password({
+    message: `Paste ${y.magenta(label)}:`,
+    mask: true,
+    validate: (value) => !!value,
+  })
+}
 
 const choices = Object.entries(providers)
   .filter(([, { setupUrl }]) => !!setupUrl)
@@ -17,19 +38,19 @@ const choices = Object.entries(providers)
 /** @param {string | undefined} providerId */
 export async function action(providerId) {
   try {
-    if (!providerId) {
-      providerId = await select({
+    const pid =
+      providerId ??
+      (await select({
         message: "What provider do you want to set up?",
         choices: choices,
-      })
-    }
+      }))
 
-    const provider = providers[providerId]
+    const provider = providers[pid]
     if (!provider?.setupUrl) {
       console.error(
         y.red(
           `Missing instructions for ${
-            provider?.name ?? providerId
+            provider?.name ?? pid
           }.\nInstructions are available for: ${y.bold(
             choices.map((choice) => choice.name).join(", ")
           )}`
@@ -78,35 +99,48 @@ ${y.bold("Callback URL (copied to clipboard)")}: ${url}`
 
     await open(provider.setupUrl)
 
-    const clientId = await input({
-      message: `Paste ${y.magenta("Client ID")}:`,
-      validate: (value) => !!value,
-    })
-    const clientSecret = await password({
-      message: `Paste ${y.magenta("Client secret")}:`,
-      mask: true,
-      validate: (value) => !!value,
-    })
+    if (providerId === "apple") {
+      const clientId = await promptInput("Client ID")
+      const keyId = await promptInput("Key ID")
+      const teamId = await promptInput("Team ID")
+      const privateKey = await input({
+        message: "Path to Private Key",
+        validate: (value) => !!value,
+        default: "./private-key.p8",
+      })
 
-    console.log(y.dim(`Updating environment variable file...`))
+      const expiresInDays =
+        (await number({
+          message: "Expires in days (default: 180)",
+          required: false,
+          default: 180,
+        })) ?? 180
 
-    const varPrefix = `AUTH_${providerId.toUpperCase()}`
+      console.log(y.dim("Updating environment variable file..."))
 
-    await updateEnvFile({
-      [`${varPrefix}_ID`]: clientId,
-      [`${varPrefix}_SECRET`]: clientSecret,
-    })
+      await updateEnvFile({ AUTH_APPLE_ID: clientId })
 
-    console.log(
-      y.dim(
-        `\nEnsuring that ${link(
-          "AUTH_SECRET",
-          "https://authjs.dev/getting-started/installation#setup-environment"
-        )} is set...`
-      )
-    )
+      const secret = await appleGenSecret({
+        teamId,
+        clientId,
+        keyId,
+        privateKey,
+        expiresInDays,
+      })
+
+      await updateEnvFile({ AUTH_APPLE_SECRET: secret })
+    } else {
+      const clientId = await promptInput("Client ID")
+      const clientSecret = await promptPassword("Client Secret")
 
-    await secret.action({})
+      console.log(y.dim("Updating environment variable file..."))
+
+      const varPrefix = `AUTH_${pid.toUpperCase()}`
+      await updateEnvFile({
+        [`${varPrefix}_ID`]: clientId,
+        [`${varPrefix}_SECRET`]: clientSecret,
+      })
+    }
 
     console.log("\n🎉 Done! You can now use this provider in your app.")
   } catch (error) {

package/commands/secret.js

@@ -48,7 +48,7 @@ export async function action(options) {
 
   try {
     await requireFramework(options.path)
-    await updateEnvFile({ [key]: value }, options.path, true)
+    await updateEnvFile({ [key]: value }, options.path)
   } catch (error) {
     console.error(y.red(error))
   }

package/lib/apple-gen-secret.js

@@ -0,0 +1,101 @@
+import fs from "node:fs"
+import path from "node:path"
+import * as y from "yoctocolors"
+
+/**
+ * Generates an Apple client secret.
+ *
+ * @param {object} options
+ * @param {string} options.teamId - Apple Team ID.
+ * @param {string} options.clientId - Apple Client ID.
+ * @param {string} options.keyId - Apple Key ID.
+ * @param {string} options.privateKey - Apple Private Key.
+ * @param {number} options.expiresInDays - Days until the secret expires.
+ *
+ * @see https://developer.apple.com/documentation/accountorganizationaldatasharing/creating-a-client-secret
+ */
+export async function appleGenSecret({
+  teamId: iss,
+  clientId: sub,
+  keyId: kid,
+  privateKey,
+  expiresInDays,
+}) {
+  const expiresIn = 86400 * expiresInDays
+  const exp = Math.ceil(Date.now() / 1000) + expiresIn
+
+  const secret = await signJWT(sub, iss, kid, privateKey, exp)
+
+  console.log(
+    y.green(
+      `Apple client secret generated. Valid until: ${new Date(exp * 1000)}`
+    )
+  )
+
+  return secret
+}
+
+/**
+ *
+ * @param {string} sub - Apple client ID.
+ * @param {string} iss - Apple team ID.
+ * @param {string} kid - Apple key ID.
+ * @param {string} privateKeyPath - Apple private key.
+ * @param {Date} exp - Expiry date.
+ */
+async function signJWT(sub, iss, kid, privateKeyPath, exp) {
+  const header = { alg: "ES256", kid }
+
+  const payload = {
+    iss,
+    iat: Date.now() / 1000,
+    exp,
+    aud: "https://appleid.apple.com",
+    sub,
+  }
+
+  const parts = [
+    toBase64Url(encoder.encode(JSON.stringify(header))),
+    toBase64Url(encoder.encode(JSON.stringify(payload))),
+  ]
+
+  const privateKey = fs.readFileSync(path.resolve(privateKeyPath), "utf8")
+
+  const signature = await sign(parts.join("."), privateKey)
+
+  parts.push(toBase64Url(signature))
+  return parts.join(".")
+}
+
+const encoder = new TextEncoder()
+function toBase64Url(data) {
+  return btoa(String.fromCharCode(...new Uint8Array(data)))
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=+$/, "")
+}
+
+async function sign(data, private_key) {
+  const pem = private_key.replace(
+    /-----BEGIN PRIVATE KEY-----|\n|-----END PRIVATE KEY-----/g,
+    ""
+  )
+  const binaryDerString = atob(pem)
+  const binaryDer = new Uint8Array(
+    [...binaryDerString].map((char) => char.charCodeAt(0))
+  )
+
+  const privateKey = await globalThis.crypto.subtle.importKey(
+    "pkcs8",
+    binaryDer.buffer,
+    { name: "ECDSA", namedCurve: "P-256" },
+    true,
+    ["sign"]
+  )
+
+  return await globalThis.crypto.subtle.sign(
+    { name: "ECDSA", hash: { name: "SHA-256" } },
+    privateKey,
+    encoder.encode(data)
+  )
+}

package/lib/meta.js

@@ -56,7 +56,19 @@ export const providers = {
   coinbase: { name: "Coinbase", setupUrl: undefined },
   credentials: { name: "Credentials", setupUrl: undefined },
   descope: { name: "Descope", setupUrl: undefined },
-  discord: { name: "Discord", setupUrl: undefined },
+  discord: {
+    name: "Discord",
+    setupUrl: "https://discord.com/developers/applications",
+    instructions: `\
+      1. Click on *New Application*
+      2. Set *Application name* (can be anything)
+      3. Click on *OAuth2* in the side menu
+      4. Click on *Add Redirect* and paste the callback URI (on your clipboard)
+      5. Click on *Save Changes*
+      6. Copy and paste the *Client ID*
+      7. Copy and paste the *Client Secret*
+      `,
+  },
   dribbble: { name: "Dribbble", setupUrl: undefined },
   dropbox: { name: "Dropbox", setupUrl: undefined },
   "duende-identity-server6": {
@@ -98,7 +110,21 @@ export const providers = {
   kakao: { name: "Kakao", setupUrl: undefined },
   keycloak: { name: "Keycloak", setupUrl: undefined },
   line: { name: "Line", setupUrl: undefined },
-  linkedin: { name: "LinkedIn", setupUrl: undefined },
+  linkedin: {
+    name: "LinkedIn",
+    setupUrl: "https://linkedin.com/developers/apps",
+    instructions: `\
+      1. Click on *Create app*
+      2. Set *App name* (can be anything)
+      3. Create a *LinkedIn page*
+      4. Set *LinkedIn Page URL* (LinkedIn page you created)
+      5. Set *App logo* (can be anything)
+      6. Navigate to *Auth* in the top menu
+      7. Set *Authorized redirect URLs for your app* (paste the callback URI on your clipboard)
+      8. Copy and paste the *Client ID*
+      9. Copy and paste the *Primary Client Secret*
+      `,
+  },
   mailchimp: { name: "Mailchimp", setupUrl: undefined },
   mailru: { name: "Mail.ru", setupUrl: undefined },
   mastodon: { name: "Mastodon", setupUrl: undefined },

package/lib/write-env.js

@@ -13,7 +13,7 @@ import { detectFramework } from "./detect.js"
  * @param {string|undefined} envPath
  * @param {boolean} comment
  */
-export async function updateEnvFile(env, envPath = "", comment = false) {
+export async function updateEnvFile(env, envPath = "", comment = true) {
   const framework = await detectFramework(envPath)
   const dotEnvFile = frameworks[framework]?.envFile
   const file = join(process.cwd(), envPath, dotEnvFile)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "homepage": "https://cli.authjs.dev",
   "repository": {
     "type": "git",
@@ -32,20 +32,21 @@
     "cli"
   ],
   "dependencies": {
-    "@inkeep/ai-api": "0.7.2",
+    "@inkeep/ai-api": "0.8.0",
     "@inquirer/prompts": "5.1.0",
     "clipboardy": "4.0.0",
     "commander": "12.1.0",
     "open": "10.1.0",
-    "ora": "8.0.1",
+    "ora": "8.1.0",
     "prompts": "2.4.2",
-    "yoctocolors": "2.1.0"
+    "yoctocolors": "2.1.1",
+    "zod": "3.23.8"
   },
   "prettier": {
     "semi": false
   },
   "devDependencies": {
-    "@types/node": "^20.14.9"
+    "@types/node": "18"
   },
   "engines": {
     "node": ">=18"