@shophost/rest-api 2.0.69 → 2.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shophost/rest-api",
-  "version": "2.0.69",
+  "version": "2.0.71",
   "type": "module",
   "bin": {
     "shophost-rest-api": "./scripts/shophost-rest-api.mjs"

package/schema.prisma

@@ -784,5 +784,6 @@ model Reservation {
   createdAt      DateTime     @default(now())
   acceptedAt     DateTime?
   cancelledAt    DateTime?
+  cancellationMessage String?
   updatedAt      DateTime     @updatedAt
 }

package/src/core/auth/better-auth.lib.js

@@ -1 +1 @@
-import{betterAuth as l}from"better-auth";import{prismaAdapter as d}from"better-auth/adapters/prisma";import{nextCookies as c}from"better-auth/next-js";import{openAPI as p,organization as u}from"better-auth/plugins";import{createAccessControl as m}from"better-auth/plugins/access";import{getCurrentUser as g,isGranted as f}from"./auth.util";const b={project:["create","read","update","delete"],organization:["create","read","update","delete"]},e=m(b),C=e.newRole({project:["read"]}),h=e.newRole({project:["read"]}),j=e.newRole({project:["create","read","update","delete"]}),w=e.newRole({project:["create","read","update","delete"],organization:["update"]}),A=e.newRole({project:["create","read","update","delete"],organization:["update","delete"]});export const createAuthClient=({prisma:n,baseURL:s,domain:r,trustedOrigins:i,socialProviders:t})=>{const o=l({baseURL:s,database:d(n,{provider:"postgresql"}),trustedOrigins:i,user:{additionalFields:{firstname:{type:"string",required:!0},lastname:{type:"string",required:!0}}},advanced:{crossSubDomainCookies:{enabled:!0,domain:r},useSecureCookies:r!=="localhost",defaultCookieAttributes:{path:"/",sameSite:"lax",httpOnly:!0,secure:r!=="localhost"}},emailAndPassword:{enabled:!0},socialProviders:Object.assign({},t?.google?{google:{prompt:"select_account",clientId:t.google.clientId,clientSecret:t.google.clientSecret,mapProfileToUser:a=>({firstname:a.given_name,lastname:a.family_name})}}:{}),plugins:[p(),c(),u({ac:e,roles:{member:h,readOnly:C,manager:j,admin:w,owner:A}})]});return{auth:o,getCurrentUser:g(o),isGranted:f(o)}};
+import{__awaiter as b}from"tslib";import{betterAuth as v}from"better-auth";import{prismaAdapter as y}from"better-auth/adapters/prisma";import{nextCookies as z}from"better-auth/next-js";import{openAPI as h,organization as R}from"better-auth/plugins";import{createAccessControl as S}from"better-auth/plugins/access";import{logger as m}from"../logging/pino";import{EmailService as A}from"../notifications/email.service";import{IntegrationRegistry as C}from"../../features/integration/integration-registry";import{getCurrentUser as I,isGranted as j}from"./auth.util";import{resolvePasswordResetOrganizationId as k}from"./password-reset.lib";const _={project:["create","read","update","delete"],organization:["create","read","update","delete"]},t=S(_),O=t.newRole({project:["read"]}),q=t.newRole({project:["read"]}),x=t.newRole({project:["create","read","update","delete"]}),F=t.newRole({project:["create","read","update","delete"],organization:["update"]}),P=t.newRole({project:["create","read","update","delete"],organization:["update","delete"]});export const createAuthClient=({prisma:o,baseURL:c,domain:i,trustedOrigins:u,socialProviders:r})=>{const p=new A(new C(o)),l=v({baseURL:c,database:y(o,{provider:"postgresql"}),trustedOrigins:u,user:{additionalFields:{firstname:{type:"string",required:!0},lastname:{type:"string",required:!0}}},advanced:{crossSubDomainCookies:{enabled:!0,domain:i},useSecureCookies:i!=="localhost",defaultCookieAttributes:{path:"/",sameSite:"lax",httpOnly:!0,secure:i!=="localhost"}},emailAndPassword:{enabled:!0,sendResetPassword:(a,g)=>b(void 0,[a,g],void 0,function*({user:e,url:f},w){var d;const n=yield k(o,w,e.id);if(!n){m.warn({email:e.email,userId:e.id},"Skipping password reset email because no organization could be resolved");return}const s=yield o.organization.findFirst({where:{id:n,deletedAt:null},select:{id:!0,name:!0,email:!0,logoFile:{select:{url:!0}}}});if(!s){m.warn({organizationId:n,userId:e.id},"Skipping password reset email because the organization was not found");return}yield p.sendPasswordResetEmail(n,{email:e.email,firstname:typeof e.firstname=="string"&&(d=e.firstname)!==null&&d!==void 0?d:null,name:e.name},s,f)})},socialProviders:Object.assign({},r?.google?{google:{prompt:"select_account",clientId:r.google.clientId,clientSecret:r.google.clientSecret,mapProfileToUser:a=>({firstname:a.given_name,lastname:a.family_name})}}:{}),plugins:[h(),z(),R({ac:t,roles:{member:q,readOnly:O,manager:x,admin:F,owner:P}})]});return{auth:l,getCurrentUser:I(l),isGranted:j(l)}};

package/src/core/auth/password-reset.lib.d.ts

@@ -0,0 +1,3 @@
+import type { PrismaClientType } from "../lib/prisma";
+export declare const PASSWORD_RESET_ORGANIZATION_HEADER = "x-shophost-organization-id";
+export declare const resolvePasswordResetOrganizationId: (prisma: PrismaClientType, request: Pick<Request, "headers"> | null | undefined, userId: string) => Promise<string | undefined>;

package/src/core/auth/password-reset.lib.js

@@ -0,0 +1 @@
+import{__awaiter as d}from"tslib";export const PASSWORD_RESET_ORGANIZATION_HEADER="x-shophost-organization-id";const a=i=>{const o=i?.trim();return o||void 0};export const resolvePasswordResetOrganizationId=(i,o,r)=>d(void 0,void 0,void 0,function*(){const t=a(o?.headers.get(PASSWORD_RESET_ORGANIZATION_HEADER));if(t){const e=yield i.organization.findFirst({where:{id:t,deletedAt:null},select:{id:!0}});if(e)return e.id}const n=yield i.member.findFirst({where:{userId:r},orderBy:{createdAt:"asc"},select:{organizationId:!0}});return n?.organizationId});