@rudderhq/server 0.6.5 → 0.6.6-canary.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.js +1 -1
- package/dist/app.js.map +1 -1
- package/dist/bootstrap/auth-runtime.d.ts +36 -0
- package/dist/bootstrap/auth-runtime.d.ts.map +1 -0
- package/dist/bootstrap/auth-runtime.js +81 -0
- package/dist/bootstrap/auth-runtime.js.map +1 -0
- package/dist/bootstrap/auth-runtime.test.d.ts +2 -0
- package/dist/bootstrap/auth-runtime.test.d.ts.map +1 -0
- package/dist/bootstrap/auth-runtime.test.js +51 -0
- package/dist/bootstrap/auth-runtime.test.js.map +1 -0
- package/dist/bootstrap/create-http-app.d.ts.map +1 -1
- package/dist/bootstrap/create-http-app.js +5 -0
- package/dist/bootstrap/create-http-app.js.map +1 -1
- package/dist/bootstrap/plugin-host-runtime.d.ts +8 -8
- package/dist/bootstrap/register-api-routes.d.ts.map +1 -1
- package/dist/bootstrap/register-api-routes.js +8 -0
- package/dist/bootstrap/register-api-routes.js.map +1 -1
- package/dist/bootstrap/types.d.ts +9 -1
- package/dist/bootstrap/types.d.ts.map +1 -1
- package/dist/bundled-plugins/plugin-linear/dist/worker.js +21 -0
- package/dist/bundled-plugins/plugin-linear/dist/worker.js.map +3 -3
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -36
- package/dist/index.js.map +1 -1
- package/dist/middleware/account-session-required.d.ts +4 -0
- package/dist/middleware/account-session-required.d.ts.map +1 -0
- package/dist/middleware/account-session-required.js +19 -0
- package/dist/middleware/account-session-required.js.map +1 -0
- package/dist/middleware/auth.d.ts +2 -1
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +4 -2
- package/dist/middleware/auth.js.map +1 -1
- package/dist/middleware/logger.d.ts +1 -0
- package/dist/middleware/logger.d.ts.map +1 -1
- package/dist/middleware/logger.js +25 -2
- package/dist/middleware/logger.js.map +1 -1
- package/dist/middleware/logger.test.js +41 -1
- package/dist/middleware/logger.test.js.map +1 -1
- package/dist/realtime/live-events-ws.d.ts +4 -1
- package/dist/realtime/live-events-ws.d.ts.map +1 -1
- package/dist/realtime/live-events-ws.js +33 -3
- package/dist/realtime/live-events-ws.js.map +1 -1
- package/dist/routes/access.helpers.d.ts +1 -1
- package/dist/routes/chats.runtime-controls.d.ts +1 -1
- package/dist/routes/local-account-auth.d.ts +9 -0
- package/dist/routes/local-account-auth.d.ts.map +1 -0
- package/dist/routes/local-account-auth.js +67 -0
- package/dist/routes/local-account-auth.js.map +1 -0
- package/dist/services/access.d.ts +3 -3
- package/dist/services/activity.d.ts +3 -3
- package/dist/services/agents.d.ts +13 -13
- package/dist/services/approvals.d.ts +4 -4
- package/dist/services/assets.d.ts +1 -1
- package/dist/services/automation-chat-output.d.ts +3 -3
- package/dist/services/board-auth.d.ts +1 -1
- package/dist/services/browser-capability.d.ts +5 -2
- package/dist/services/browser-capability.d.ts.map +1 -1
- package/dist/services/browser-capability.js +14 -2
- package/dist/services/browser-capability.js.map +1 -1
- package/dist/services/browser-capability.test.d.ts +2 -0
- package/dist/services/browser-capability.test.d.ts.map +1 -0
- package/dist/services/browser-capability.test.js +25 -0
- package/dist/services/browser-capability.test.js.map +1 -0
- package/dist/services/chat-annotation-copy-lineage.d.ts +3 -3
- package/dist/services/chat-generation-protocol.d.ts +27 -27
- package/dist/services/chat-queued-message-materialization.d.ts +2 -2
- package/dist/services/chat-work-manifest.d.ts.map +1 -1
- package/dist/services/chat-work-manifest.js +112 -4
- package/dist/services/chat-work-manifest.js.map +1 -1
- package/dist/services/chats.create.d.ts +2 -2
- package/dist/services/chats.d.ts +132 -132
- package/dist/services/chats.helpers.d.ts +2 -2
- package/dist/services/finance.d.ts +1 -1
- package/dist/services/goals.d.ts +2 -2
- package/dist/services/integrations/agent-integrations.d.ts +1 -1
- package/dist/services/integrations/custom-integrations.d.ts +2 -2
- package/dist/services/integrations/feishu/user-bindings.d.ts +1 -1
- package/dist/services/issue-approvals.d.ts +1 -1
- package/dist/services/issues.comments-attachments.d.ts +1 -1
- package/dist/services/issues.d.ts +4 -4
- package/dist/services/issues.d.ts.map +1 -1
- package/dist/services/issues.js +75 -10
- package/dist/services/issues.js.map +1 -1
- package/dist/services/local-account-auth.d.ts +94 -0
- package/dist/services/local-account-auth.d.ts.map +1 -0
- package/dist/services/local-account-auth.js +470 -0
- package/dist/services/local-account-auth.js.map +1 -0
- package/dist/services/local-account-session-revocation.d.ts +7 -0
- package/dist/services/local-account-session-revocation.d.ts.map +1 -0
- package/dist/services/local-account-session-revocation.js +19 -0
- package/dist/services/local-account-session-revocation.js.map +1 -0
- package/dist/services/messenger.d.ts +5 -5
- package/dist/services/orgs.d.ts +1 -1
- package/dist/services/plugin-registry.d.ts +8 -8
- package/dist/services/projects.d.ts +1 -1
- package/dist/services/run-events.d.ts +1 -1
- package/dist/services/secrets.d.ts +1 -1
- package/dist/services/workspace-runtime.services.d.ts +2 -2
- package/package.json +14 -13
- package/ui-dist/assets/{LibraryLiveSurface-DpX1FaVs.js → LibraryLiveSurface-CUgoFYvG.js} +1 -1
- package/ui-dist/assets/{abnfDiagram-VRR7QNED-BFqFFwVV.js → abnfDiagram-VRR7QNED-BdM6grBK.js} +1 -1
- package/ui-dist/assets/{arc-Dd7KXY7D.js → arc-B8Tukeix.js} +1 -1
- package/ui-dist/assets/{architectureDiagram-ZJ3FMSHR-CzfeXkyX.js → architectureDiagram-ZJ3FMSHR-DP_lYJIS.js} +1 -1
- package/ui-dist/assets/{blockDiagram-677ZJIJ3-BSiL3FsI.js → blockDiagram-677ZJIJ3-D_QKZNjP.js} +1 -1
- package/ui-dist/assets/{c4Diagram-LMCZKHZV-BjT_aSi4.js → c4Diagram-LMCZKHZV-DJwVavN4.js} +1 -1
- package/ui-dist/assets/channel-Cd4sqN24.js +1 -0
- package/ui-dist/assets/{chunk-2Q5K7J3B-CtGd7b4J.js → chunk-2Q5K7J3B-BjdKg2cx.js} +1 -1
- package/ui-dist/assets/{chunk-32BRIVSS-DLOelT5l.js → chunk-32BRIVSS-C_u4l725.js} +1 -1
- package/ui-dist/assets/{chunk-5VM5RSS4-BUPqCqOC.js → chunk-5VM5RSS4-DtzEQCc9.js} +1 -1
- package/ui-dist/assets/{chunk-EX3LRPZG-CIzOp80L.js → chunk-EX3LRPZG-Ds_gCBVz.js} +1 -1
- package/ui-dist/assets/{chunk-JWPE2WC7-CQ6lawYC.js → chunk-JWPE2WC7-CHX9VuQf.js} +1 -1
- package/ui-dist/assets/{chunk-MOJQB5TN-6yDvAm1z.js → chunk-MOJQB5TN-D_pj9OWe.js} +1 -1
- package/ui-dist/assets/{chunk-RYQCIY6F-BsWFsIK3.js → chunk-RYQCIY6F-aMYmnUaJ.js} +1 -1
- package/ui-dist/assets/{chunk-V7JOEXUC-C90E5Ayd.js → chunk-V7JOEXUC-Db3LrL-P.js} +1 -1
- package/ui-dist/assets/{chunk-VR4S4FIN-CRCxXqZI.js → chunk-VR4S4FIN-BssuUpMr.js} +1 -1
- package/ui-dist/assets/{chunk-XXDRQBXY-B3don1Cz.js → chunk-XXDRQBXY-DVzY-_Tv.js} +1 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-Bi3tsM-q.js +1 -0
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-Bi3tsM-q.js +1 -0
- package/ui-dist/assets/{cose-bilkent-JH36ORCC-DEP7BeI3.js → cose-bilkent-JH36ORCC-Ch-fM2pW.js} +1 -1
- package/ui-dist/assets/{cynefin-VYW2F7L2-CJVhT4Mh.js → cynefin-VYW2F7L2-C7gJeesr.js} +1 -1
- package/ui-dist/assets/{cynefinDiagram-TSTJHNR4-BaE-6YFm.js → cynefinDiagram-TSTJHNR4-BwMpD6aZ.js} +1 -1
- package/ui-dist/assets/{dagre-VKFMJZFB-DjLUyC8r.js → dagre-VKFMJZFB-8TgHu2tj.js} +1 -1
- package/ui-dist/assets/{diagram-FQU43EPY-qFPhWckH.js → diagram-FQU43EPY-ChODej8C.js} +1 -1
- package/ui-dist/assets/{diagram-G47NLZAW-x2c8-YSi.js → diagram-G47NLZAW-CVq1GXvV.js} +1 -1
- package/ui-dist/assets/{diagram-NH7WQ7WH-DVJZnTdn.js → diagram-NH7WQ7WH-D1IO7xe3.js} +1 -1
- package/ui-dist/assets/{diagram-OA4YK3LP-CGmPSCZl.js → diagram-OA4YK3LP-CKlttJto.js} +1 -1
- package/ui-dist/assets/{diagram-WEI45ONY-CVrk0gkQ.js → diagram-WEI45ONY-DigjsORo.js} +1 -1
- package/ui-dist/assets/{ebnfDiagram-CCIWWBDH-ERUk1pe4.js → ebnfDiagram-CCIWWBDH-CZwO7RGO.js} +1 -1
- package/ui-dist/assets/{erDiagram-Q63AITRT-CTI3QQAr.js → erDiagram-Q63AITRT-C3fFVPod.js} +1 -1
- package/ui-dist/assets/{flowDiagram-23GEKE2U-CEsaHxu3.js → flowDiagram-23GEKE2U-CpccWfFo.js} +1 -1
- package/ui-dist/assets/{ganttDiagram-NO4QXBWP-gzxhoaFK.js → ganttDiagram-NO4QXBWP-g3KL--4W.js} +1 -1
- package/ui-dist/assets/{gitGraphDiagram-IHSO6WYX-DTL52PDj.js → gitGraphDiagram-IHSO6WYX-Bn59AW1B.js} +1 -1
- package/ui-dist/assets/{graph-Amp0nqof.js → graph-LZSMW9ku.js} +1 -1
- package/ui-dist/assets/{index-CSzq_DKH.js → index-BG46qMXw.js} +1 -1
- package/ui-dist/assets/{index-BHESmW5p.js → index-BI9d3zXw.js} +1 -1
- package/ui-dist/assets/{index-xJT81p6g.js → index-BLUJslyp.js} +1 -1
- package/ui-dist/assets/{index-msFHymhK.js → index-BQv2nBgV.js} +1 -1
- package/ui-dist/assets/{index-CPDrDmuH.js → index-BkbdH2n-.js} +1 -1
- package/ui-dist/assets/{index-BV7fBmZ3.js → index-BqhkUdAT.js} +1 -1
- package/ui-dist/assets/index-C-qWhcfC.css +1 -0
- package/ui-dist/assets/{index-BcVy8ihr.js → index-C3e6slEn.js} +1 -1
- package/ui-dist/assets/{index-DYrmKlSC.js → index-C5hYxLM9.js} +1 -1
- package/ui-dist/assets/{index-CRXGUaWn.js → index-CLETiubs.js} +1 -1
- package/ui-dist/assets/{index-gr3tM_aY.js → index-CLnCobCG.js} +1 -1
- package/ui-dist/assets/{index-HtRgAJ4M.js → index-CPIoQKcG.js} +1 -1
- package/ui-dist/assets/{index-B1m6wL07.js → index-CQLLvEua.js} +1 -1
- package/ui-dist/assets/{index-DoitzL1N.js → index-CVwGLbgm.js} +1 -1
- package/ui-dist/assets/{index-v7MQxR2M.js → index-ChTD9DV4.js} +1 -1
- package/ui-dist/assets/{index-CepgLuN-.js → index-CiyYjAsy.js} +1 -1
- package/ui-dist/assets/{index-BI4_BIid.js → index-CrU5g0XU.js} +569 -544
- package/ui-dist/assets/{index-QQAVYTub.js → index-EqVfudOJ.js} +1 -1
- package/ui-dist/assets/{index-D___9Wjc.js → index-ZFb9ZHAH.js} +1 -1
- package/ui-dist/assets/{infoDiagram-FWYZ7A6U-DGE65dHv.js → infoDiagram-FWYZ7A6U-uxPSmmcv.js} +1 -1
- package/ui-dist/assets/{ishikawaDiagram-FXEZZL3T-Cd4UBCAL.js → ishikawaDiagram-FXEZZL3T-BeKQmaaL.js} +1 -1
- package/ui-dist/assets/{journeyDiagram-5HDEW3XC-DGgKZBkH.js → journeyDiagram-5HDEW3XC-Cnqh1Fyp.js} +1 -1
- package/ui-dist/assets/{kanban-definition-HUTT4EX6-BKEVE30G.js → kanban-definition-HUTT4EX6-DRvoG8e7.js} +1 -1
- package/ui-dist/assets/{layout-ok0OdtMA.js → layout-By7bOuHZ.js} +1 -1
- package/ui-dist/assets/{linear-BIUm0r-d.js → linear-D-kfwm1O.js} +1 -1
- package/ui-dist/assets/{map-B3hrNe5c.js → map-d3zaWROJ.js} +1 -1
- package/ui-dist/assets/{mermaid.core-BB3ZW0W5.js → mermaid.core-1JtOXpMA.js} +4 -4
- package/ui-dist/assets/{mindmap-definition-LN4V7U3C-Ce2GzycL.js → mindmap-definition-LN4V7U3C-D8Jge-_m.js} +1 -1
- package/ui-dist/assets/{pegDiagram-2B236MQR-CsGZjyrh.js → pegDiagram-2B236MQR-UCd9-Gfd.js} +1 -1
- package/ui-dist/assets/{pieDiagram-ENE6RG2P-13XdwDXP.js → pieDiagram-ENE6RG2P-DffPYn-P.js} +1 -1
- package/ui-dist/assets/{quadrantDiagram-ABIIQ3AL-Dp1K1uSq.js → quadrantDiagram-ABIIQ3AL-Ds1lQ25G.js} +1 -1
- package/ui-dist/assets/{railroadDiagram-RFXS5EU6-Dw5jHw28.js → railroadDiagram-RFXS5EU6-P_pLStbY.js} +1 -1
- package/ui-dist/assets/{requirementDiagram-TGXJPOKE-C3_H_i7q.js → requirementDiagram-TGXJPOKE-E_1U7w_T.js} +1 -1
- package/ui-dist/assets/{sankeyDiagram-HTMAVEWB-DTEaptJZ.js → sankeyDiagram-HTMAVEWB-DFgwdZz7.js} +1 -1
- package/ui-dist/assets/{sequenceDiagram-DBY2YBRQ-DPbvDbuP.js → sequenceDiagram-DBY2YBRQ-CbI2EnTH.js} +1 -1
- package/ui-dist/assets/{sizeCapture-X5ZJPWSS-Ck2fmKhq.js → sizeCapture-X5ZJPWSS-Axl0diWc.js} +1 -1
- package/ui-dist/assets/{stateDiagram-2N3HPSRC-DpRZgrRj.js → stateDiagram-2N3HPSRC-DxZLENhX.js} +1 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-KzYOpJ1T.js +1 -0
- package/ui-dist/assets/{swimlanes-5IMT3BWC-hhbRmwUj.js → swimlanes-5IMT3BWC-1G26qvUm.js} +2 -2
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV--Vi3kUvi.js +8 -0
- package/ui-dist/assets/{timeline-definition-FHXFAJF6-DdDMc8Ts.js → timeline-definition-FHXFAJF6-B0Ha5bZS.js} +1 -1
- package/ui-dist/assets/{vennDiagram-L72KCM5P-o_kY0dM1.js → vennDiagram-L72KCM5P-BskD_1N5.js} +1 -1
- package/ui-dist/assets/{wardleyDiagram-EHGQE667-DSHITBPO.js → wardleyDiagram-EHGQE667-1wE4bYQ8.js} +1 -1
- package/ui-dist/assets/{xychartDiagram-FW5EYKEG-CDaFkU2E.js → xychartDiagram-FW5EYKEG-DfcOAfb8.js} +1 -1
- package/ui-dist/index.html +2 -2
- package/ui-dist/assets/channel-C3u-3GHU.js +0 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-NsiQrj0J.js +0 -1
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-NsiQrj0J.js +0 -1
- package/ui-dist/assets/index-CThrdiOE.css +0 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-DgWbRGjL.js +0 -1
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV-DArbKvVx.js +0 -8
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import express from "express";
|
|
2
2
|
import request from "supertest";
|
|
3
3
|
import { describe, expect, it } from "vitest";
|
|
4
|
-
import { markBrowserHttpRequestBodySensitive, markHttpRequestBodySensitive, requestBodyForLogs, requestHeadersForLogs, requestQueryForLogs, requestUrlForLogs, serializeHttpRequestForLogs, } from "./logger.js";
|
|
4
|
+
import { markBrowserHttpRequestBodySensitive, markHttpRequestBodySensitive, requestBodyForLogs, requestHeadersForLogs, requestQueryForLogs, requestUrlForLogs, serializeHttpRequestForLogs, serializeHttpResponseForLogs, } from "./logger.js";
|
|
5
5
|
describe("HTTP request-body logging", () => {
|
|
6
6
|
it("redacts a request body after the route marks it sensitive", () => {
|
|
7
7
|
const request = {};
|
|
@@ -26,6 +26,19 @@ describe("HTTP request-body logging", () => {
|
|
|
26
26
|
expect(requestBodyForLogs({ originalUrl: "/API/BROWSER/CLIPBOARD/" }, body)).toBe("[REDACTED]");
|
|
27
27
|
expect(requestBodyForLogs({ originalUrl: "/api/issues" }, body)).toBe(body);
|
|
28
28
|
});
|
|
29
|
+
it("redacts local account exchange and Offline Grant bodies before route validation", () => {
|
|
30
|
+
const exchange = { exchangeCode: "live-one-time-code" };
|
|
31
|
+
const offline = {
|
|
32
|
+
grant: "signed-offline-grant",
|
|
33
|
+
proof: { signature: "device-proof" },
|
|
34
|
+
};
|
|
35
|
+
expect(requestBodyForLogs({ originalUrl: "/api/auth/local-exchange" }, exchange)).toBe("[REDACTED]");
|
|
36
|
+
expect(requestBodyForLogs({ url: "/API/AUTH/LOCAL-OFFLINE/?retry=1" }, offline)).toBe("[REDACTED]");
|
|
37
|
+
expect(JSON.stringify([
|
|
38
|
+
requestBodyForLogs({ originalUrl: "/api/auth/local-exchange" }, exchange),
|
|
39
|
+
requestBodyForLogs({ originalUrl: "/api/auth/local-offline" }, offline),
|
|
40
|
+
])).not.toContain("live-one-time-code");
|
|
41
|
+
});
|
|
29
42
|
it("redacts direct and queued inline annotation request bodies", () => {
|
|
30
43
|
const direct = {
|
|
31
44
|
body: "",
|
|
@@ -139,5 +152,32 @@ describe("HTTP request-body logging", () => {
|
|
|
139
152
|
serialized,
|
|
140
153
|
})).not.toMatch(/raw-state|raw-code|private|oauth\.example|referer-state|pkce-secret|cookie-secret|callback-secret/u);
|
|
141
154
|
});
|
|
155
|
+
it("redacts session credentials from all request and response headers", () => {
|
|
156
|
+
const requestHeaders = requestHeadersForLogs({ originalUrl: "/api/auth/local-claim" }, {
|
|
157
|
+
cookie: "better-auth.session_token=secret",
|
|
158
|
+
authorization: "Bearer secret",
|
|
159
|
+
origin: "http://127.0.0.1:3100",
|
|
160
|
+
});
|
|
161
|
+
const response = serializeHttpResponseForLogs({
|
|
162
|
+
statusCode: 200,
|
|
163
|
+
headers: {
|
|
164
|
+
"set-cookie": "better-auth.session_token=secret; HttpOnly",
|
|
165
|
+
"content-type": "application/json",
|
|
166
|
+
},
|
|
167
|
+
});
|
|
168
|
+
expect(requestHeaders).toEqual({
|
|
169
|
+
cookie: "[REDACTED]",
|
|
170
|
+
authorization: "[REDACTED]",
|
|
171
|
+
origin: "http://127.0.0.1:3100",
|
|
172
|
+
});
|
|
173
|
+
expect(response).toEqual({
|
|
174
|
+
statusCode: 200,
|
|
175
|
+
headers: {
|
|
176
|
+
"set-cookie": "[REDACTED]",
|
|
177
|
+
"content-type": "application/json",
|
|
178
|
+
},
|
|
179
|
+
});
|
|
180
|
+
expect(JSON.stringify({ requestHeaders, response })).not.toContain("secret");
|
|
181
|
+
});
|
|
142
182
|
});
|
|
143
183
|
//# sourceMappingURL=logger.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../../src/middleware/logger.test.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACL,mCAAmC,EACnC,4BAA4B,EAC5B,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACjB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../../src/middleware/logger.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import type { Db } from "@rudderhq/db";
|
|
2
|
-
import type
|
|
2
|
+
import { type AuthRequirement, type DeploymentMode } from "@rudderhq/shared";
|
|
3
3
|
import type { Server as HttpServer } from "node:http";
|
|
4
4
|
import type { BetterAuthSessionResult } from "../auth/better-auth.js";
|
|
5
|
+
import type { LocalAccountSessionRevocation } from "../services/local-account-session-revocation.js";
|
|
5
6
|
export interface LiveEventsWebSocketRuntime {
|
|
6
7
|
close(): Promise<void>;
|
|
7
8
|
}
|
|
8
9
|
export declare function setupLiveEventsWebSocketServer(server: HttpServer, db: Db, opts: {
|
|
9
10
|
deploymentMode: DeploymentMode;
|
|
11
|
+
authRequirement?: AuthRequirement;
|
|
10
12
|
resolveSessionFromHeaders?: (headers: Headers) => Promise<BetterAuthSessionResult | null>;
|
|
13
|
+
sessionRevocation?: LocalAccountSessionRevocation;
|
|
11
14
|
}): LiveEventsWebSocketRuntime;
|
|
12
15
|
//# sourceMappingURL=live-events-ws.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events-ws.d.ts","sourceRoot":"","sources":["../../src/realtime/live-events-ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"live-events-ws.d.ts","sourceRoot":"","sources":["../../src/realtime/live-events-ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAmB,MAAM,WAAW,CAAC;AAGvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGtE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iDAAiD,CAAC;AA4CrG,MAAM,WAAW,0BAA0B;IACzC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAkID,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,UAAU,EAClB,EAAE,EAAE,EAAE,EACN,IAAI,EAAE;IACJ,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC,CAAC;IAC1F,iBAAiB,CAAC,EAAE,6BAA6B,CAAC;CACnD,GACA,0BAA0B,CAwL5B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { agentApiKeys, instanceUserRoles, organizationMemberships } from "@rudderhq/db";
|
|
2
|
+
import { authRequirementForDeploymentMode, } from "@rudderhq/shared";
|
|
2
3
|
import { and, eq, isNull } from "drizzle-orm";
|
|
3
4
|
import { createHash } from "node:crypto";
|
|
4
5
|
import { createRequire } from "node:module";
|
|
@@ -54,14 +55,15 @@ async function authorizeUpgrade(db, req, orgId, url, opts) {
|
|
|
54
55
|
const token = authToken ?? (queryToken.length > 0 ? queryToken : null);
|
|
55
56
|
// Browser board context has no bearer token in local_trusted and authenticated modes.
|
|
56
57
|
if (!token) {
|
|
57
|
-
|
|
58
|
+
const authRequirement = opts.authRequirement ?? authRequirementForDeploymentMode(opts.deploymentMode);
|
|
59
|
+
if (authRequirement === "optional" && opts.deploymentMode === "local_trusted") {
|
|
58
60
|
return {
|
|
59
61
|
orgId,
|
|
60
62
|
actorType: "board",
|
|
61
63
|
actorId: "board",
|
|
62
64
|
};
|
|
63
65
|
}
|
|
64
|
-
if (
|
|
66
|
+
if (!opts.resolveSessionFromHeaders) {
|
|
65
67
|
return null;
|
|
66
68
|
}
|
|
67
69
|
const session = await opts.resolveSessionFromHeaders(headersFromIncomingMessage(req));
|
|
@@ -110,6 +112,7 @@ async function authorizeUpgrade(db, req, orgId, url, opts) {
|
|
|
110
112
|
export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
111
113
|
const wss = new WebSocketServer({ noServer: true });
|
|
112
114
|
const cleanupByClient = new Map();
|
|
115
|
+
const contextByClient = new Map();
|
|
113
116
|
const aliveByClient = new Map();
|
|
114
117
|
const pendingUpgradeSockets = new Set();
|
|
115
118
|
let closing = false;
|
|
@@ -117,6 +120,7 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
117
120
|
const cleanupClient = (socket) => {
|
|
118
121
|
const cleanup = cleanupByClient.get(socket);
|
|
119
122
|
cleanupByClient.delete(socket);
|
|
123
|
+
contextByClient.delete(socket);
|
|
120
124
|
aliveByClient.delete(socket);
|
|
121
125
|
try {
|
|
122
126
|
cleanup?.();
|
|
@@ -141,12 +145,19 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
141
145
|
socket.close(1008, "missing context");
|
|
142
146
|
return;
|
|
143
147
|
}
|
|
148
|
+
if (context.actorType === "board"
|
|
149
|
+
&& context.sessionRevocationGeneration !== undefined
|
|
150
|
+
&& opts.sessionRevocation?.generation() !== context.sessionRevocationGeneration) {
|
|
151
|
+
socket.close(1008, "account session changed");
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
144
154
|
const unsubscribe = subscribeCompanyLiveEvents(context.orgId, (event) => {
|
|
145
155
|
if (socket.readyState !== WebSocket.OPEN)
|
|
146
156
|
return;
|
|
147
157
|
socket.send(JSON.stringify(event));
|
|
148
158
|
});
|
|
149
159
|
cleanupByClient.set(socket, unsubscribe);
|
|
160
|
+
contextByClient.set(socket, context);
|
|
150
161
|
aliveByClient.set(socket, true);
|
|
151
162
|
socket.on("pong", () => {
|
|
152
163
|
aliveByClient.set(socket, true);
|
|
@@ -161,6 +172,13 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
161
172
|
wss.on("close", () => {
|
|
162
173
|
clearInterval(pingInterval);
|
|
163
174
|
});
|
|
175
|
+
const unsubscribeSessionRevocation = opts.sessionRevocation?.subscribe((userId) => {
|
|
176
|
+
for (const [socket, context] of contextByClient) {
|
|
177
|
+
if (context.actorType === "board" && context.actorId === userId) {
|
|
178
|
+
socket.close(1008, "account signed out");
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
});
|
|
164
182
|
const handleUpgrade = (req, socket, head) => {
|
|
165
183
|
if (closing) {
|
|
166
184
|
socket.destroy();
|
|
@@ -177,10 +195,12 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
177
195
|
return;
|
|
178
196
|
}
|
|
179
197
|
const removePendingSocket = () => pendingUpgradeSockets.delete(socket);
|
|
198
|
+
const sessionRevocationGeneration = opts.sessionRevocation?.generation();
|
|
180
199
|
pendingUpgradeSockets.add(socket);
|
|
181
200
|
socket.once("close", removePendingSocket);
|
|
182
201
|
void authorizeUpgrade(db, req, orgId, url, {
|
|
183
202
|
deploymentMode: opts.deploymentMode,
|
|
203
|
+
authRequirement: opts.authRequirement,
|
|
184
204
|
resolveSessionFromHeaders: opts.resolveSessionFromHeaders,
|
|
185
205
|
})
|
|
186
206
|
.then((context) => {
|
|
@@ -192,8 +212,17 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
192
212
|
rejectUpgrade(socket, "403 Forbidden", "forbidden");
|
|
193
213
|
return;
|
|
194
214
|
}
|
|
215
|
+
if (context.actorType === "board"
|
|
216
|
+
&& sessionRevocationGeneration !== undefined
|
|
217
|
+
&& opts.sessionRevocation?.generation() !== sessionRevocationGeneration) {
|
|
218
|
+
rejectUpgrade(socket, "403 Forbidden", "account session changed");
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
195
221
|
const reqWithContext = req;
|
|
196
|
-
reqWithContext.rudderUpgradeContext =
|
|
222
|
+
reqWithContext.rudderUpgradeContext = {
|
|
223
|
+
...context,
|
|
224
|
+
sessionRevocationGeneration,
|
|
225
|
+
};
|
|
197
226
|
wss.handleUpgrade(req, socket, head, (ws) => {
|
|
198
227
|
wss.emit("connection", ws, reqWithContext);
|
|
199
228
|
});
|
|
@@ -219,6 +248,7 @@ export function setupLiveEventsWebSocketServer(server, db, opts) {
|
|
|
219
248
|
closing = true;
|
|
220
249
|
server.off("upgrade", handleUpgrade);
|
|
221
250
|
clearInterval(pingInterval);
|
|
251
|
+
unsubscribeSessionRevocation?.();
|
|
222
252
|
for (const socket of pendingUpgradeSockets) {
|
|
223
253
|
socket.destroy();
|
|
224
254
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events-ws.js","sourceRoot":"","sources":["../../src/realtime/live-events-ws.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"live-events-ws.js","sourceRoot":"","sources":["../../src/realtime/live-events-ws.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,9 +29,9 @@ export declare function listAvailableSkills(): AvailableSkill[];
|
|
|
29
29
|
export declare function toJoinRequestResponse(row: typeof joinRequests.$inferSelect): {
|
|
30
30
|
status: string;
|
|
31
31
|
id: string;
|
|
32
|
+
updatedAt: Date;
|
|
32
33
|
orgId: string;
|
|
33
34
|
createdAt: Date;
|
|
34
|
-
updatedAt: Date;
|
|
35
35
|
capabilities: string | null;
|
|
36
36
|
agentRuntimeType: string | null;
|
|
37
37
|
requestType: string;
|
|
@@ -32,9 +32,9 @@ export declare function prepareChatConversationPatch(body: ConversationPatch & {
|
|
|
32
32
|
status?: string | undefined;
|
|
33
33
|
title?: string | undefined;
|
|
34
34
|
id?: string | undefined;
|
|
35
|
-
createdAt?: Date | undefined;
|
|
36
35
|
updatedAt?: Date | undefined;
|
|
37
36
|
summary?: string | null | undefined;
|
|
37
|
+
createdAt?: Date | undefined;
|
|
38
38
|
preferredAgentId?: string | null | undefined;
|
|
39
39
|
modelOverride?: string | null | undefined;
|
|
40
40
|
effortOverride?: string | null | undefined;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { Db } from "@rudderhq/db";
|
|
2
|
+
import { type LocalAccountExchangePolicy } from "../services/local-account-auth.js";
|
|
3
|
+
import type { LocalAccountSessionRevocation } from "../services/local-account-session-revocation.js";
|
|
4
|
+
export declare function localAccountAuthRoutes(db: Db, options: {
|
|
5
|
+
installationId: string;
|
|
6
|
+
exchangePolicy: LocalAccountExchangePolicy;
|
|
7
|
+
sessionRevocation?: LocalAccountSessionRevocation;
|
|
8
|
+
}): import("express-serve-static-core").Router;
|
|
9
|
+
//# sourceMappingURL=local-account-auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"local-account-auth.d.ts","sourceRoot":"","sources":["../../src/routes/local-account-auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMvC,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,iDAAiD,CAAC;AAErG,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,EAAE,EACN,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,iBAAiB,CAAC,EAAE,6BAA6B,CAAC;CACnD,8CAsEF"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { externalUserBindings } from "@rudderhq/db";
|
|
2
|
+
import { localOfflineGrantSchema, localServerExchangeSchema } from "@rudderhq/shared";
|
|
3
|
+
import { and, eq } from "drizzle-orm";
|
|
4
|
+
import { Router } from "express";
|
|
5
|
+
import { forbidden, unauthorized } from "../errors.js";
|
|
6
|
+
import { localAccountAuthService, } from "../services/local-account-auth.js";
|
|
7
|
+
export function localAccountAuthRoutes(db, options) {
|
|
8
|
+
const router = Router();
|
|
9
|
+
const service = localAccountAuthService(db, options.exchangePolicy);
|
|
10
|
+
router.post("/auth/local-exchange", async (req, res) => {
|
|
11
|
+
const input = localServerExchangeSchema.parse(req.body);
|
|
12
|
+
const result = await service.redeem(input.exchangeCode);
|
|
13
|
+
res.setHeader("Set-Cookie", result.session.setCookie);
|
|
14
|
+
res.status(200).json({
|
|
15
|
+
userId: result.userId,
|
|
16
|
+
session: {
|
|
17
|
+
id: result.session.id,
|
|
18
|
+
expiresAt: result.session.expiresAt.toISOString(),
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
router.post("/auth/local-offline", async (req, res) => {
|
|
23
|
+
const input = localOfflineGrantSchema.parse(req.body);
|
|
24
|
+
const result = await service.redeemOffline(input);
|
|
25
|
+
res.setHeader("Set-Cookie", result.session.setCookie);
|
|
26
|
+
res.status(200).json({
|
|
27
|
+
userId: result.userId,
|
|
28
|
+
nextTrustedTimeMs: result.nextTrustedTimeMs,
|
|
29
|
+
session: {
|
|
30
|
+
id: result.session.id,
|
|
31
|
+
expiresAt: result.session.expiresAt.toISOString(),
|
|
32
|
+
},
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
router.post("/auth/local-claim", async (req, res) => {
|
|
36
|
+
if (req.actor.type !== "board" || !req.actor.userId) {
|
|
37
|
+
throw unauthorized("A local Rudder user session is required");
|
|
38
|
+
}
|
|
39
|
+
const binding = await db
|
|
40
|
+
.select({
|
|
41
|
+
issuer: externalUserBindings.issuer,
|
|
42
|
+
subject: externalUserBindings.subject,
|
|
43
|
+
})
|
|
44
|
+
.from(externalUserBindings)
|
|
45
|
+
.where(and(eq(externalUserBindings.localUserId, req.actor.userId), eq(externalUserBindings.issuer, options.exchangePolicy.expectedIssuer.replace(/\/+$/, ""))))
|
|
46
|
+
.then((rows) => rows[0] ?? null);
|
|
47
|
+
if (!binding)
|
|
48
|
+
throw forbidden("The current local user is not bound to a Rudder Account");
|
|
49
|
+
const result = await service.claimLegacyInstallation({
|
|
50
|
+
installationId: options.installationId,
|
|
51
|
+
issuer: binding.issuer,
|
|
52
|
+
subject: binding.subject,
|
|
53
|
+
localUserId: req.actor.userId,
|
|
54
|
+
});
|
|
55
|
+
res.status(200).json(result);
|
|
56
|
+
});
|
|
57
|
+
router.post("/auth/local-signout-all", async (req, res) => {
|
|
58
|
+
if (req.actor.type !== "board" || !req.actor.userId) {
|
|
59
|
+
throw unauthorized("A local Rudder user session is required");
|
|
60
|
+
}
|
|
61
|
+
const result = await service.revokeAllSessions(req.actor.userId);
|
|
62
|
+
options.sessionRevocation?.publish(req.actor.userId);
|
|
63
|
+
res.status(200).json(result);
|
|
64
|
+
});
|
|
65
|
+
return router;
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=local-account-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"local-account-auth.js","sourceRoot":"","sources":["../../src/routes/local-account-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,9 @@ export declare function accessService(db: Db): {
|
|
|
14
14
|
ensureMembership: (orgId: string, principalType: PrincipalType, principalId: string, membershipRole?: string | null, status?: "pending" | "active" | "suspended") => Promise<{
|
|
15
15
|
status: string;
|
|
16
16
|
id: string;
|
|
17
|
+
updatedAt: Date;
|
|
17
18
|
orgId: string;
|
|
18
19
|
createdAt: Date;
|
|
19
|
-
updatedAt: Date;
|
|
20
20
|
principalType: string;
|
|
21
21
|
principalId: string;
|
|
22
22
|
membershipRole: string | null;
|
|
@@ -63,15 +63,15 @@ export declare function accessService(db: Db): {
|
|
|
63
63
|
} | null>;
|
|
64
64
|
promoteInstanceAdmin: (userId: string) => Promise<{
|
|
65
65
|
id: string;
|
|
66
|
-
createdAt: Date;
|
|
67
66
|
updatedAt: Date;
|
|
67
|
+
createdAt: Date;
|
|
68
68
|
userId: string;
|
|
69
69
|
role: string;
|
|
70
70
|
}>;
|
|
71
71
|
demoteInstanceAdmin: (userId: string) => Promise<{
|
|
72
72
|
id: string;
|
|
73
|
-
createdAt: Date;
|
|
74
73
|
updatedAt: Date;
|
|
74
|
+
createdAt: Date;
|
|
75
75
|
userId: string;
|
|
76
76
|
role: string;
|
|
77
77
|
}>;
|
|
@@ -34,9 +34,9 @@ export declare function activityService(db: Db): {
|
|
|
34
34
|
list: (filters: ActivityFilters) => Promise<{
|
|
35
35
|
agentId: string | null;
|
|
36
36
|
id: string;
|
|
37
|
+
runId: string | null;
|
|
37
38
|
orgId: string;
|
|
38
39
|
createdAt: Date;
|
|
39
|
-
runId: string | null;
|
|
40
40
|
entityType: string;
|
|
41
41
|
entityId: string;
|
|
42
42
|
action: string;
|
|
@@ -49,9 +49,9 @@ export declare function activityService(db: Db): {
|
|
|
49
49
|
items: {
|
|
50
50
|
agentId: string | null;
|
|
51
51
|
id: string;
|
|
52
|
+
runId: string | null;
|
|
52
53
|
orgId: string;
|
|
53
54
|
createdAt: Date;
|
|
54
|
-
runId: string | null;
|
|
55
55
|
entityType: string;
|
|
56
56
|
entityId: string;
|
|
57
57
|
action: string;
|
|
@@ -114,9 +114,9 @@ export declare function activityService(db: Db): {
|
|
|
114
114
|
create: (data: typeof activityLog.$inferInsert) => Promise<{
|
|
115
115
|
agentId: string | null;
|
|
116
116
|
id: string;
|
|
117
|
+
runId: string | null;
|
|
117
118
|
orgId: string;
|
|
118
119
|
createdAt: Date;
|
|
119
|
-
runId: string | null;
|
|
120
120
|
entityType: string;
|
|
121
121
|
entityId: string;
|
|
122
122
|
action: string;
|
|
@@ -40,9 +40,9 @@ export declare function agentService(db: Db): {
|
|
|
40
40
|
icon: string | null;
|
|
41
41
|
title: string | null;
|
|
42
42
|
id: string;
|
|
43
|
+
updatedAt: Date;
|
|
43
44
|
orgId: string;
|
|
44
45
|
createdAt: Date;
|
|
45
|
-
updatedAt: Date;
|
|
46
46
|
name: string;
|
|
47
47
|
metadata: Record<string, unknown> | null;
|
|
48
48
|
role: string;
|
|
@@ -66,9 +66,9 @@ export declare function agentService(db: Db): {
|
|
|
66
66
|
icon: string | null;
|
|
67
67
|
title: string | null;
|
|
68
68
|
id: string;
|
|
69
|
+
updatedAt: Date;
|
|
69
70
|
orgId: string;
|
|
70
71
|
createdAt: Date;
|
|
71
|
-
updatedAt: Date;
|
|
72
72
|
name: string;
|
|
73
73
|
metadata: Record<string, unknown> | null;
|
|
74
74
|
role: string;
|
|
@@ -92,9 +92,9 @@ export declare function agentService(db: Db): {
|
|
|
92
92
|
icon: string | null;
|
|
93
93
|
title: string | null;
|
|
94
94
|
id: string;
|
|
95
|
+
updatedAt: Date;
|
|
95
96
|
orgId: string;
|
|
96
97
|
createdAt: Date;
|
|
97
|
-
updatedAt: Date;
|
|
98
98
|
name: string;
|
|
99
99
|
metadata: Record<string, unknown> | null;
|
|
100
100
|
role: string;
|
|
@@ -121,9 +121,9 @@ export declare function agentService(db: Db): {
|
|
|
121
121
|
icon: string | null;
|
|
122
122
|
title: string | null;
|
|
123
123
|
id: string;
|
|
124
|
+
updatedAt: Date;
|
|
124
125
|
orgId: string;
|
|
125
126
|
createdAt: Date;
|
|
126
|
-
updatedAt: Date;
|
|
127
127
|
name: string;
|
|
128
128
|
metadata: Record<string, unknown> | null;
|
|
129
129
|
role: string;
|
|
@@ -147,9 +147,9 @@ export declare function agentService(db: Db): {
|
|
|
147
147
|
icon: string | null;
|
|
148
148
|
title: string | null;
|
|
149
149
|
id: string;
|
|
150
|
+
updatedAt: Date;
|
|
150
151
|
orgId: string;
|
|
151
152
|
createdAt: Date;
|
|
152
|
-
updatedAt: Date;
|
|
153
153
|
name: string;
|
|
154
154
|
metadata: Record<string, unknown> | null;
|
|
155
155
|
role: string;
|
|
@@ -173,9 +173,9 @@ export declare function agentService(db: Db): {
|
|
|
173
173
|
icon: string | null;
|
|
174
174
|
title: string | null;
|
|
175
175
|
id: string;
|
|
176
|
+
updatedAt: Date;
|
|
176
177
|
orgId: string;
|
|
177
178
|
createdAt: Date;
|
|
178
|
-
updatedAt: Date;
|
|
179
179
|
name: string;
|
|
180
180
|
metadata: Record<string, unknown> | null;
|
|
181
181
|
role: string;
|
|
@@ -199,9 +199,9 @@ export declare function agentService(db: Db): {
|
|
|
199
199
|
icon: string | null;
|
|
200
200
|
title: string | null;
|
|
201
201
|
id: string;
|
|
202
|
+
updatedAt: Date;
|
|
202
203
|
orgId: string;
|
|
203
204
|
createdAt: Date;
|
|
204
|
-
updatedAt: Date;
|
|
205
205
|
name: string;
|
|
206
206
|
metadata: Record<string, unknown> | null;
|
|
207
207
|
role: string;
|
|
@@ -225,9 +225,9 @@ export declare function agentService(db: Db): {
|
|
|
225
225
|
icon: string | null;
|
|
226
226
|
title: string | null;
|
|
227
227
|
id: string;
|
|
228
|
+
updatedAt: Date;
|
|
228
229
|
orgId: string;
|
|
229
230
|
createdAt: Date;
|
|
230
|
-
updatedAt: Date;
|
|
231
231
|
name: string;
|
|
232
232
|
metadata: Record<string, unknown> | null;
|
|
233
233
|
role: string;
|
|
@@ -251,9 +251,9 @@ export declare function agentService(db: Db): {
|
|
|
251
251
|
icon: string | null;
|
|
252
252
|
title: string | null;
|
|
253
253
|
id: string;
|
|
254
|
+
updatedAt: Date;
|
|
254
255
|
orgId: string;
|
|
255
256
|
createdAt: Date;
|
|
256
|
-
updatedAt: Date;
|
|
257
257
|
name: string;
|
|
258
258
|
metadata: Record<string, unknown> | null;
|
|
259
259
|
role: string;
|
|
@@ -277,9 +277,9 @@ export declare function agentService(db: Db): {
|
|
|
277
277
|
icon: string | null;
|
|
278
278
|
title: string | null;
|
|
279
279
|
id: string;
|
|
280
|
+
updatedAt: Date;
|
|
280
281
|
orgId: string;
|
|
281
282
|
createdAt: Date;
|
|
282
|
-
updatedAt: Date;
|
|
283
283
|
name: string;
|
|
284
284
|
metadata: Record<string, unknown> | null;
|
|
285
285
|
role: string;
|
|
@@ -306,9 +306,9 @@ export declare function agentService(db: Db): {
|
|
|
306
306
|
icon: string | null;
|
|
307
307
|
title: string | null;
|
|
308
308
|
id: string;
|
|
309
|
+
updatedAt: Date;
|
|
309
310
|
orgId: string;
|
|
310
311
|
createdAt: Date;
|
|
311
|
-
updatedAt: Date;
|
|
312
312
|
name: string;
|
|
313
313
|
metadata: Record<string, unknown> | null;
|
|
314
314
|
role: string;
|
|
@@ -361,9 +361,9 @@ export declare function agentService(db: Db): {
|
|
|
361
361
|
icon: string | null;
|
|
362
362
|
title: string | null;
|
|
363
363
|
id: string;
|
|
364
|
+
updatedAt: Date;
|
|
364
365
|
orgId: string;
|
|
365
366
|
createdAt: Date;
|
|
366
|
-
updatedAt: Date;
|
|
367
367
|
name: string;
|
|
368
368
|
metadata: Record<string, unknown> | null;
|
|
369
369
|
role: string;
|
|
@@ -2384,9 +2384,9 @@ export declare function agentService(db: Db): {
|
|
|
2384
2384
|
icon: string | null;
|
|
2385
2385
|
title: string | null;
|
|
2386
2386
|
id: string;
|
|
2387
|
+
updatedAt: Date;
|
|
2387
2388
|
orgId: string;
|
|
2388
2389
|
createdAt: Date;
|
|
2389
|
-
updatedAt: Date;
|
|
2390
2390
|
name: string;
|
|
2391
2391
|
metadata: Record<string, unknown> | null;
|
|
2392
2392
|
role: string;
|
|
@@ -454,9 +454,9 @@ export declare function approvalService(db: Db): {
|
|
|
454
454
|
create: (orgId: string, data: Omit<typeof approvals.$inferInsert, "orgId">) => Promise<{
|
|
455
455
|
status: string;
|
|
456
456
|
id: string;
|
|
457
|
+
updatedAt: Date;
|
|
457
458
|
orgId: string;
|
|
458
459
|
createdAt: Date;
|
|
459
|
-
updatedAt: Date;
|
|
460
460
|
type: string;
|
|
461
461
|
payload: Record<string, unknown>;
|
|
462
462
|
decisionNote: string | null;
|
|
@@ -469,9 +469,9 @@ export declare function approvalService(db: Db): {
|
|
|
469
469
|
approval: {
|
|
470
470
|
status: string;
|
|
471
471
|
id: string;
|
|
472
|
+
updatedAt: Date;
|
|
472
473
|
orgId: string;
|
|
473
474
|
createdAt: Date;
|
|
474
|
-
updatedAt: Date;
|
|
475
475
|
type: string;
|
|
476
476
|
payload: Record<string, unknown>;
|
|
477
477
|
decisionNote: string | null;
|
|
@@ -486,9 +486,9 @@ export declare function approvalService(db: Db): {
|
|
|
486
486
|
approval: {
|
|
487
487
|
status: string;
|
|
488
488
|
id: string;
|
|
489
|
+
updatedAt: Date;
|
|
489
490
|
orgId: string;
|
|
490
491
|
createdAt: Date;
|
|
491
|
-
updatedAt: Date;
|
|
492
492
|
type: string;
|
|
493
493
|
payload: Record<string, unknown>;
|
|
494
494
|
decisionNote: string | null;
|
|
@@ -542,9 +542,9 @@ export declare function approvalService(db: Db): {
|
|
|
542
542
|
userId?: string;
|
|
543
543
|
}) => Promise<{
|
|
544
544
|
id: string;
|
|
545
|
+
updatedAt: Date;
|
|
545
546
|
orgId: string;
|
|
546
547
|
createdAt: Date;
|
|
547
|
-
updatedAt: Date;
|
|
548
548
|
body: string;
|
|
549
549
|
approvalId: string;
|
|
550
550
|
authorAgentId: string | null;
|
|
@@ -6,9 +6,9 @@ export declare function assetService(db: Db): {
|
|
|
6
6
|
byteSize: number;
|
|
7
7
|
contentType: string;
|
|
8
8
|
id: string;
|
|
9
|
+
updatedAt: Date;
|
|
9
10
|
orgId: string;
|
|
10
11
|
createdAt: Date;
|
|
11
|
-
updatedAt: Date;
|
|
12
12
|
provider: string;
|
|
13
13
|
createdByAgentId: string | null;
|
|
14
14
|
createdByUserId: string | null;
|