@wasp.sh/wasp-cli-darwin-x64-unknown 0.25.0 → 0.26.0

package/data/Generator/templates/sdk/wasp/package.json

@@ -5,112 +5,158 @@
   "private": true,
   "type": "module",
   "scripts": {
-      "build": "tsc && node ./scripts/copy-assets.js",
-      "test": "echo \"Error: no test specified\" && exit 1",
-      "types": "tsc --declaration --emitDeclarationOnly --stripInternal --declarationDir dist"
-    },
-  {=! IMPORTANT: If you modify this list, remember to update the spreadsheet at =}
-  {=! https://docs.google.com/spreadsheets/d/1QW-_16KRGTOaKXx9NYUtjk6m2TQ0nUMOA74hBthTH3g/edit =}
+    "build": "tsc && node ./scripts/copy-assets.js",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "types": "tsc --declaration --emitDeclarationOnly --stripInternal --declarationDir dist"
+  },
+  {=!
+    IMPORTANT: If you modify this list, remember to update the spreadsheet at:
+    https://docs.google.com/spreadsheets/d/1QW-_16KRGTOaKXx9NYUtjk6m2TQ0nUMOA74hBthTH3g/edit
+  =}
+  {=!
+    TYPE PORTABILITY CONSTRAINT:
+    Any type that can appear in a user's inferred exported types must be
+    declared in a module reachable through this exports map. Some exports
+    below exist only to satisfy this, so don't remove an export just
+    because nothing imports it directly.
+
+    Why?
+    Server's and client's TypeScript project files reference the user's
+    TypeScript project through project references. This forces the user's
+    tsconfig to set `composite: true` flag which automatically implies
+    `declaration: true`.
+    
+    When declaration emit is enabled, every exported binding without an
+    explicit type annotation gets its inferred type serialized into a
+    `.d.ts` file. A common example is users defining operations while
+    typing them with the `satisfies` keyword:
+
+    ```ts
+    import type { GetNumberOfTasks } from "wasp/server/operations";
+
+    export const getNumberOfTasks = (async (_args, context) => {
+      return context.entities.Task.count();
+    }) satisfies GetNumberOfTasks<void>;
+    ```
+
+    If that inferred type structurally contains a type symbol from this
+    package, `tsc` must synthesize a portable reference to that symbol.
+    E.g., an authenticated operation's context contains a type symbol
+    for `AuthUser`. So we must be able to create a portable reference
+    to `AuthUser`.
+
+    Because `AuthUser` is declared in an exports-reachable module
+    ("./auth/user"), `tsc` can always create a portable reference to it,
+    no matter what the user's code imports. If it were declared in a
+    non-exported module (e.g. `wasp/server/auth/user`), `tsc` could name
+    it only when the user's program happened to load some module
+    re-exporting it, which is not guaranteed, and declaration emit
+    would fail.
+  =}
   "exports": {
-      {=! todo(filip): Check all exports when done with SDK generation =}
-      {=!  Some of the statements in the comments might become incorrect. =}
-      {=!  "our code" means: "web-app", "server" or "SDK", or "some combination of the three". =}
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./core/serialization": "./dist/core/serialization/index.js",
-      "./core/auth": "./dist/core/auth.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/session": "./dist/auth/session.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/user": "./dist/auth/user.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/providers/types": "./dist/auth/providers/types.js",
-      {=!  Used by users, documented. =}
-      "./auth/utils": "./dist/auth/utils.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/password": "./dist/auth/password.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/jwt": "./dist/auth/jwt.js",
-      {=!  Used by user, documented. =}
-      "./auth/validation": "./dist/auth/validation.js",
-      "./src/*": "./dist/src/*.js",
-      {=!  Parts are used by users, documented. Parts are probably used by our code, undocumented (but accessible). =}
-      "./server/utils": "./dist/server/utils.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./server/auth/email": "./dist/server/auth/email/index.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./server/crud/*": "./dist/server/crud/*.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./server/email/core/types": "./dist/server/email/core/types.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./server/auth/email/utils": "./dist/server/auth/email/utils.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./server/jobs/*": "./dist/server/jobs/*.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      {=!  Todo(filip): This export becomes problematic once we start supporting different executors =}
-      "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
+    {=!
+      ===============================================================
+      Public API for users. Documented.
+      These are the modules that users import in their own code.
+      Some of the modules are also imported by the generated server project.
+      Those have additioanl comments saying which exports user/server uses.
+      ===============================================================
+    =}
+    "./auth": "./dist/auth/index.js",
+    {=! FIXME: Documented only in example apps, not in docs. Also re-exported through `wasp/server/auth`.=}
+    {=! FIXME: Candidate for removal? =}
+    {=! Users: validators in custom auth actions. =}
+    {=! Server: the same validators in auth provider routes. =}
+    "./auth/validation": "./dist/auth/validation.js",
+    "./client": "./dist/client/index.js",
+    "./client/api": "./dist/api/index.js",
+    "./client/auth": "./dist/client/auth/index.js",
+    "./client/crud": "./dist/client/crud/index.js",
+    {=! Users: operation functions and hooks.  =}
+    {=! Client: initializeQueryClient in the app entry. =}
+    "./client/operations": "./dist/client/operations/index.js",
+    "./client/router": "./dist/client/router/index.js",
+    "./client/test": "./dist/client/test/index.js",
+    "./client/vite": "./dist/client/vite/index.js",
+    "./client/webSocket": "./dist/client/webSocket/index.js",
+    {=! Users: entity types. =}
+    {=! Server: the auth entity type. =}
+    "./entities": "./dist/entities/index.js",
+    "./env": "./dist/env/index.js",
+    {=! FIXME: Documented only in example apps, not in docs. =}
+    "./serialization": "./dist/serialization/index.js",
+    {=! Users: config, prisma, env, HttpError, type ServerSetupFn, type DbSeedFn, type MiddlewareConfigFn. =}
+    {=! Server: config, prisma, env, HttpError, ServerSetupFn, DbSeedFn. =}
+    "./server": "./dist/server/index.js",
+    "./server/api": "./dist/server/api/index.js",
+    {=! Users: signup field helpers and validators.  =}
+    {=! Server: OAuth provider definitions, tokenStore, OAuthData. =}
+    "./server/auth": "./dist/server/auth/index.js",
+    "./server/crud": "./dist/server/crud/index.js",
+    "./server/email": "./dist/server/email/index.js",
+    "./server/jobs": "./dist/server/jobs/index.js",
+    "./server/operations": "./dist/server/operations/index.js",
+    {=! Users: type WebSocketDefinition, type WaspSocketData. =}
+    {=! Server: type ServerType. =}
+    "./server/webSocket": "./dist/server/webSocket/index.js",
 
-      {=! Still needed, reconsider during refactoring. =}
-      "./server/types": "./dist/server/types/index.js",
-      {=! Used by the framework server code, reconsider during refactoring. =}
-      "./server/middleware": "./dist/server/middleware/index.js",
+    {=!
+      ===============================================================
+      Internal runtime agnostic API. Undocumented.
+      ===============================================================
+    =}
+    "./auth/user": "./dist/auth/user.js",
+    "./core/serialization": "./dist/core/serialization/index.js",
+    "./auth/providers": "./dist/auth/providers/index.js",
+    "./auth/providers/types": "./dist/auth/providers/types.js",
+    "./types": "./dist/types/index.js",
 
-      {=! Public: { config, prisma, type ServerSetupFn, HttpError, type DbSeedFn, type MiddlewareConfigFn } =}
-      {=! Private: [] =}
-      "./server": "./dist/server/index.js",
-      {=! Public: { type MyApiRoute1, type MyApiRoute2, ... }  =}
-      {=! Private: [] =}
-      "./server/api": "./dist/server/api/index.js",
-      {=! Public: { api }  =}
-      {=! Private: [sdk] =}
-      "./client/api": "./dist/api/index.js",
-      {=! Public: { type ServerToClientPayload, type ClientToServerPayload, useSocket, useSocketListener } =}
-      {=! Private: [] =}
-      "./client/webSocket": "./dist/client/webSocket/index.js",
-      {=! Public: { type WebSocketDefinition, type WaspSocketData } =}
-      {=! Private: [server, sdk] =}
-      "./server/webSocket": "./dist/server/webSocket/index.js",
-      "./entities": "./dist/entities/index.js",
-      "./auth": "./dist/auth/index.js",
-      "./auth/providers": "./dist/auth/providers/index.js",
-      "./client/auth": "./dist/client/auth/index.js",
-      "./client/operations": "./dist/client/operations/index.js",
-      "./server/auth": "./dist/server/auth/index.js",
-      "./server/crud": "./dist/server/crud/index.js",
-      "./client/crud": "./dist/client/crud/index.js",
-      "./server/email": "./dist/server/email/index.js",
-      "./server/jobs": "./dist/server/jobs/index.js",
-      "./server/operations": "./dist/server/operations/index.js",
-      "./client/router": "./dist/client/router/index.js",
-      "./client/test": "./dist/client/test/index.js",
-      "./client/test/setup": "./dist/client/test/setup.js",
-      "./client": "./dist/client/index.js",
-      "./env": "./dist/env/index.js",
-      "./serialization": "./dist/serialization/index.js",
-      {=! Private: [client] =}
-      "./client/app": "./dist/client/app/index.jsx",
-      "./client/app/layout": "./dist/client/app/layout.jsx",
-      "./client/app/router": "./dist/client/app/router.jsx",
-      {=! Private: [client] =}
-      "./client/vite": "./dist/client/vite/index.js"
+    {=!
+      ===============================================================
+      Internal server runtime API. Undocumented.
+      ===============================================================
+    =}
+    "./server/auth/jwt": "./dist/server/auth/jwt.js",
+    "./server/auth/password": "./dist/server/auth/password.js",
+    "./server/auth/session": "./dist/server/auth/session.js",
+    "./server/auth/utils": "./dist/server/auth/utils.js",
+    "./server/core/auth": "./dist/server/core/auth.js",
+    "./server/crud/*": "./dist/server/crud/*.js",
+    "./server/email/core/types": "./dist/server/email/core/types.js",
+    {=! Todo(filip): This export becomes problematic once we start supporting different executors =}
+    "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
+    {=! FIXME: Reconsider during refactoring whether this is still needed. =}
+    "./server/middleware": "./dist/server/middleware/index.js",
+    {=! FIXME: Reconsider during refactoring whether this is still needed. =}
+    "./server/types": "./dist/server/types/index.js",
+    "./server/utils": "./dist/server/utils.js",
 
-   },
-   {=!
-     TypeScript doesn't care about the redirects we define above in "exports" field; those
-     are used only in runtime. TypeScript instead follows exact path as stated in an import when
-     trying to find the type declarations. Therefore, when "exports" redirect doesn't match the path
-     it redirects to, we need to also let TypeScript know about it, and that can be done with
-     `typesVersions` field below.
-   =}
-   "typesVersions": {
-     "*": {
-       "client/api": ["api/index.ts"]
-     }
-   },
-   "license": "ISC",
-    "include": [
-      "src/**/*"
-   ],
-   {=& depsChunk =},
-   {=& devDepsChunk =},
-   {=& peerDepsChunk =}
+    {=!
+      ===============================================================
+      Internal client runtime API. Undocumented.
+      Client is hidden in Wasp's vite plugin virtual modules.
+      ===============================================================
+    =}
+    "./client/app": "./dist/client/app/index.jsx",
+    "./client/app/layout": "./dist/client/app/layout.jsx",
+    "./client/app/router": "./dist/client/app/router.jsx",
+    {=! Injected as a vitest setupFiles entry by the vite plugin. =}
+    "./client/test/setup": "./dist/client/test/setup.js"
+  },
+  {=!
+    TypeScript doesn't care about the redirects we define above in "exports" field; those
+    are used only in runtime. TypeScript instead follows exact path as stated in an import when
+    trying to find the type declarations. Therefore, when "exports" redirect doesn't match the path
+    it redirects to, we need to also let TypeScript know about it, and that can be done with
+    `typesVersions` field below.
+  =}
+  "typesVersions": {
+    "*": {
+      "client/api": ["api/index.ts"]
+    }
+  },
+  "license": "ISC",
+  {=& depsChunk =},
+  {=& devDepsChunk =},
+  {=& peerDepsChunk =}
 }

