Skip to content

fix(dbAuth): add required packages to setup command #6698

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 14, 2022
Merged

fix(dbAuth): add required packages to setup command #6698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10296a2
fix: add required packages
jtoar Oct 13, 2022
38d1075
fix: pass webAuthn param to task
jtoar Oct 13, 2022
b8b1c7e
Merge branch 'main' into ds-fix-setup-dbAuthn
jtoar Oct 13, 2022
8a708ab
chore: update test project fixture
jtoar Oct 13, 2022
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
1 change: 1 addition & 0 deletions __fixtures__/test-project/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@redwoodjs/api": "3.2.0",
"@redwoodjs/auth-providers-api": "^0.0.1",
"@redwoodjs/graphql-server": "3.2.0"
}
}
1 change: 1 addition & 0 deletions __fixtures__/test-project/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
},
"dependencies": {
"@redwoodjs/auth": "3.2.0",
"@redwoodjs/auth-providers-web": "^0.0.1",
"@redwoodjs/forms": "3.2.0",
"@redwoodjs/router": "3.2.0",
"@redwoodjs/web": "3.2.0",
Expand Down
10 changes: 2 additions & 8 deletions packages/auth-providers-setup/src/dbAuth/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,10 @@ export const handler = async ({
webAuthn,
webPackages: webAuthn
? webAuthnWebPackages
: [
// TODO: Add this when packages are published
// '@redwoodjs/auth-providers-web'
],
: ['@redwoodjs/auth-providers-web'],
apiPackages: webAuthn
? webAuthnApiPackages
: [
// TODO: Add this when packages are published
// '@redwoodjs/auth-providers-api'
],
: ['@redwoodjs/auth-providers-api'],
extraTask: webAuthn ? webAuthnExtraTask : extraTask,
notes: webAuthn ? webAuthnNotes : notes,
})
Expand Down
4 changes: 2 additions & 2 deletions packages/auth-providers-setup/src/dbAuth/webAuthn.setupData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ export { extraTask } from './setupData'

// required packages to install on the web side
export const webPackages = [
// '@redwoodjs/auth-providers-web',
'@redwoodjs/auth-providers-web',
'@simplewebauthn/browser',
]

// required packages to install on the api side
export const apiPackages = [
// '@redwoodjs/auth-providers-api',
'@redwoodjs/auth-providers-api',
'@simplewebauthn/server',
]

Expand Down
2 changes: 1 addition & 1 deletion packages/cli-helpers/src/auth/setupHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const standardAuthHandler = async ({
const tasks = new Listr<never>(
[
generateAuthApiFiles(basedir, provider, force, webAuthn),
addAuthConfigToWeb(basedir, provider),
addAuthConfigToWeb(basedir, provider, webAuthn),
addAuthConfigToGqlApi(authDecoderImport),
addWebPackages(webPackages, rwVersion),
addApiPackages(apiPackages),
Expand Down