chore(auth): move auth providers into separate packages

__fixtures__/test-project/api/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@redwoodjs/api": "3.2.0",
-    "@redwoodjs/auth-providers-api": "^0.0.1",
+    "@redwoodjs/auth-dbauth-api": "0.0.2",
     "@redwoodjs/graphql-server": "3.2.0"
   }
 }

__fixtures__/test-project/api/src/functions/auth.ts

@@ -3,7 +3,7 @@ import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
 import {
   DbAuthHandler,
   DbAuthHandlerOptions,
-} from '@redwoodjs/auth-providers-api'
+} from '@redwoodjs/auth-dbauth-api'
 
 import { db } from 'src/lib/db'
 

__fixtures__/test-project/api/src/functions/graphql.ts

@@ -1,4 +1,4 @@
-import { dbAuthAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'
+import { authDecoder } from '@redwoodjs/auth-dbauth-api'
 import { createGraphQLHandler } from '@redwoodjs/graphql-server'
 
 import directives from 'src/directives/**/*.{js,ts}'

__fixtures__/test-project/package.json

@@ -8,6 +8,7 @@
     ]
   },
   "devDependencies": {
+    "@redwoodjs/auth-dbauth-setup": "0.0.2",
     "@redwoodjs/core": "3.2.0"
   },
   "eslintConfig": {

__fixtures__/test-project/web/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@redwoodjs/auth": "3.2.0",
-    "@redwoodjs/auth-providers-web": "^0.0.1",
+    "@redwoodjs/auth-dbauth-web": "0.0.2",
     "@redwoodjs/forms": "3.2.0",
     "@redwoodjs/router": "3.2.0",
     "@redwoodjs/web": "3.2.0",

__fixtures__/test-project/web/src/auth.ts

@@ -1,3 +1,3 @@
-import { createDbAuth } from '@redwoodjs/auth-providers-web'
+import { createDbAuth } from '@redwoodjs/auth-dbauth-web'
 
 export const { AuthProvider, useAuth } = createDbAuth()

package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "workspaces": [
     "packages/*",
-    "packages/auth-providers/**/*"
+    "packages/auth-providers/*/*"
   ],
   "scripts": {
     "build": "lerna run build",

packages/auth-providers-api/package.json

@@ -25,64 +25,34 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.20.6",
     "core-js": "3.26.1",
-    "jsonwebtoken": "8.5.1",
-    "uuid": "9.0.0"
+    "jsonwebtoken": "8.5.1"
   },
   "devDependencies": {
-    "@auth0/auth0-spa-js": "1.22.5",
-    "@azure/msal-browser": "2.30.0",
     "@babel/cli": "7.19.3",
     "@babel/core": "7.20.5",
-    "@clerk/clerk-js": "3.17.0",
-    "@clerk/clerk-react": "3.5.1",
-    "@clerk/clerk-sdk-node": "3.9.2",
-    "@clerk/types": "2.21.0",
     "@magic-sdk/admin": "1.4.1",
     "@nhost/hasura-auth-js": "1.4.1",
     "@nhost/nhost-js": "1.4.10",
     "@okta/jwt-verifier": "2.6.0",
     "@okta/okta-auth-js": "6.9.0",
-    "@redwoodjs/auth": "3.2.0",
-    "@redwoodjs/cli-helpers": "3.2.0",
-    "@simplewebauthn/browser": "6.2.1",
-    "@simplewebauthn/typescript-types": "6.2.1",
-    "@supabase/supabase-js": "1.35.7",
+    "@redwoodjs/api": "3.2.0",
+    "@types/aws-lambda": "8.10.107",
     "@types/jsonwebtoken": "8.5.9",
-    "@types/netlify-identity-widget": "1.9.3",
-    "@types/react": "17.0.50",
-    "@types/uuid": "8.3.4",
-    "firebase": "9.10.0",
-    "firebase-admin": "10.3.0",
     "gotrue-js": "0.9.29",
     "jest": "29.3.1",
     "magic-sdk": "9.1.1",
-    "netlify-identity-widget": "1.9.2",
-    "react": "17.0.2",
-    "supertokens-auth-react": "0.26.5",
     "typescript": "4.7.4"
   },
   "peerDependencies": {
-    "@clerk/clerk-react": "3.5.1",
-    "@clerk/clerk-sdk-node": "3.9.2",
     "@magic-sdk/admin": "1.4.1",
-    "@okta/jwt-verifier": "2.6.0",
-    "firebase-admin": "10.3.0"
+    "@okta/jwt-verifier": "2.6.0"
   },
   "peerDependenciesMeta": {
-    "@clerk/clerk-react": {
-      "optional": true
-    },
-    "@clerk/clerk-sdk-node": {
-      "optional": true
-    },
     "@magic-sdk/admin": {
       "optional": true
     },
     "@okta/jwt-verifier": {
       "optional": true
-    },
-    "firebase-admin": {
-      "optional": true
     }
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"

packages/auth-providers-api/src/index.ts

@@ -1,11 +1,5 @@
-export { authDecoder as clerkAuthDecoder } from './clerk/decoder'
-export { authDecoder as dbAuthAuthDecoder } from './dbAuth/decoder'
 export { authDecoder as ethereumAuthDecoder } from './ethereum/decoder'
 export { authDecoder as goTrueAuthDecoder } from './goTrue/decoder'
 export { authDecoder as magicLinkAuthDecoder } from './magicLink/decoder'
 export { authDecoder as nhostAuthDecoder } from './nhost/decoder'
 export { authDecoder as oktaAuthDecoder } from './okta/decoder'
-export { authDecoder as supabaseAuthDecoder } from './supabase/decoder'
-export { authDecoder as supertokensAuthDecoder } from './supertokens/decoder'
-
-export { hashPassword, DbAuthHandler, DbAuthHandlerOptions } from './dbAuth'

packages/auth-providers-setup/jest.config.js

@@ -1,5 +1,4 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  testEnvironment: 'jest-environment-jsdom',
   testPathIgnorePatterns: ['fixtures', 'dist'],
 }

packages/auth-providers-setup/package.json

@@ -24,16 +24,13 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.20.6",
-    "@redwoodjs/auth": "3.2.0",
     "@redwoodjs/cli-helpers": "3.2.0",
-    "core-js": "3.26.1",
-    "secure-random-password": "0.2.3"
+    "core-js": "3.26.1"
   },
   "devDependencies": {
     "@babel/cli": "7.19.3",
     "@babel/core": "7.20.5",
-    "@types/react": "17.0.50",
-    "@types/secure-random-password": "0.2.1",
+    "@types/yargs": "17.0.13",
     "jest": "29.3.1",
     "typescript": "4.7.4"
   },