package/data/Generator/templates/sdk/wasp/server/_types/index.ts

@@ -1,16 +1,16 @@
 {{={= =}=}}
-import { type Expand } from '../../universal/types.js'
-import { type Request, type Response } from 'express'
-import {
-  type ParamsDictionary as ExpressParams,
-  type Query as ExpressQuery,
+import type { Expand } from '@wasp.sh/lib-sdk-core'
+import type { Request, Response } from 'express'
+import type {
+  ParamsDictionary as ExpressParams,
+  Query as ExpressQuery,
 } from 'express-serve-static-core'
 import { prisma } from '../index.js'
 {=# isAuthEnabled =}
-import { type AuthUser } from '../auth/user.js'
+import type { AuthUser } from '../../auth/user.js'
 {=/ isAuthEnabled =}
-import { type _Entity } from './taggedEntities'
-import { type Payload } from '../../core/serialization/index.js'
+import type { _Entity } from './taggedEntities'
+import type { Payload } from '../../core/serialization/index.js'
 
 export * from "./taggedEntities"
 export * from "../../core/serialization/index.js"
@@ -100,6 +100,4 @@ type Context<Entities extends _Entity[]> = Expand<{
 type ContextWithUser<Entities extends _Entity[]> = Expand<
   Context<Entities> & { user?: AuthUser }
 >
-
-export type { ProviderName } from '../../auth/utils.js'
 {=/ isAuthEnabled =}

package/data/Generator/templates/sdk/wasp/server/_types/taggedEntities.ts

@@ -4,11 +4,11 @@
 //
 // We must explicitly tag all entities with their name to avoid issues with
 // structural typing. See https://github.com/wasp-lang/wasp/pull/982 for details.
-import { 
-  type Entity, 
-  type EntityName,
+import type { 
+  Entity, 
+  EntityName,
   {=# entities =}
-  type {= name =},
+  {= name =},
   {=/ entities =}
 } from '../../entities/index.js'
 

package/data/Generator/templates/sdk/wasp/server/api/index.ts

@@ -1,16 +1,16 @@
 {{={= =}=}}
 
-import { type ParamsDictionary as ExpressParams, type Query as ExpressQuery } from 'express-serve-static-core'
+import type { ParamsDictionary as ExpressParams, Query as ExpressQuery } from 'express-serve-static-core'
 
-import {
+import type {
   {=# allEntities =}
-  type {= internalTypeName =},
+  {= internalTypeName =},
   {=/ allEntities =}
   {=# shouldImportNonAuthenticatedApi =}
-  type Api,
+  Api,
   {=/ shouldImportNonAuthenticatedApi =}
   {=# shouldImportAuthenticatedApi =}
-  type AuthenticatedApi,
+  AuthenticatedApi,
   {=/ shouldImportAuthenticatedApi =}
 } from '../_types'
 

package/data/Generator/templates/sdk/wasp/server/auth/email/index.ts

@@ -1,14 +1,4 @@
-// PUBLIC API
-export type GetVerificationEmailContentFn = (params: { verificationLink: string }) => EmailContent;
-
-// PUBLIC API
-export type GetPasswordResetEmailContentFn = (params: { passwordResetLink: string }) => EmailContent;
-
-type EmailContent = {
-    subject: string;
-    html: string;
-    text: string;
-}
+export { type GetPasswordResetEmailContentFn, type GetVerificationEmailContentFn } from '@wasp.sh/lib-sdk-core/node'
 
 export {
     createEmailVerificationLink,
@@ -17,4 +7,4 @@ export {
     sendPasswordResetEmail,
     isEmailResendAllowed,
 } from './utils.js'
-export { ensureValidEmail } from '../../../auth/validation.js'
+export { ensureValidEmail } from '@wasp.sh/lib-sdk-core'

package/data/Generator/templates/sdk/wasp/server/auth/email/utils.ts

@@ -1,16 +1,20 @@
 {{={= =}=}}
-import { createJWT, TimeSpan } from '../../../auth/jwt.js'
+import { isEmailResendAllowed } from '@wasp.sh/lib-sdk-core'
+// PUBLIC API
+export { isEmailResendAllowed } from '@wasp.sh/lib-sdk-core'
+
+import { createJWT, TimeSpan } from '../jwt.js'
 import { emailSender } from '../../email/index.js';
-import { Email } from '../../email/core/types.js';
+import type { Email } from '../../email/core/types.js';
 import {
   createProviderId,
   updateAuthIdentityProviderData,
   findAuthIdentity,
   getProviderDataWithPassword,
   type EmailProviderData,
-} from '../../../auth/utils.js';
+} from '../utils.js';
 import { config as waspServerConfig } from '../../index.js';
-import { type {= userEntityUpper =}, type {= authEntityUpper =} } from '../../../entities/index.js'
+import type { {= userEntityUpper =}, {= authEntityUpper =} } from '../../../entities/index.js'
 
 // PUBLIC API
 export async function createEmailVerificationLink(
@@ -76,29 +80,3 @@ async function sendEmailAndSaveMetadata(
     console.error('Failed to send email', e);
   });
 }
-
-// PUBLIC API
-export function isEmailResendAllowed<Field extends 'emailVerificationSentAt' | 'passwordResetSentAt'>(
-  fields: {
-    [field in Field]: string | null
-  },
-  field: Field,
-  resendInterval: number = 1000 * 60,
-): {
-  isResendAllowed: boolean;
-  timeLeft: number;
-} {
-  const sentAt = fields[field];
-  if (!sentAt) {
-    return {
-      isResendAllowed: true,
-      timeLeft: 0,
-    };
-  }
-  const now = new Date();
-  const diff = now.getTime() - new Date(sentAt).getTime();
-  const isResendAllowed = diff > resendInterval;
-  // Time left in seconds
-  const timeLeft = isResendAllowed ? 0 : Math.round((resendInterval - diff) / 1000);
-  return { isResendAllowed, timeLeft };
-}

package/data/Generator/templates/sdk/wasp/server/auth/hooks.ts

@@ -1,8 +1,8 @@
 {{={= =}=}}
 import type { Request as ExpressRequest } from 'express'
-import { type ProviderId, type CreateUserResult, type FindAuthWithUserResult } from '../../auth/utils.js'
+import type { ProviderId, CreateUserResult, FindAuthWithUserResult } from './utils.js'
 import { prisma } from '../index.js'
-import { Expand } from '../../universal/types.js'
+import type { Expand } from '@wasp.sh/lib-sdk-core'
 
 // PUBLIC API
 export type OnBeforeSignupHook = (
@@ -187,5 +187,8 @@ export type OAuthData = {
   {=# enabledProviders.isMicrosoftAuthEnabled =}
   | { providerName: 'microsoft'; tokens: import('arctic').MicrosoftEntraIdTokens }
   {=/ enabledProviders.isMicrosoftAuthEnabled =}
+  {=# enabledProviders.isSlackAuthEnabled =}
+  | { providerName: 'slack'; tokens: import('arctic').SlackTokens }
+  {=/ enabledProviders.isSlackAuthEnabled =}
   | never
 )

package/data/Generator/templates/sdk/wasp/server/auth/index.ts

@@ -17,13 +17,13 @@ export {
   type EmailProviderData,
   type UsernameProviderData,
   type OAuthProviderData,
-} from '../../auth/utils.js'
+} from './utils.js'
 
 export {
   ensurePasswordIsPresent,
   ensureValidPassword,
   ensureTokenIsPresent,
-} from '../../auth/validation.js'
+} from '@wasp.sh/lib-sdk-core'
 
 export type {
   OnBeforeSignupHook,
@@ -45,5 +45,5 @@ export * from './email/index.js'
 {=/ enabledProviders.isEmailAuthEnabled =}
 
 {=# enabledProviders.isUsernameAndPasswordAuthEnabled =}
-export * from './username.js'
+export { ensureValidUsername } from '@wasp.sh/lib-sdk-core'
 {=/ enabledProviders.isUsernameAndPasswordAuthEnabled =}

package/data/Generator/templates/sdk/wasp/{auth → server/auth}/jwt.ts

@@ -1,6 +1,6 @@
 import { createJWTHelpers } from "@wasp.sh/lib-auth/node";
 
-import { config } from "../server/index.js";
+import { config } from "../index.js";
 
 const JWT_SECRET = new TextEncoder().encode(config.auth.jwtSecret);
 const JWT_ALGORITHM = "HS256";

package/data/Generator/templates/sdk/wasp/{auth → server/auth}/lucia.ts

@@ -1,8 +1,8 @@
 {{={= =}=}}
 import { Lucia } from "lucia";
 import { PrismaAdapter } from "@lucia-auth/adapter-prisma";
-import { prisma } from '../server/index.js'
-import { type {= userEntityUpper =} } from "../entities/index.js"
+import { prisma } from '../index.js'
+import type { {= userEntityUpper =} } from "../../entities/index.js"
 
 const prismaAdapter = new PrismaAdapter(
   prisma.{= sessionEntityLower =},
@@ -22,7 +22,7 @@ const prismaAdapter = new PrismaAdapter(
  *    make fetching the User easier.
  */
 export const auth = new Lucia<{}, {
-  userId: {= userEntityUpper =}['id']
+  userId: {= userEntityUpper =}['id'] | null
 }>(prismaAdapter, {
   // Since we are not using cookies, we don't need to set any cookie options.
   // But in the future, if we decide to use cookies, we can set them here.
@@ -47,7 +47,7 @@ declare module "lucia" {
     Lucia: typeof auth;
     DatabaseSessionAttributes: {};
     DatabaseUserAttributes: {
-      userId: {= userEntityUpper =}['id']
+      userId: {= userEntityUpper =}['id'] | null
     };
   }
 }

package/data/Generator/templates/sdk/wasp/server/auth/oauth/oneTimeCode.ts

@@ -1,4 +1,4 @@
-import { createJWT, validateJWT, TimeSpan } from '../../../auth/jwt.js'
+import { createJWT, validateJWT, TimeSpan } from '../jwt.js'
 
 export const tokenStore = createTokenStore();
 

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/discord.ts

@@ -1,7 +1,7 @@
 {{={= =}=}}
 import { Discord  } from 'arctic';
 
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { getRedirectUriForCallback } from '../redirect.js';
 import { env } from '../../../env.js';
 

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/github.ts

@@ -1,7 +1,7 @@
 {{={= =}=}}
 import { GitHub  } from 'arctic';
 
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { env } from '../../../env.js';
 
 const id = '{= providerId =}';

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/google.ts

@@ -2,7 +2,7 @@
 import { Google  } from 'arctic';
 
 import { getRedirectUriForCallback } from '../redirect.js';
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { env } from '../../../env.js';
 
 const id = '{= providerId =}';

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/keycloak.ts

@@ -2,7 +2,7 @@
 import { Keycloak  } from 'arctic';
 
 import { getRedirectUriForCallback } from '../redirect.js';
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { env } from '../../../env.js';
 
 const id = '{= providerId =}';

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/microsoft.ts

@@ -2,7 +2,7 @@
 import { MicrosoftEntraId } from 'arctic';
 
 import { getRedirectUriForCallback } from '../redirect.js';
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { env } from '../../../env.js';
 
 const id = '{= providerId =}';

package/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/slack.ts

@@ -1,7 +1,7 @@
 {{={= =}=}}
 import { Slack } from 'arctic';
 
-import { defineProvider } from '../provider.js';
+import { defineProvider } from '@wasp.sh/lib-sdk-core/node';
 import { getRedirectUriForCallback } from '../redirect.js';
 import { env } from '../../../env.js';
 

package/data/Generator/templates/sdk/wasp/{auth → server/auth}/session.ts

@@ -1,15 +1,15 @@
 {{={= =}=}}
-import { Request as ExpressRequest } from "express";
+import type { Request as ExpressRequest } from "express";
 
-import { type {= userEntityUpper =} } from '../entities/index.js';
-import { type AuthUserData } from '../server/auth/user.js';
+import type { {= userEntityUpper =} } from '../../entities/index.js';
+import type { AuthUserData } from '../../auth/user.js';
 
 import { auth } from "./lucia.js";
 import type { Session } from "lucia";
-import { createInvalidCredentialsError } from "./utils.js";
+import { createInvalidCredentialsError } from "@wasp.sh/lib-sdk-core/node";
 
-import { prisma } from '../server/index.js';
-import { createAuthUserData } from "../server/auth/user.js";
+import { prisma } from '../index.js';
+import { createAuthUserData } from "../../auth/user.js";
 
 // PRIVATE API
 // Creates a new session for the `authId` in the database
@@ -46,6 +46,11 @@ export async function getSessionAndUserFromSessionId(sessionId: string): Promise
     return null;
   }
 
+  // Such a session can't identify a user, so we treat it as unauthenticated.
+  if (authEntity.userId === null) {
+    return null;
+  }
+
   return {
     session,
     user: await getAuthUserData(authEntity.userId)
@@ -76,3 +81,9 @@ async function getAuthUserData(userId: {= userEntityUpper =}['id']): Promise<Aut
 export function invalidateSession(sessionId: string): Promise<void> {
   return auth.invalidateSession(sessionId);
 }
+
+// PRIVATE API
+// Invalidates all sessions belonging to the `authId` in the database
+export function invalidateAllSessionsForAuthId(authId: string): Promise<void> {
+  return auth.invalidateUserSessions(authId);
+}