Merge branch 'main' into tobbe-clerk-simplify-web-impl

redwoodjs · Oct 14, 2022 · 2a0971d · 2a0971d
2 parents 3701e8d + 60e075f
commit 2a0971d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/docs/tutorial/chapter6/comment-form.md b/docs/docs/tutorial/chapter6/comment-form.md
@@ -93,7 +93,7 @@ const CommentForm = () => {
         </Label>
         <TextField
           name="name"
-          className="block w-full p-1 border rounded text-xs "
+          className="block w-full p-1 border rounded text-xs"
           validation={{ required: true }}
         />
 

diff --git a/packages/auth-providers-setup/src/clerk/setup.ts b/packages/auth-providers-setup/src/clerk/setup.ts
@@ -21,6 +21,8 @@ export const handler = async ({ rwVersion, force: forceArg }: Args) => {
     basedir: __dirname,
     rwVersion,
     forceArg,
+    authDecoderImport:
+      "import { clerkAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
     provider: 'clerk',
     webPackages: ['@clerk/clerk-react', '@redwoodjs/auth-providers-web'],
     apiPackages: ['@clerk/clerk-sdk-node', '@redwoodjs/auth-providers-api'],

diff --git a/packages/auth-providers-setup/src/firebase/setup.ts b/packages/auth-providers-setup/src/firebase/setup.ts
@@ -22,11 +22,13 @@ export const handler = async ({ rwVersion, force: forceArg }: Args) => {
     rwVersion,
     forceArg,
     provider: 'firebase',
-    webPackages: ['firebase'],
-    apiPackages: ['firebase-admin'],
+    authDecoderImport:
+      "import { firebaseAuthDecoder as authDecoder } from '@redwoodjs/auth-providers-api'",
+    webPackages: ['firebase', '@redwoodjs/auth-providers-web'],
+    apiPackages: ['firebase-admin', '@redwoodjs/auth-providers-api'],
     notes: [
       'You will need to create several environment variables with your Firebase config options.',
-      'Check out web/src/App.{js,tsx} for the variables you need to add.',
+      'Check out web/src/auth.{js,ts} for the variables you need to add.',
       'See: https://firebase.google.com/docs/web/setup#config-object',
     ],
   })