Moving logic from templates to libs

.github/workflows/waspc-ci.yaml

@@ -107,10 +107,14 @@ jobs:
           npm ci
           npm test
 
-      - name: Compile TS packages and move it into the Cabal data dir
+      - name: Compile TS packages and move them into the Cabal data dir
         if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13'
         run: ./tools/install_packages_to_data_dir.sh
 
+      - name: Compile Wasp libs and move them 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/Deps.hs

@@ -13,6 +13,8 @@ import Wasp.Cli.Terminal (title)
 import qualified Wasp.ExternalConfig.Npm.Dependency as Npm.Dependency
 import qualified Wasp.Generator.NpmDependencies as N
 import qualified Wasp.Generator.ServerGenerator as ServerGenerator
+import qualified Wasp.Generator.WaspLibs.AvailableLibs as WaspLibs.AvailableLibs
+import qualified Wasp.Generator.WaspLibs.WaspLib as WaspLib
 import qualified Wasp.Generator.WebAppGenerator as WebAppGenerator
 import Wasp.Project (analyzeWaspProject)
 import qualified Wasp.Util.Terminal as Term
@@ -27,24 +29,25 @@ deps = do
       (throwError . CommandError "Determining dependencies failed due to a compilation error in your Wasp project" . unwords)
       return
       appSpecOrAnalyzerErrors
+  waspLibs <- liftIO WaspLibs.AvailableLibs.makeWaspLibs
 
-  liftIO $ putStrLn $ depsMessage appSpec
+  liftIO $ putStrLn $ depsMessage appSpec waspLibs
 
-depsMessage :: AppSpec -> String
-depsMessage appSpec =
+depsMessage :: AppSpec -> [WaspLib.WaspLib] -> String
+depsMessage appSpec waspLibs =
   unlines $
     [ "",
       title "Below are listed the dependencies that Wasp uses in your project. You can import and use these directly in the code as if you specified them yourself, but you can't change their versions.",
       ""
     ]
       ++ printDeps
         "Server dependencies:"
-        ( N.waspDependencies $ ServerGenerator.npmDepsForWasp appSpec
+        ( N.waspDependencies $ ServerGenerator.npmDepsForWasp appSpec waspLibs
         )
       ++ [""]
       ++ printDeps
         "Server devDependencies:"
-        ( N.waspDevDependencies $ ServerGenerator.npmDepsForWasp appSpec
+        ( N.waspDevDependencies $ ServerGenerator.npmDepsForWasp appSpec waspLibs
         )
       ++ [""]
       ++ printDeps

waspc/data/.gitignore

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

waspc/data/Generator/templates/Dockerfile

@@ -38,6 +38,11 @@ COPY package-lock.json .
 COPY tsconfig*.json .
 COPY server .wasp/build/server
 COPY sdk .wasp/out/sdk
+# We copy Wasp libs twice, because server needs them in .wasp/build/libs
+# and SDK needs them in .wasp/out/libs becuase the SDK needs to live in the
+# out directory to be accessible to the client code: https://github.com/wasp-lang/wasp/issues/1769
+COPY libs .wasp/build/libs
+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

@@ -1,14 +1,13 @@
 {{={= =}=}}
-import { useState, createContext, useMemo } from 'react'
+import { useState, useMemo, type CSSProperties } from 'react'
+import { AuthContext, type ErrorMessage } from '@wasp.sh/lib-auth/sdk/browser'
 import styles from './Auth.module.css'
 import './internal/auth-styles.css'
 import { tokenObjToCSSVars } from "./internal/util"
-import { CSSProperties } from "react"
 
 import {
   type State,
   type CustomizationOptions,
-  type ErrorMessage,
   type AdditionalSignupFields,
 } from './types'
 import { LoginSignupForm } from './internal/common/LoginSignupForm'
@@ -24,14 +23,6 @@ const logoStyle = {
 }
 
 
-// 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,12 +1,11 @@
 {{={= =}=}}
-import { useContext } from 'react'
 import { useForm, UseFormReturn } from 'react-hook-form'
 import styles from './LoginSignupForm.module.css'
 import '../auth-styles.css'
 import { config } from 'wasp/client'
 import { clsx } from '../util'
 
-import { AuthContext } from '../../Auth'
+import { useAuthContext } from '@wasp.sh/lib-auth/sdk/browser'
 import {
   Form,
   FormInput,
@@ -81,7 +80,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/lib-auth/sdk/browser'
+
 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/lib-auth/sdk/browser'
+
+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/lib-auth/sdk/browser'
 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

@@ -46,12 +46,6 @@ export type CustomizationOptions = {
   }
 }
 
-// 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/lib-auth/sdk";
 
-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/lib-auth/sdk";

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/lib-auth/sdk";

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

@@ -1,13 +1,13 @@
+import { parseCookies } from "@wasp.sh/lib-auth/server";
 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,

waspc/e2e-tests/GoldenTest.hs

@@ -24,7 +24,7 @@ import ShellCommands
 import qualified StrongPath as SP
 import System.Directory (doesFileExist)
 import System.Directory.Recursive (getDirFiltered)
-import System.FilePath (makeRelative, takeFileName)
+import System.FilePath (isExtensionOf, makeRelative, takeFileName)
 import qualified System.FilePath as FP
 import System.Process (callCommand)
 import Test.Tasty (TestTree, testGroup)
@@ -115,6 +115,7 @@ runGoldenTest goldenTest = do
                     "tsconfig.tsbuildinfo",
                     "dist"
                   ]
+        && not (isTgzFile filePath)
 
     writeExpectedFilesList :: String -> [FilePath] -> FilePath -> IO ()
     writeExpectedFilesList baseAbsFp filesForCheckingExistenceAbsFps expectedFilesListAbsFp = do
@@ -150,3 +151,6 @@ runGoldenTest goldenTest = do
           where
             unsafeDecodeAnyJson :: B.ByteString -> Aeson.Value
             unsafeDecodeAnyJson = fromJust . Aeson.decodeStrict
+
+    isTgzFile :: FilePath -> Bool
+    isTgzFile = (".tgz" `isExtensionOf`)