Moving logic from templates to libs

.github/workflows/waspc-ci.yaml

@@ -111,6 +111,10 @@ jobs:
         if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13'
         run: ./tools/install_packages_to_data_dir.sh
 
+      - name: Compile Wasp libs and move it into the Cabal data dir
+        if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13'
+        run: ./tools/install_libs_to_data_dir.sh
+
       - name: Build external dependencies
         run: cabal build --enable-tests --enable-benchmarks --only-dependencies
 

waspc/cli/src/Wasp/Cli/Command/Build.hs

@@ -23,6 +23,7 @@ import Wasp.CompileOptions (CompileOptions (..))
 import Wasp.Generator.Common (ProjectRootDir)
 import Wasp.Generator.Monad (GeneratorWarning (GeneratorNeedsMigrationWarning))
 import Wasp.Generator.SdkGenerator.Common (sdkRootDirInGeneratedCodeDir, sdkRootDirInProjectRootDir)
+import Wasp.Generator.WaspLibs.Common (libsRootDirInGeneratedCodeDir)
 import qualified Wasp.Message as Msg
 import Wasp.Project.Common
   ( CompileError,
@@ -108,6 +109,11 @@ build = do
           (waspProjectDir </> dotWaspDirInWaspProjectDir </> generatedCodeDirInDotWaspDir </> sdkRootDirInGeneratedCodeDir)
           (buildDir </> sdkRootDirInGeneratedCodeDir)
 
+      liftIO $
+        copyDirectory
+          (waspProjectDir </> dotWaspDirInWaspProjectDir </> generatedCodeDirInDotWaspDir </> libsRootDirInGeneratedCodeDir)
+          (buildDir </> libsRootDirInGeneratedCodeDir)
+
       let packageJsonInBuildDir = buildDir </> castRel packageJsonInWaspProjectDir
       let packageLockJsonInBuildDir = buildDir </> castRel packageLockJsonInWaspProjectDir
       let tsconfigJsonInBuildDir = buildDir </> castRel srcTsConfigPath

waspc/data/.gitignore

@@ -1 +1,2 @@
 packages
+Generator/libs/*.tgz

waspc/data/Generator/templates/Dockerfile

@@ -38,6 +38,7 @@ COPY package-lock.json .
 COPY tsconfig*.json .
 COPY server .wasp/build/server
 COPY sdk .wasp/out/sdk
+COPY libs .wasp/out/libs
 # Install npm packages, resulting in node_modules/.
 RUN npm install && cd .wasp/build/server && npm install
 {=# usingPrisma =}

waspc/data/Generator/templates/react-app/vite.config.ts

@@ -25,7 +25,7 @@ const defaultViteConfig = {
     detectServerImports(),
   ],
   optimizeDeps: {
-    exclude: ['wasp']
+    exclude:  {=& depsExcludedFromOptimization =}
   },
   server: {
     port: {= defaultClientPort =},

waspc/data/Generator/templates/sdk/wasp/auth/forms/Auth.tsx

@@ -2,11 +2,11 @@
 import { useState, createContext } from 'react'
 import { createTheme } from '@stitches/react'
 import { styled } from 'wasp/core/stitches.config'
+import { AuthContext, type ErrorMessage } from '@wasp.sh/libs-auth/client'
 
 import {
   type State,
   type CustomizationOptions,
-  type ErrorMessage,
   type AdditionalSignupFields,
 } from './types'
 import { LoginSignupForm } from './internal/common/LoginSignupForm'
@@ -38,14 +38,6 @@ const HeaderText = styled('h2', {
 })
 
 
-// PRIVATE API
-export const AuthContext = createContext({
-  isLoading: false,
-  setIsLoading: (isLoading: boolean) => {},
-  setErrorMessage: (errorMessage: ErrorMessage | null) => {},
-  setSuccessMessage: (successMessage: string | null) => {},
-})
-
 function Auth ({ state, appearance, logo, socialLayout = 'horizontal', additionalSignupFields }: {
     state: State;
 } & CustomizationOptions & {

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/common/LoginSignupForm.tsx

@@ -1,10 +1,9 @@
 {{={= =}=}}
-import { useContext } from 'react'
 import { useForm, UseFormReturn } from 'react-hook-form'
 import { styled } from 'wasp/core/stitches.config'
 import { config } from 'wasp/client'
 
-import { AuthContext } from '../../Auth'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
 import {
   Form,
   FormInput,
@@ -146,7 +145,7 @@ export const LoginSignupForm = ({
     setErrorMessage,
     setSuccessMessage,
     setIsLoading,
-  } = useContext(AuthContext)
+  } = useAuthContext();
   const isLogin = state === 'login'
   const cta = isLogin ? 'Log in' : 'Sign up';
   {=# isAnyPasswordBasedAuthEnabled =}

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/ForgotPasswordForm.tsx

@@ -1,13 +1,14 @@
-import { useContext } from 'react'
 import { useForm } from 'react-hook-form'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
+
 import { requestPasswordReset } from '../../../email/actions/passwordReset.js'
 import { Form, FormItemGroup, FormLabel, FormInput, SubmitButton, FormError } from '../Form'
-import { AuthContext } from '../../Auth'
+
 
 // PRIVATE API
 export const ForgotPasswordForm = () => {
   const { register, handleSubmit, reset, formState: { errors } } = useForm<{ email: string }>()
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
 
   const onSubmit = async (data) => {
     setIsLoading(true)

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/ResetPasswordForm.tsx

@@ -1,14 +1,14 @@
-import { useContext } from 'react'
 import { useForm } from 'react-hook-form'
-import { resetPassword } from '../../../email/actions/passwordReset.js'
 import { useLocation } from 'react-router-dom'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
+
+import { resetPassword } from '../../../email/actions/passwordReset.js'
 import { Form, FormItemGroup, FormLabel, FormInput, SubmitButton, FormError } from '../Form'
-import { AuthContext } from '../../Auth'
 
 // PRIVATE API
 export const ResetPasswordForm = () => {
   const { register, handleSubmit, reset, formState: { errors } } = useForm<{ password: string; passwordConfirmation: string }>()
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
   const location = useLocation()
   const token = new URLSearchParams(location.search).get('token')
   const onSubmit = async (data) => {

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/VerifyEmailForm.tsx

@@ -1,12 +1,12 @@
-import { useContext, useEffect } from 'react'
+import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
 import { verifyEmail } from '../../../email/actions/verifyEmail.js'
 import { Message } from '../Message'
-import { AuthContext } from '../../Auth'
 
 // PRIVATE API
 export const VerifyEmailForm = () => {
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
   const location = useLocation()
   const token = new URLSearchParams(location.search).get('token')
 

waspc/data/Generator/templates/sdk/wasp/auth/forms/types.ts

@@ -21,12 +21,6 @@ export type CustomizationOptions = {
   appearance?: Parameters<typeof createTheme>[0]
 }
 
-// PRIVATE API
-export type ErrorMessage = {
-  title: string
-  description?: string
-}
-
 // PRIVATE API
 export type FormState = {
   isLoading: boolean

waspc/data/Generator/templates/sdk/wasp/auth/jwt.ts

@@ -1,22 +1,15 @@
-import * as jwt from 'oslo/jwt'
-import { config } from 'wasp/server'
+import { createJWTHelpers } from "@wasp.sh/libs-auth";
 
-const JWT_SECRET = new TextEncoder().encode(config.auth.jwtSecret)
-const JWT_ALGORITHM = 'HS256'
+import { config } from "wasp/server";
 
-// PRIVATE API
-export function createJWT(
-  data: Parameters<typeof jwt.createJWT>[2],
-  options: Parameters<typeof jwt.createJWT>[3],
-): Promise<string> {
-  return jwt.createJWT(JWT_ALGORITHM, JWT_SECRET, data, options)
-}
+const JWT_SECRET = new TextEncoder().encode(config.auth.jwtSecret);
+const JWT_ALGORITHM = "HS256";
 
 // PRIVATE API
-export async function validateJWT<Payload>(token: string): Promise<Payload> {
-  const { payload } = await jwt.validateJWT(JWT_ALGORITHM, JWT_SECRET, token)
-  return payload as Payload
-}
+export const { createJWT, validateJWT } = createJWTHelpers(
+  JWT_SECRET,
+  JWT_ALGORITHM,
+);
 
 // PRIVATE API
-export { TimeSpan } from 'oslo'
+export { TimeSpan } from "@wasp.sh/libs-auth";

waspc/data/Generator/templates/sdk/wasp/auth/password.ts

@@ -1,36 +1 @@
-import { hash, verify, Version, type Options } from "@node-rs/argon2";
-
-// The options are the same as the ones used in the oslo/password library
-const hashingOptions: Options = {
-  memoryCost: 19456,
-  timeCost: 2,
-  outputLen: 32,
-  parallelism: 1,
-  version: Version.V0x13,
-};
-
-// PRIVATE API
-export async function hashPassword(password: string): Promise<string> {
-  return hash(normalizePassword(password), hashingOptions);
-}
-
-// PRIVATE API
-export async function verifyPassword(
-  hashedPassword: string,
-  password: string
-): Promise<void> {
-  const validPassword = await verify(
-    hashedPassword,
-    normalizePassword(password),
-    hashingOptions
-  );
-  if (!validPassword) {
-    throw new Error("Invalid password");
-  }
-}
-
-// We are normalising the password to ensure that the password is always hashed in the same way
-// We have the same normalising process as oslo/password did in the past
-function normalizePassword(password: string): string {
-  return password.normalize("NFKC");
-}
+export { hashPassword, verifyPassword } from "@wasp.sh/libs-auth";

waspc/data/Generator/templates/server/src/auth/providers/oauth/cookies.ts

@@ -1,13 +1,13 @@
+import { parseCookies } from "@wasp.sh/libs-auth";
 import {
   Request as ExpressRequest,
   Response as ExpressResponse,
-} from 'express';
-import { parseCookies } from 'oslo/cookie';
+} from "express";
 
-import type { ProviderConfig } from 'wasp/auth/providers/types';
-import { config } from 'wasp/server';
+import type { ProviderConfig } from "wasp/auth/providers/types";
+import { config } from "wasp/server";
 
-import type { OAuthStateFieldName } from './state';
+import type { OAuthStateFieldName } from "./state";
 
 export function setOAuthCookieValue(
   provider: ProviderConfig,