packages/auth-providers-setup/src/ethereum/setup.ts

@@ -1,46 +1,19 @@
 import yargs from 'yargs'
 
-import {
-  standardAuthBuilder,
-  standardAuthHandler,
-} from '@redwoodjs/cli-helpers'
+import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 
 export const command = 'ethereum'
 export const description = 'Generate an auth configuration for Ethereum'
-export const builder = (yargs: yargs.Argv) => {
+
+export function builder(yargs: yargs.Argv) {
   return standardAuthBuilder(yargs)
 }
 
-interface Args {
-  rwVersion: string
+export interface Args {
   force: boolean
 }
 
-export const handler = async ({ rwVersion, force: forceArg }: Args) => {
-  standardAuthHandler({
-    basedir: __dirname,
-    rwVersion,
-    forceArg,
-    provider: 'ethereum',
-    authDecoderImport:
-      "import { ethereumAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
-    apiPackages: [
-      '@redwoodjs/auth-providers-api',
-      'ethereumjs-util',
-      'eth-sig-util',
-      'jsonwebtoken',
-    ],
-    webPackages: [
-      '@redwoodjs/auth-providers-web',
-      '@oneclickdapp/ethereum-auth',
-      '@apollo/client',
-    ],
-    notes: [
-      'There are a couple more things you need to do!',
-      'Please see the readme for instructions:',
-      'https://github.com/oneclickdapp/ethereum-auth',
-      'This is a FOSS community-maintained package.',
-      'Help us make it better!',
-    ],
-  })
+export async function handler(options: Args) {
+  const { handler } = await import('./setupHandler')
+  return handler(options)
 }

packages/auth-providers-setup/src/ethereum/setupHandler.ts

@@ -0,0 +1,35 @@
+import fs from 'fs'
+
+import { standardAuthHandler } from '@redwoodjs/cli-helpers'
+
+import { Args } from './setup'
+
+const { version } = JSON.parse(fs.readFileSync('../package.json', 'utf-8'))
+
+export async function handler({ force: forceArg }: Args) {
+  standardAuthHandler({
+    basedir: __dirname,
+    forceArg,
+    provider: 'ethereum',
+    authDecoderImport:
+      "import { ethereumAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
+    apiPackages: [
+      `@redwoodjs/auth-providers-api@${version}`,
+      'ethereumjs-util',
+      'eth-sig-util',
+      'jsonwebtoken',
+    ],
+    webPackages: [
+      `@redwoodjs/auth-providers-web@${version}`,
+      '@oneclickdapp/ethereum-auth',
+      '@apollo/client',
+    ],
+    notes: [
+      'There are a couple more things you need to do!',
+      'Please see the readme for instructions:',
+      'https://github.com/oneclickdapp/ethereum-auth',
+      'This is a FOSS community-maintained package.',
+      'Help us make it better!',
+    ],
+  })
+}

packages/auth-providers-setup/src/goTrue/setup.ts

@@ -1,35 +1,19 @@
 import yargs from 'yargs'
 
-import {
-  standardAuthBuilder,
-  standardAuthHandler,
-} from '@redwoodjs/cli-helpers'
+import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 
 export const command = 'goTrue'
 export const description = 'Generate an auth configuration for goTrue'
-export const builder = (yargs: yargs.Argv) => {
+
+export function builder(yargs: yargs.Argv) {
   return standardAuthBuilder(yargs)
 }
 
-interface Args {
-  rwVersion: string
+export interface Args {
   force: boolean
 }
 
-export const handler = async ({ rwVersion, force: forceArg }: Args) => {
-  standardAuthHandler({
-    basedir: __dirname,
-    rwVersion,
-    forceArg,
-    provider: 'goTrue',
-    authDecoderImport:
-      "import { goTrueAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
-    apiPackages: ['@redwoodjs/auth-providers-api'],
-    webPackages: ['gotrue-js', '@redwoodjs/auth-providers-web'],
-    notes: [
-      'You will need to enable Identity on your Netlify site and set APIUrl',
-      'to your API endpoint in your GoTrue client config.',
-      'See: https://redwoodjs.com/docs/auth/gotrue',
-    ],
-  })
+export async function handler(options: Args) {
+  const { handler } = await import('./setupHandler')
+  return handler(options)
 }

packages/auth-providers-setup/src/goTrue/setupHandler.ts

@@ -0,0 +1,24 @@
+import fs from 'fs'
+
+import { standardAuthHandler } from '@redwoodjs/cli-helpers'
+
+import { Args } from './setup'
+
+const { version } = JSON.parse(fs.readFileSync('../package.json', 'utf-8'))
+
+export async function handler({ force: forceArg }: Args) {
+  standardAuthHandler({
+    basedir: __dirname,
+    forceArg,
+    provider: 'goTrue',
+    authDecoderImport:
+      "import { goTrueAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
+    apiPackages: [`@redwoodjs/auth-providers-api@${version}`],
+    webPackages: ['gotrue-js', `@redwoodjs/auth-providers-web@${version}`],
+    notes: [
+      'You will need to enable Identity on your Netlify site and set APIUrl',
+      'to your API endpoint in your GoTrue client config.',
+      'See: https://redwoodjs.com/docs/auth/gotrue',
+    ],
+  })
+}

packages/auth-providers-setup/src/index.ts

@@ -1,9 +1,5 @@
-export * as setupAuthClerkCommand from './clerk/setup'
-export * as setupAuthDbAuthCommand from './dbAuth/setup'
 export * as setupAuthEthereumCommand from './ethereum/setup'
 export * as setupAuthGoTrueCommand from './goTrue/setup'
 export * as setupAuthMagicLinkCommand from './magicLink/setup'
 export * as setupAuthNhostCommand from './nhost/setup'
 export * as setupAuthOktaCommand from './okta/setup'
-export * as setupAuthSupabaseCommand from './supabase/setup'
-export * as setupAuthSupertokensCommand from './supertokens/setup'