Adds flags to skip prompting of WebAuthn install for headless commands

packages/api/package.json

@@ -32,7 +32,6 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.16.7",
     "@prisma/client": "3.15.2",
-    "base64url": "3.0.1",
     "core-js": "3.23.5",
     "cross-undici-fetch": "0.4.14",
     "crypto-js": "4.1.1",
@@ -59,6 +58,7 @@
     "@types/split2": "3.2.1",
     "@types/uuid": "8.3.4",
     "aws-lambda": "1.0.7",
+    "base64url": "3.0.1",
     "jest": "27.5.1",
     "split2": "4.1.0",
     "typescript": "4.7.4"

packages/cli/src/commands/generate/dbAuth/dbAuth.js

@@ -86,6 +86,13 @@ export const builder = (yargs) => {
       type: 'boolean',
       default: false,
     })
+    .option('webauthn', {
+      alias: 'w',
+      default: null,
+      description: 'Include WebAuthn support (TouchID/FaceID)',
+      type: 'boolean',
+    })
+
     .epilogue(
       `Also see the ${terminalLink(
         'Redwood CLI Reference',
@@ -249,16 +256,20 @@ const tasks = ({
   )
 }
 
-export const handler = async (options) => {
-  const response = await prompts({
-    type: 'confirm',
-    name: 'answer',
-    message: `Enable WebAuthn support (TouchID/FaceID) on LoginPage? See https://redwoodjs.com/docs/auth/dbAuth#webAuthn`,
-    initial: false,
-  })
-  const webAuthn = response.answer
+export const handler = async (yargs) => {
+  let includeWebAuthn = yargs.webauthn
+
+  if (includeWebAuthn === null) {
+    const response = await prompts({
+      type: 'confirm',
+      name: 'answer',
+      message: `Enable WebAuthn support (TouchID/FaceID) on LoginPage? See https://redwoodjs.com/docs/auth/dbAuth#webAuthn`,
+      initial: false,
+    })
+    includeWebAuthn = response.answer
+  }
 
-  const t = tasks({ ...options, webAuthn })
+  const t = tasks({ ...yargs, webAuthn: includeWebAuthn })
 
   try {
     await t.run()

packages/cli/src/commands/setup/auth/auth.js

@@ -31,6 +31,8 @@ const OUTPUT_PATHS = {
   ),
 }
 
+const WEBAUTHN_SUPPORTED_PROVIDERS = ['dbAuth']
+
 const getWebAppPath = () => getPaths().web.app
 
 const getSupportedProviders = () =>
@@ -313,6 +315,12 @@ export const builder = (yargs) => {
       description: 'Overwrite existing configuration',
       type: 'boolean',
     })
+    .option('webauthn', {
+      alias: 'w',
+      default: null,
+      description: 'Include WebAuthn support (TouchID/FaceID)',
+      type: 'boolean',
+    })
     .epilogue(
       `Also see the ${terminalLink(
         'Redwood CLI Reference',
@@ -324,7 +332,7 @@ export const builder = (yargs) => {
 export const handler = async (yargs) => {
   const { provider, rwVersion } = yargs
   let force = yargs.force
-  let webAuthn = false
+  let includeWebAuthn = yargs.webauthn
   let providerData
 
   // check if api/src/lib/auth.js already exists and if so, ask the user to overwrite
@@ -344,18 +352,22 @@ export const handler = async (yargs) => {
   }
 
   // only dbAuth supports WebAuthn right now, but in theory it could work with
-  // any provider
-  if (provider === 'dbAuth') {
+  // any provider, so we'll do a check here and potentially use any other
+  // providers webAuthn version of templates
+  if (
+    includeWebAuthn === null &&
+    WEBAUTHN_SUPPORTED_PROVIDERS.includes(provider)
+  ) {
     const webAuthnResponse = await prompts({
       type: 'confirm',
       name: 'answer',
       message: `Enable WebAuthn support (TouchID/FaceID)? See https://redwoodjs.com/docs/auth/dbAuth#webAuthn`,
       initial: false,
     })
-    webAuthn = webAuthnResponse.answer
+    includeWebAuthn = webAuthnResponse.answer
   }
 
-  if (webAuthn) {
+  if (includeWebAuthn) {
     providerData = await import(`./providers/${provider}.webAuthn`)
   } else {
     providerData = await import(`./providers/${provider}`)
@@ -367,9 +379,12 @@ export const handler = async (yargs) => {
         title: 'Generating auth lib...',
         task: (_ctx, task) => {
           if (apiSrcDoesExist()) {
-            return writeFilesTask(files({ ...yargs, webAuthn }), {
-              overwriteExisting: force,
-            })
+            return writeFilesTask(
+              files({ ...yargs, webAuthn: includeWebAuthn }),
+              {
+                overwriteExisting: force,
+              }
+            )
           } else {
             task.skip('api/src not found, skipping')
           }

packages/cli/src/commands/setup/auth/providers/dbAuth.webAuthn.js

@@ -20,7 +20,7 @@ export const config = {
 
 // required packages to install
 export const webPackages = ['@simplewebauthn/browser']
-export const apiPackages = ['@simplewebauthn/server']
+export const apiPackages = ['@simplewebauthn/server', 'base64url']
 
 // any notes to print out when the job is done
 export const notes = [

tasks/test-project/tasks.js

@@ -307,7 +307,7 @@ async function apiTasks(outputPath, { verbose, linkWithLatestFwBuild }) {
 
   const addDbAuth = async () => {
     await execa(
-      'yarn rw setup auth dbAuth --force',
+      'yarn rw setup auth dbAuth --force --no-webauthn',
       [],
       getExecaOptions(outputPath)
     )
@@ -316,7 +316,11 @@ async function apiTasks(outputPath, { verbose, linkWithLatestFwBuild }) {
       await execa('yarn rwfw project:copy', [], getExecaOptions(outputPath))
     }
 
-    await execa('yarn rw g dbAuth', [], getExecaOptions(outputPath))
+    await execa(
+      'yarn rw g dbAuth --no-webauthn',
+      [],
+      getExecaOptions(outputPath)
+    )
 
     // add dbAuth User model
     const { user } = await import('./codemods/models.js')