@goatlab/node-backend 1.1.24 → 1.2.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/index.d.ts +4 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.d.ts +69 -1
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +4 -0
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.js +9 -4
- package/dist/server/bootstraps/getExpressTrpcApp.js.map +1 -1
- package/dist/server/context/request.context.d.ts +1 -2
- package/dist/server/context/request.context.js +1 -1
- package/dist/server/context/request.context.js.map +1 -1
- package/dist/server/context/trpc.context.d.ts +25 -0
- package/dist/server/context/trpc.context.js +80 -54
- package/dist/server/context/trpc.context.js.map +1 -1
- package/dist/server/schemas/user.schema.d.ts +13 -5
- package/dist/server/schemas/user.schema.js +26 -4
- package/dist/server/schemas/user.schema.js.map +1 -1
- package/dist/server/test/firebase.mock.d.ts +4 -2
- package/dist/server/test/firebase.mock.js +15 -13
- package/dist/server/test/firebase.mock.js.map +1 -1
- package/dist/server/test/mock.model.d.ts +1 -1
- package/dist/server/trpc.d.ts +58 -26
- package/dist/server/trpc.js +4 -3
- package/dist/server/trpc.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
package/dist/index.d.ts
CHANGED
|
@@ -11,16 +11,19 @@ export { Container } from './container/Container';
|
|
|
11
11
|
export { DistributedCacheInvalidator, getDistributedCacheInvalidator, } from './container/DistributedCacheInvalidator';
|
|
12
12
|
export { createServiceCache } from './container/LruCache';
|
|
13
13
|
export type { BatchBootstrapOptions, BatchBootstrapResult, BatchInvalidationResult, ContainerBootstrapResult, ContainerContext, ContainerFactories, ContainerMetadata, ContainerOptions, Factory, MapInterface, PreloadStructure, } from './container/types';
|
|
14
|
-
export type { ExpressTrpcAppConfig } from './server/bootstraps/ExpressTrpcAppConfig';
|
|
14
|
+
export type { AuthConfig, AuthValidationResult, ExpressTrpcAppConfig, ValidatedAuthUser, } from './server/bootstraps/ExpressTrpcAppConfig';
|
|
15
15
|
export { getDefaultConfig } from './server/bootstraps/ExpressTrpcAppConfig';
|
|
16
16
|
export { getExpressTrpcApp } from './server/bootstraps/getExpressTrpcApp';
|
|
17
17
|
export type { PackageInfo } from './server/consts';
|
|
18
18
|
export { config } from './server/consts';
|
|
19
19
|
export type { LocationOutput } from './server/context/context.model';
|
|
20
20
|
export { requestContext } from './server/context/request.context';
|
|
21
|
+
export { type ContextFactoryOptions, createContextFactory, type TrpcContext, } from './server/context/trpc.context';
|
|
21
22
|
export { useCloudTaskDecryptMiddleware } from './server/middleware/cloudTaskDecrypt.middleware';
|
|
22
23
|
export { handleRequest } from './server/middleware/handleRequest.middleware';
|
|
23
24
|
export { getLogger } from './server/middleware/logger/logger.service';
|
|
25
|
+
export type { DecodedUserToken, RequestUser, TokenBasedAccess, } from './server/schemas/user.schema';
|
|
26
|
+
export { decodedUserTokenSchema, internalTokenSchema, requestTokenSchema, } from './server/schemas/user.schema';
|
|
24
27
|
export { getSentry } from './server/sentry/getSentry';
|
|
25
28
|
export { SentryService } from './server/sentry/sentry.service';
|
|
26
29
|
export type { EmailAttachment, EmailTemplates, Theme, } from './server/services/email/email.model';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.zodCompat = exports.getTrpc = exports.mockedAuthenticatedTrpcRouter = exports.UrlService = exports.paginationUtility = exports.translationService = exports.tr = exports.SendgridService = exports.SecretService = exports.getGcpServiceAccountFromBase64 = exports.EmailService = exports.Layout = exports.EmailCategory = exports.Content = exports.SentryService = exports.getSentry = exports.getLogger = exports.handleRequest = exports.useCloudTaskDecryptMiddleware = exports.requestContext = exports.config = exports.getExpressTrpcApp = exports.getDefaultConfig = exports.createServiceCache = exports.getDistributedCacheInvalidator = exports.DistributedCacheInvalidator = exports.Container = exports.TRPCError = exports.RedisConnectionPool = exports.LazyRedisStore = exports.Cache = void 0;
|
|
3
|
+
exports.zodCompat = exports.getTrpc = exports.mockedAuthenticatedTrpcRouter = exports.UrlService = exports.paginationUtility = exports.translationService = exports.tr = exports.SendgridService = exports.SecretService = exports.getGcpServiceAccountFromBase64 = exports.EmailService = exports.Layout = exports.EmailCategory = exports.Content = exports.SentryService = exports.getSentry = exports.requestTokenSchema = exports.internalTokenSchema = exports.decodedUserTokenSchema = exports.getLogger = exports.handleRequest = exports.useCloudTaskDecryptMiddleware = exports.createContextFactory = exports.requestContext = exports.config = exports.getExpressTrpcApp = exports.getDefaultConfig = exports.createServiceCache = exports.getDistributedCacheInvalidator = exports.DistributedCacheInvalidator = exports.Container = exports.TRPCError = exports.RedisConnectionPool = exports.LazyRedisStore = exports.Cache = void 0;
|
|
4
4
|
const Cache_1 = require("./Cache");
|
|
5
5
|
Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return Cache_1.Cache; } });
|
|
6
6
|
const LazyRedisStore_1 = require("./cache/LazyRedisStore");
|
|
@@ -28,12 +28,18 @@ var consts_1 = require("./server/consts");
|
|
|
28
28
|
Object.defineProperty(exports, "config", { enumerable: true, get: function () { return consts_1.config; } });
|
|
29
29
|
var request_context_1 = require("./server/context/request.context");
|
|
30
30
|
Object.defineProperty(exports, "requestContext", { enumerable: true, get: function () { return request_context_1.requestContext; } });
|
|
31
|
+
var trpc_context_1 = require("./server/context/trpc.context");
|
|
32
|
+
Object.defineProperty(exports, "createContextFactory", { enumerable: true, get: function () { return trpc_context_1.createContextFactory; } });
|
|
31
33
|
var cloudTaskDecrypt_middleware_1 = require("./server/middleware/cloudTaskDecrypt.middleware");
|
|
32
34
|
Object.defineProperty(exports, "useCloudTaskDecryptMiddleware", { enumerable: true, get: function () { return cloudTaskDecrypt_middleware_1.useCloudTaskDecryptMiddleware; } });
|
|
33
35
|
var handleRequest_middleware_1 = require("./server/middleware/handleRequest.middleware");
|
|
34
36
|
Object.defineProperty(exports, "handleRequest", { enumerable: true, get: function () { return handleRequest_middleware_1.handleRequest; } });
|
|
35
37
|
var logger_service_1 = require("./server/middleware/logger/logger.service");
|
|
36
38
|
Object.defineProperty(exports, "getLogger", { enumerable: true, get: function () { return logger_service_1.getLogger; } });
|
|
39
|
+
var user_schema_1 = require("./server/schemas/user.schema");
|
|
40
|
+
Object.defineProperty(exports, "decodedUserTokenSchema", { enumerable: true, get: function () { return user_schema_1.decodedUserTokenSchema; } });
|
|
41
|
+
Object.defineProperty(exports, "internalTokenSchema", { enumerable: true, get: function () { return user_schema_1.internalTokenSchema; } });
|
|
42
|
+
Object.defineProperty(exports, "requestTokenSchema", { enumerable: true, get: function () { return user_schema_1.requestTokenSchema; } });
|
|
37
43
|
var getSentry_1 = require("./server/sentry/getSentry");
|
|
38
44
|
Object.defineProperty(exports, "getSentry", { enumerable: true, get: function () { return getSentry_1.getSentry; } });
|
|
39
45
|
var sentry_service_1 = require("./server/sentry/sentry.service");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,mCAAkD;AAIzC,sFAJA,aAAK,OAIA;AAHd,2DAAuD;AAGvC,+FAHP,+BAAc,OAGO;AAF9B,qEAAiE;AAEjC,oGAFvB,yCAAmB,OAEuB;AAInD,uCAAwC;AAA/B,mGAAA,SAAS,OAAA;AAElB,wBAAwB;AACxB,mBAAmB;AACnB,wBAAwB;AACxB,mDAAiD;AAAxC,sGAAA,SAAS,OAAA;AAClB,uFAGgD;AAF9C,0IAAA,2BAA2B,OAAA;AAC3B,6IAAA,8BAA8B,OAAA;AAEhC,iDAAyD;AAAhD,8GAAA,kBAAkB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,mCAAkD;AAIzC,sFAJA,aAAK,OAIA;AAHd,2DAAuD;AAGvC,+FAHP,+BAAc,OAGO;AAF9B,qEAAiE;AAEjC,oGAFvB,yCAAmB,OAEuB;AAInD,uCAAwC;AAA/B,mGAAA,SAAS,OAAA;AAElB,wBAAwB;AACxB,mBAAmB;AACnB,wBAAwB;AACxB,mDAAiD;AAAxC,sGAAA,SAAS,OAAA;AAClB,uFAGgD;AAF9C,0IAAA,2BAA2B,OAAA;AAC3B,6IAAA,8BAA8B,OAAA;AAEhC,iDAAyD;AAAhD,8GAAA,kBAAkB,OAAA;AAoB3B,iFAA2E;AAAlE,wHAAA,gBAAgB,OAAA;AACzB,sBAAsB;AACtB,2EAAyE;AAAhE,sHAAA,iBAAiB,OAAA;AAE1B,0CAAwC;AAA/B,gGAAA,MAAM,OAAA;AAEf,oEAAiE;AAAxD,iHAAA,cAAc,OAAA;AACvB,8DAIsC;AAFpC,oHAAA,oBAAoB,OAAA;AAGtB,+FAA+F;AAAtF,4IAAA,6BAA6B,OAAA;AACtC,yFAA4E;AAAnE,yHAAA,aAAa,OAAA;AACtB,4EAAqE;AAA5D,2GAAA,SAAS,OAAA;AAMlB,4DAIqC;AAHnC,qHAAA,sBAAsB,OAAA;AACtB,kHAAA,mBAAmB,OAAA;AACnB,iHAAA,kBAAkB,OAAA;AAEpB,uDAAqD;AAA5C,sGAAA,SAAS,OAAA;AAClB,iEAA8D;AAArD,+GAAA,aAAa,OAAA;AAMtB,mEAI4C;AAH1C,sGAAA,OAAO,OAAA;AACP,4GAAA,aAAa,OAAA;AACb,qGAAA,MAAM,OAAA;AAER,uEAAoE;AAA3D,6GAAA,YAAY,OAAA;AACrB,uGAAqG;AAA5F,gJAAA,8BAA8B,OAAA;AAKvC,2EAAwE;AAA/D,+GAAA,aAAa,OAAA;AAEtB,sFAAgF;AAAvE,sHAAA,eAAe,OAAA;AACxB,0FAG2D;AAFzD,yGAAA,EAAE,OAAA;AACF,yHAAA,kBAAkB,OAAA;AAEpB,gEAAqE;AAA5D,+GAAA,iBAAiB,OAAA;AAC1B,kEAA+D;AAAtD,yGAAA,UAAU,OAAA;AACnB,qDAAuE;AAA9D,0HAAA,6BAA6B,OAAA;AACtC,sCAAuC;AAA9B,+FAAA,OAAO,OAAA;AAGhB,wBAAwB;AACxB,oBAAoB;AACpB,wBAAwB;AACxB,mDAAgD"}
|
|
@@ -1,8 +1,75 @@
|
|
|
1
1
|
import type { CommonLogger } from '@goatlab/js-utils';
|
|
2
2
|
import type { BuiltRouter } from '@trpc/server/unstable-core-do-not-import';
|
|
3
|
-
import type { RequestHandler, Router } from 'express';
|
|
3
|
+
import type { Request, RequestHandler, Router } from 'express';
|
|
4
4
|
import type { SentryService } from '../sentry/sentry.service';
|
|
5
5
|
import type { Environment } from '../types/Envinronment';
|
|
6
|
+
/**
|
|
7
|
+
* Validated user from Better Auth or other auth provider
|
|
8
|
+
*/
|
|
9
|
+
export interface ValidatedAuthUser {
|
|
10
|
+
/** User's unique ID */
|
|
11
|
+
id: string;
|
|
12
|
+
/** User's email address */
|
|
13
|
+
email: string;
|
|
14
|
+
/** Whether email has been verified */
|
|
15
|
+
emailVerified?: boolean;
|
|
16
|
+
/** User's display name */
|
|
17
|
+
name?: string;
|
|
18
|
+
/** User's profile image URL */
|
|
19
|
+
image?: string;
|
|
20
|
+
/** Session ID if using session-based auth */
|
|
21
|
+
sessionId?: string;
|
|
22
|
+
/** Additional metadata */
|
|
23
|
+
metadata?: Record<string, unknown>;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Result of token validation
|
|
27
|
+
*/
|
|
28
|
+
export interface AuthValidationResult {
|
|
29
|
+
/** Whether the token is valid */
|
|
30
|
+
valid: boolean;
|
|
31
|
+
/** Validated user info (only present if valid) */
|
|
32
|
+
user?: ValidatedAuthUser;
|
|
33
|
+
/** Error message (only present if invalid) */
|
|
34
|
+
error?: string;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Auth configuration for Better Auth integration
|
|
38
|
+
*/
|
|
39
|
+
export interface AuthConfig {
|
|
40
|
+
/**
|
|
41
|
+
* Validate a token and return the authenticated user.
|
|
42
|
+
* This callback is called for each request with a Bearer token.
|
|
43
|
+
*
|
|
44
|
+
* @param token - The token from Authorization header (without "Bearer " prefix)
|
|
45
|
+
* @param req - The Express request object (for accessing headers, tenant info, etc.)
|
|
46
|
+
* @returns Validation result with user info or error
|
|
47
|
+
*
|
|
48
|
+
* @example
|
|
49
|
+
* ```typescript
|
|
50
|
+
* validateToken: async (token, req) => {
|
|
51
|
+
* const tenantId = req.headers['x-tenant-id'] as string
|
|
52
|
+
* const auth = await getBetterAuthForTenant(tenantId)
|
|
53
|
+
* const session = await auth.api.getSession({
|
|
54
|
+
* headers: new Headers({ authorization: `Bearer ${token}` })
|
|
55
|
+
* })
|
|
56
|
+
* if (!session?.user) {
|
|
57
|
+
* return { valid: false, error: 'Invalid session' }
|
|
58
|
+
* }
|
|
59
|
+
* return {
|
|
60
|
+
* valid: true,
|
|
61
|
+
* user: {
|
|
62
|
+
* id: session.user.id,
|
|
63
|
+
* email: session.user.email,
|
|
64
|
+
* emailVerified: session.user.emailVerified,
|
|
65
|
+
* name: session.user.name,
|
|
66
|
+
* }
|
|
67
|
+
* }
|
|
68
|
+
* }
|
|
69
|
+
* ```
|
|
70
|
+
*/
|
|
71
|
+
validateToken?: (token: string, req: Request) => Promise<AuthValidationResult>;
|
|
72
|
+
}
|
|
6
73
|
export interface RequiredExpressTrpcAppConfig {
|
|
7
74
|
trpcRouter: BuiltRouter<any, any>;
|
|
8
75
|
}
|
|
@@ -16,6 +83,7 @@ export interface OptionalExpressTrpcAppConfig {
|
|
|
16
83
|
logger?: CommonLogger;
|
|
17
84
|
expressResources?: Router[] | readonly Router[];
|
|
18
85
|
customHandlers?: RequestHandler[];
|
|
86
|
+
auth?: AuthConfig;
|
|
19
87
|
features?: {
|
|
20
88
|
openApiDocs?: boolean;
|
|
21
89
|
sentry?: boolean;
|
|
@@ -64,6 +64,10 @@ function getDefaultConfig(userConfig) {
|
|
|
64
64
|
// Express extensions
|
|
65
65
|
expressResources: [],
|
|
66
66
|
customHandlers: [],
|
|
67
|
+
// Authentication (Better Auth) - no default validator
|
|
68
|
+
auth: {
|
|
69
|
+
validateToken: undefined,
|
|
70
|
+
},
|
|
67
71
|
// Feature flags
|
|
68
72
|
features: {
|
|
69
73
|
openApiDocs: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressTrpcAppConfig.js","sourceRoot":"","sources":["../../../src/server/bootstraps/ExpressTrpcAppConfig.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ExpressTrpcAppConfig.js","sourceRoot":"","sources":["../../../src/server/bootstraps/ExpressTrpcAppConfig.ts"],"names":[],"mappings":";;AA4QA,4CAyJC;AAlaD,sCAA+B;AA2N/B;;;GAGG;AACH,SAAS,SAAS,CAChB,MAAS,EACT,MAAkB;IAElB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAA;IAE5B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YAC/B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YAE/B,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC9B,SAAQ;YACV,CAAC;YAED,IACE,WAAW,KAAK,IAAI;gBACpB,OAAO,WAAW,KAAK,QAAQ;gBAC/B,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAC1B,CAAC;gBACD,sDAAsD;gBACtD,CAAC;gBAAC,MAAc,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;YACrC,CAAC;iBAAM,IACL,WAAW;gBACX,OAAO,WAAW,KAAK,QAAQ;gBAC/B,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAC3B,CAAC;gBACD,iCAAiC;gBACjC,CAAC;gBAAC,MAAc,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YAC7D,CAAC;iBAAM,CAAC;gBACN,qDAAqD;gBACrD,CAAC;gBAAC,MAAc,CAAC,GAAG,CAAC,GAAG,WAAW,CAAA;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,UAAqC;IAErC,oDAAoD;IACpD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,IAAI,OAAO,CAAA;IACrD,MAAM,YAAY,GAAG,WAAW,KAAK,MAAM,CAAA;IAC3C,MAAM,aAAa,GAAG,WAAW,KAAK,OAAO,IAAI,WAAW,KAAK,KAAK,CAAA;IAEtE,6CAA6C;IAC7C,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAA;IAEpC,uCAAuC;IACvC,MAAM,QAAQ,GAAyB;QACrC,mCAAmC;QACnC,UAAU,EAAE,UAAU,CAAC,UAAU;QAEjC,+BAA+B;QAC/B,OAAO,EAAE,YAAG,CAAC,IAAI,IAAI,kBAAkB;QACvC,UAAU,EAAE,YAAG,CAAC,OAAO,IAAI,OAAO;QAClC,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,oBAAoB,IAAI,EAAE;QAEnC,wBAAwB;QACxB,aAAa,EAAE,SAAS;QACxB,MAAM,EAAE,OAAO;QAEf,qBAAqB;QACrB,gBAAgB,EAAE,EAAE;QACpB,cAAc,EAAE,EAAE;QAElB,sDAAsD;QACtD,IAAI,EAAE;YACJ,aAAa,EAAE,SAAS;SACzB;QAED,gBAAgB;QAChB,QAAQ,EAAE;YACR,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,YAAY;YACpB,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,QAAQ;SACf;QAED,yBAAyB;QACzB,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,cAAc,EAAE,YAAY;oBAC1B,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;gBACtD,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,KAAK;aACd;YACD,MAAM,EAAE;gBACN,qBAAqB,EAAE,YAAY;gBACnC,yBAAyB,EAAE,CAAC,aAAa;aAC1C;YACD,SAAS,EAAE;gBACT,MAAM,EAAE;oBACN,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;oBACvC,GAAG,EAAE,GAAG;iBACT;gBACD,IAAI,EAAE;oBACJ,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;oBACvC,GAAG,EAAE,CAAC;iBACP;gBACD,GAAG,EAAE;oBACH,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;oBACvC,GAAG,EAAE,GAAG;iBACT;aACF;YACD,cAAc,EAAE,KAAK,EAAE,aAAa;SACrC;QAED,6BAA6B;QAC7B,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ,KAAK,EAAE,OAAO;gBACd,IAAI,EAAE,CAAC,kBAAkB,EAAE,YAAY,CAAC;aACzC;YACD,UAAU,EAAE;gBACV,KAAK,EAAE,OAAO;gBACd,QAAQ,EAAE,IAAI;aACf;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,IAAI;aACd;SACF;QAED,uBAAuB;QACvB,WAAW,EAAE;YACX,WAAW,EAAE;gBACX,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,EAAE,GAAG,IAAI;gBACpB,QAAQ,EAAE,CAAC;aACZ;YACD,gBAAgB,EAAE;gBAChB,OAAO,EAAE,IAAI;gBACb,gBAAgB,EAAE,EAAE;gBACpB,iBAAiB,EAAE,EAAE;gBACrB,eAAe,EAAE,KAAK;gBACtB,uBAAuB,EAAE,YAAY;gBACrC,UAAU,EAAE,CAAC,YAAY;aAC1B;YACD,OAAO,EAAE;gBACP,YAAY,EAAE;oBACZ,MAAM,EAAE,QAAQ,EAAE,SAAS;iBAC5B;aACF;SACF;QAED,uBAAuB;QACvB,MAAM,EAAE;YACN,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,EAAE;SACd;QAED,6BAA6B;QAC7B,WAAW,EAAE;YACX,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,SAAS;SACxB;QAED,4BAA4B;QAC5B,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,SAAS;SACxB;QAED,qBAAqB;QACrB,iBAAiB,EAAE;YACjB,gBAAgB,EAAE;gBAChB,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,SAAS;aACtB;YACD,iBAAiB,EAAE,SAAS;YAC5B,kBAAkB,EAAE,SAAS;SAC9B;KACF,CAAA;IAED,8CAA8C;IAC9C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAE9C,kEAAkE;IAClE,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAA;IACrC,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -34,7 +34,12 @@ function isCloudRun() {
|
|
|
34
34
|
function getExpressTrpcApp(config) {
|
|
35
35
|
// Apply defaults
|
|
36
36
|
const fullConfig = (0, ExpressTrpcAppConfig_1.getDefaultConfig)(config);
|
|
37
|
-
const { appName, appVersion, port, baseUrl, environment, trpcRouter, sentryService, logger = console, expressResources, customHandlers, features, security, bodyParsing, performance, server: serverConfig, healthCheck, readyCheck, processManagement, } = fullConfig;
|
|
37
|
+
const { appName, appVersion, port, baseUrl, environment, trpcRouter, sentryService, logger = console, expressResources, customHandlers, auth, features, security, bodyParsing, performance, server: serverConfig, healthCheck, readyCheck, processManagement, } = fullConfig;
|
|
38
|
+
// Create context factory with auth config
|
|
39
|
+
const createContext = (0, trpc_context_1.createContextFactory)({
|
|
40
|
+
validateToken: auth?.validateToken,
|
|
41
|
+
logger,
|
|
42
|
+
});
|
|
38
43
|
logger.log(`Starting ${appName}`);
|
|
39
44
|
const app = express();
|
|
40
45
|
// Performance: Enable compression with optimized settings
|
|
@@ -232,7 +237,7 @@ function getExpressTrpcApp(config) {
|
|
|
232
237
|
// TRPC endpoint
|
|
233
238
|
app.use('/trpc', trpcExpress.createExpressMiddleware({
|
|
234
239
|
router: trpcRouter,
|
|
235
|
-
createContext
|
|
240
|
+
createContext,
|
|
236
241
|
onError: e => (0, trpcError_middleware_1.trpcErrorMiddleware)({ sentryService, ...e }),
|
|
237
242
|
}));
|
|
238
243
|
expressResources?.forEach(expressResource => {
|
|
@@ -249,12 +254,12 @@ function getExpressTrpcApp(config) {
|
|
|
249
254
|
// Apply the OpenAPI Express middleware only when OpenAPI docs are enabled
|
|
250
255
|
app.use('/', (0, trpc_to_openapi_1.createOpenApiExpressMiddleware)({
|
|
251
256
|
router: trpcRouter,
|
|
252
|
-
createContext
|
|
257
|
+
createContext,
|
|
253
258
|
onError: trpcError_middleware_1.trpcErrorMiddleware,
|
|
254
259
|
}));
|
|
255
260
|
}
|
|
256
261
|
app.use(async (req, _res, next) => {
|
|
257
|
-
req.context = await
|
|
262
|
+
req.context = await createContext({
|
|
258
263
|
req,
|
|
259
264
|
});
|
|
260
265
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExpressTrpcApp.js","sourceRoot":"","sources":["../../../src/server/bootstraps/getExpressTrpcApp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getExpressTrpcApp.js","sourceRoot":"","sources":["../../../src/server/bootstraps/getExpressTrpcApp.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,14 +13,13 @@ export declare const requestContext: (request: Request, token?: DecodedUserToken
|
|
|
13
13
|
email: string;
|
|
14
14
|
email_verified: boolean;
|
|
15
15
|
uid: string;
|
|
16
|
-
firebase?: any;
|
|
17
16
|
displayName?: string;
|
|
18
17
|
name?: string;
|
|
19
18
|
ownerId?: string;
|
|
20
19
|
user_id?: string;
|
|
21
20
|
};
|
|
22
21
|
email: string;
|
|
23
|
-
|
|
22
|
+
userId: string;
|
|
24
23
|
};
|
|
25
24
|
url: string;
|
|
26
25
|
method: string;
|
|
@@ -41,7 +41,7 @@ const requestContext = (request, token) => {
|
|
|
41
41
|
? {
|
|
42
42
|
decodedToken: token,
|
|
43
43
|
email: 'email' in token ? token.email : undefined,
|
|
44
|
-
|
|
44
|
+
userId: 'uid' in token ? token.uid : undefined,
|
|
45
45
|
}
|
|
46
46
|
: undefined,
|
|
47
47
|
url: request.url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.context.js","sourceRoot":"","sources":["../../../src/server/context/request.context.ts"],"names":[],"mappings":";;;AAIA,8DAA8D;AAC9D,IAAI,QAAa,CAAA;AACjB,IAAI,CAAC;IACH,+BAA+B;IAC/B,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;AACvE,CAAC;AAAC,MAAM,CAAC;IACP,IAAI,CAAC;QACH,oBAAoB;QACpB,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,qCAAqC;QACrC,QAAQ,GAAG;YACT,SAAS;gBACP,OAAO;oBACL,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;oBACzC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;oBACxC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;oBACpC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC3B,GAAG,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE;iBACjC,CAAA;YACH,CAAC;SACF,CAAA;IACH,CAAC;AACH,CAAC;AAEM,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAE,KAAwB,EAAE,EAAE;IAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;IACrD,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAA;IACtC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IAEjC,MAAM,EAAE,GACN,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,MAAM,CAAC,aAAa;QAC3B,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAY;QAC9C,EAAE,CAAA;IAEJ,MAAM,SAAS,GAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAY,IAAI,EAAE,CAAA;IAElE,OAAO;QACL,IAAI,EACF,KAAK,IAAI,OAAO,IAAI,KAAK;YACvB,CAAC,CAAC;gBACE,YAAY,EAAE,KAAK;gBACnB,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;gBACjD,
|
|
1
|
+
{"version":3,"file":"request.context.js","sourceRoot":"","sources":["../../../src/server/context/request.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,36 @@
|
|
|
1
|
+
import type { CommonLogger } from '@goatlab/js-utils';
|
|
1
2
|
import type * as trpcExpress from '@trpc/server/adapters/express';
|
|
3
|
+
import type { AuthConfig, ValidatedAuthUser } from '../bootstraps/ExpressTrpcAppConfig';
|
|
2
4
|
import { requestContext } from './request.context';
|
|
3
5
|
declare global {
|
|
4
6
|
namespace Express {
|
|
5
7
|
interface Request {
|
|
6
8
|
context: ReturnType<typeof requestContext>;
|
|
9
|
+
/** Pre-validated Better Auth user (set by middleware) */
|
|
10
|
+
betterAuthUser?: ValidatedAuthUser;
|
|
7
11
|
}
|
|
8
12
|
}
|
|
9
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Options for creating the context factory
|
|
16
|
+
*/
|
|
17
|
+
export interface ContextFactoryOptions {
|
|
18
|
+
/** Token validation callback from auth config */
|
|
19
|
+
validateToken?: AuthConfig['validateToken'];
|
|
20
|
+
/** Logger instance */
|
|
21
|
+
logger?: CommonLogger;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Create a context factory with the given auth configuration.
|
|
25
|
+
* This allows injecting the auth validation logic at app startup.
|
|
26
|
+
*
|
|
27
|
+
* @param options - Configuration options including auth validator
|
|
28
|
+
* @returns A createContext function for tRPC/Express
|
|
29
|
+
*/
|
|
30
|
+
export declare function createContextFactory(options?: ContextFactoryOptions): ({ req, }: trpcExpress.CreateExpressContextOptions) => Promise<ReturnType<typeof requestContext>>;
|
|
31
|
+
/**
|
|
32
|
+
* Default context creator (no auth validation)
|
|
33
|
+
* Use createContextFactory for production with auth
|
|
34
|
+
*/
|
|
10
35
|
export declare const createContext: ({ req, }: trpcExpress.CreateExpressContextOptions) => Promise<ReturnType<typeof requestContext>>;
|
|
11
36
|
export type TrpcContext = Awaited<ReturnType<typeof createContext>>;
|
|
@@ -1,67 +1,93 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createContext = void 0;
|
|
4
|
-
|
|
5
|
-
const server_1 = require("@trpc/server");
|
|
6
|
-
const admin = require("firebase-admin");
|
|
4
|
+
exports.createContextFactory = createContextFactory;
|
|
7
5
|
const passport_jwt_1 = require("passport-jwt");
|
|
8
|
-
const user_schema_1 = require("../schemas/user.schema");
|
|
9
6
|
const request_context_1 = require("./request.context");
|
|
10
7
|
/**
|
|
11
|
-
*
|
|
8
|
+
* Create a context factory with the given auth configuration.
|
|
9
|
+
* This allows injecting the auth validation logic at app startup.
|
|
10
|
+
*
|
|
11
|
+
* @param options - Configuration options including auth validator
|
|
12
|
+
* @returns A createContext function for tRPC/Express
|
|
12
13
|
*/
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
// const isValid = await tokenService.validateToken({
|
|
27
|
-
// providedToken: token,
|
|
28
|
-
// purpose: 'INTERNAL_SERVICE', // Adjust if needed
|
|
29
|
-
// })
|
|
30
|
-
// if (isValid) {
|
|
31
|
-
// // Optionally fetch more details about the token if needed
|
|
32
|
-
// const tokenDetails = await tokenService.getTokenDetails(token)
|
|
33
|
-
// return {
|
|
34
|
-
// ownerId: tokenDetails?.ownerId,
|
|
35
|
-
// purpose: tokenDetails?.purpose,
|
|
36
|
-
// }
|
|
37
|
-
// }
|
|
38
|
-
return null;
|
|
39
|
-
};
|
|
40
|
-
const createContext = async ({ req, }) => {
|
|
41
|
-
const idToken = passport_jwt_1.ExtractJwt.fromAuthHeaderAsBearerToken()(req);
|
|
42
|
-
if (idToken) {
|
|
14
|
+
function createContextFactory(options = {}) {
|
|
15
|
+
const { validateToken, logger = console } = options;
|
|
16
|
+
/**
|
|
17
|
+
* Validate a token using the configured validator
|
|
18
|
+
*/
|
|
19
|
+
async function validateAuthToken(token, req) {
|
|
20
|
+
// If no validator configured, return invalid
|
|
21
|
+
if (!validateToken) {
|
|
22
|
+
return {
|
|
23
|
+
valid: false,
|
|
24
|
+
error: 'No auth validator configured',
|
|
25
|
+
};
|
|
26
|
+
}
|
|
43
27
|
try {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
28
|
+
return await validateToken(token, req);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
logger.error?.('[Auth] Token validation error:', error);
|
|
32
|
+
return {
|
|
33
|
+
valid: false,
|
|
34
|
+
error: error instanceof Error ? error.message : 'Validation failed',
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Create the tRPC/Express context for a request
|
|
40
|
+
*/
|
|
41
|
+
async function createContext({ req, }) {
|
|
42
|
+
// Check if user was already validated by middleware (e.g., multi-tenant middleware)
|
|
43
|
+
if (req.betterAuthUser) {
|
|
44
|
+
return (0, request_context_1.requestContext)(req, {
|
|
45
|
+
uid: req.betterAuthUser.id,
|
|
46
|
+
email: req.betterAuthUser.email,
|
|
47
|
+
email_verified: req.betterAuthUser.emailVerified ?? false,
|
|
48
|
+
name: req.betterAuthUser.name,
|
|
49
|
+
iss: 'better-auth',
|
|
50
|
+
aud: 'app',
|
|
51
|
+
auth_time: Math.floor(Date.now() / 1000),
|
|
52
|
+
sub: req.betterAuthUser.id,
|
|
53
|
+
iat: Math.floor(Date.now() / 1000),
|
|
54
|
+
exp: Math.floor(Date.now() / 1000) + 3600,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
// Extract token from Authorization header
|
|
58
|
+
const token = passport_jwt_1.ExtractJwt.fromAuthHeaderAsBearerToken()(req);
|
|
59
|
+
if (token) {
|
|
60
|
+
// Validate using configured auth validator (Better Auth)
|
|
61
|
+
const result = await validateAuthToken(token, req);
|
|
62
|
+
if (result.valid && result.user) {
|
|
63
|
+
return (0, request_context_1.requestContext)(req, {
|
|
64
|
+
uid: result.user.id,
|
|
65
|
+
email: result.user.email,
|
|
66
|
+
email_verified: result.user.emailVerified ?? false,
|
|
67
|
+
name: result.user.name,
|
|
68
|
+
iss: 'better-auth',
|
|
69
|
+
aud: 'app',
|
|
70
|
+
auth_time: Math.floor(Date.now() / 1000),
|
|
71
|
+
sub: result.user.id,
|
|
72
|
+
iat: Math.floor(Date.now() / 1000),
|
|
73
|
+
exp: Math.floor(Date.now() / 1000) + 3600,
|
|
74
|
+
});
|
|
51
75
|
}
|
|
52
|
-
//
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
76
|
+
// Token provided but validation failed
|
|
77
|
+
// Don't throw immediately - let protected procedures handle it
|
|
78
|
+
// This allows for anonymous access to public endpoints
|
|
79
|
+
if (result.error) {
|
|
80
|
+
logger.warn?.(`[Auth] Token validation failed: ${result.error}. Proceeding without user context.`);
|
|
57
81
|
}
|
|
58
|
-
throw new Error('Invalid token format');
|
|
59
|
-
}
|
|
60
|
-
catch (err) {
|
|
61
|
-
throw new server_1.TRPCError({ code: 'UNAUTHORIZED', message: err.message });
|
|
62
82
|
}
|
|
83
|
+
// No token or validation failed - return anonymous context
|
|
84
|
+
return (0, request_context_1.requestContext)(req);
|
|
63
85
|
}
|
|
64
|
-
return
|
|
65
|
-
}
|
|
66
|
-
|
|
86
|
+
return createContext;
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Default context creator (no auth validation)
|
|
90
|
+
* Use createContextFactory for production with auth
|
|
91
|
+
*/
|
|
92
|
+
exports.createContext = createContextFactory();
|
|
67
93
|
//# sourceMappingURL=trpc.context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpc.context.js","sourceRoot":"","sources":["../../../src/server/context/trpc.context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"trpc.context.js","sourceRoot":"","sources":["../../../src/server/context/trpc.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
|
+
* Decoded user token schema (Better Auth compatible)
|
|
4
|
+
* This format is used internally after token validation
|
|
5
|
+
*/
|
|
6
|
+
export declare const decodedUserTokenSchema: z.ZodObject<{
|
|
3
7
|
iss: z.ZodString;
|
|
4
8
|
aud: z.ZodString;
|
|
5
9
|
auth_time: z.ZodNumber;
|
|
@@ -8,16 +12,21 @@ export declare const firebaseDecodedTokenSchema: z.ZodObject<{
|
|
|
8
12
|
exp: z.ZodNumber;
|
|
9
13
|
email: z.ZodString;
|
|
10
14
|
email_verified: z.ZodBoolean;
|
|
11
|
-
firebase: z.ZodOptional<z.ZodAny>;
|
|
12
15
|
uid: z.ZodString;
|
|
13
16
|
displayName: z.ZodOptional<z.ZodString>;
|
|
14
17
|
name: z.ZodOptional<z.ZodString>;
|
|
15
18
|
ownerId: z.ZodOptional<z.ZodString>;
|
|
16
19
|
user_id: z.ZodOptional<z.ZodString>;
|
|
17
20
|
}, z.core.$strip>;
|
|
21
|
+
/**
|
|
22
|
+
* Internal token schema for service-to-service auth
|
|
23
|
+
*/
|
|
18
24
|
export declare const internalTokenSchema: z.ZodObject<{
|
|
19
25
|
tokenPurpose: z.ZodOptional<z.ZodString>;
|
|
20
26
|
}, z.core.$strip>;
|
|
27
|
+
/**
|
|
28
|
+
* Combined request token schema
|
|
29
|
+
*/
|
|
21
30
|
export declare const requestTokenSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
22
31
|
iss: z.ZodString;
|
|
23
32
|
aud: z.ZodString;
|
|
@@ -27,7 +36,6 @@ export declare const requestTokenSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
|
27
36
|
exp: z.ZodNumber;
|
|
28
37
|
email: z.ZodString;
|
|
29
38
|
email_verified: z.ZodBoolean;
|
|
30
|
-
firebase: z.ZodOptional<z.ZodAny>;
|
|
31
39
|
uid: z.ZodString;
|
|
32
40
|
displayName: z.ZodOptional<z.ZodString>;
|
|
33
41
|
name: z.ZodOptional<z.ZodString>;
|
|
@@ -36,6 +44,6 @@ export declare const requestTokenSchema: z.ZodUnion<readonly [z.ZodObject<{
|
|
|
36
44
|
}, z.core.$strip>, z.ZodObject<{
|
|
37
45
|
tokenPurpose: z.ZodOptional<z.ZodString>;
|
|
38
46
|
}, z.core.$strip>]>;
|
|
39
|
-
export type
|
|
47
|
+
export type DecodedUserToken = z.infer<typeof decodedUserTokenSchema>;
|
|
40
48
|
export type TokenBasedAccess = z.infer<typeof internalTokenSchema>;
|
|
41
|
-
export type
|
|
49
|
+
export type RequestUser = z.infer<typeof requestTokenSchema>;
|