Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(auth): move auth providers into separate packages #7019

Merged
merged 26 commits into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 4 additions & 34 deletions packages/auth-providers-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions packages/auth-providers-api/src/index.ts
Original file line number Diff line number Diff line change
@@ -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'
1 change: 0 additions & 1 deletion packages/auth-providers-setup/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/** @type {import('@jest/types').Config.InitialOptions} */
module.exports = {
testEnvironment: 'jest-environment-jsdom',
testPathIgnorePatterns: ['fixtures', 'dist'],
}
7 changes: 2 additions & 5 deletions packages/auth-providers-setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
35 changes: 0 additions & 35 deletions packages/auth-providers-setup/src/clerk/setup.ts

This file was deleted.

93 changes: 0 additions & 93 deletions packages/auth-providers-setup/src/dbAuth/setup.ts

This file was deleted.

This file was deleted.

41 changes: 7 additions & 34 deletions packages/auth-providers-setup/src/ethereum/setup.ts
Original file line number Diff line number Diff line change
@@ -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)
}
35 changes: 35 additions & 0 deletions packages/auth-providers-setup/src/ethereum/setupHandler.ts
Original file line number Diff line number Diff line change
@@ -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!',
],
})
}
30 changes: 7 additions & 23 deletions packages/auth-providers-setup/src/goTrue/setup.ts
Original file line number Diff line number Diff line change
@@ -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)
}
24 changes: 24 additions & 0 deletions packages/auth-providers-setup/src/goTrue/setupHandler.ts
Original file line number Diff line number Diff line change
@@ -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',
],
})
}
Loading