@postxl/generators 1.18.0 → 1.20.0
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/backend-actions/actions.generator.d.ts +1 -0
- package/dist/backend-actions/actions.generator.js +6 -0
- package/dist/backend-actions/actions.generator.js.map +1 -1
- package/dist/backend-actions/generators/actions-module.generator.js +3 -2
- package/dist/backend-actions/generators/actions-module.generator.js.map +1 -1
- package/dist/backend-actions/generators/authorization-policy-service.generator.d.ts +2 -0
- package/dist/backend-actions/generators/authorization-policy-service.generator.js +334 -0
- package/dist/backend-actions/generators/authorization-policy-service.generator.js.map +1 -0
- package/dist/backend-actions/generators/authorization-service.generator.d.ts +1 -1
- package/dist/backend-actions/generators/authorization-service.generator.js +20 -8
- package/dist/backend-actions/generators/authorization-service.generator.js.map +1 -1
- package/dist/backend-actions/generators/dispatcher-service.generator.js +10 -3
- package/dist/backend-actions/generators/dispatcher-service.generator.js.map +1 -1
- package/dist/backend-actions/generators/execution-class.generator.js +25 -4
- package/dist/backend-actions/generators/execution-class.generator.js.map +1 -1
- package/dist/backend-actions/generators/execution-interface.generator.js +4 -2
- package/dist/backend-actions/generators/execution-interface.generator.js.map +1 -1
- package/dist/backend-ai/generators/ai-route.generator.js +3 -3
- package/dist/backend-authentication/authentication.generator.js +22 -1
- package/dist/backend-authentication/authentication.generator.js.map +1 -1
- package/dist/backend-authentication/generators/auth-guard.generator.js +5 -8
- package/dist/backend-authentication/generators/auth-guard.generator.js.map +1 -1
- package/dist/backend-authentication/generators/authentication-module.generator.js +1 -1
- package/dist/backend-authentication/generators/authentication-service.generator.js +11 -8
- package/dist/backend-authentication/generators/authentication-service.generator.js.map +1 -1
- package/dist/backend-authentication/generators/authentication-types.generator.js +4 -3
- package/dist/backend-authentication/generators/authentication-types.generator.js.map +1 -1
- package/dist/backend-authentication/template/src/authentication.config.ts +9 -0
- package/dist/backend-authentication/template/src/authentication.mock.service.ts +77 -13
- package/dist/backend-authentication/template/src/utils.ts +45 -0
- package/dist/backend-core/backend.generator.js +17 -1
- package/dist/backend-core/backend.generator.js.map +1 -1
- package/dist/backend-core/generators/api-config.generator.js +5 -0
- package/dist/backend-core/generators/api-config.generator.js.map +1 -1
- package/dist/backend-core/types.d.ts +4 -0
- package/dist/backend-excel-io/generators/excel-io-service.generator.js +27 -11
- package/dist/backend-excel-io/generators/excel-io-service.generator.js.map +1 -1
- package/dist/backend-excel-io/template/excel-io.controller.ts +3 -3
- package/dist/backend-rest-api/generators/model-controller.generator.js +9 -5
- package/dist/backend-rest-api/generators/model-controller.generator.js.map +1 -1
- package/dist/backend-rest-api/template/restApi/src/restApi.utils.ts +9 -0
- package/dist/backend-router-trpc/generators/audit-log-route.generator.js +2 -2
- package/dist/backend-router-trpc/generators/excel-io-route.generator.js +1 -1
- package/dist/backend-router-trpc/generators/middleware.generator.js +8 -5
- package/dist/backend-router-trpc/generators/middleware.generator.js.map +1 -1
- package/dist/backend-router-trpc/generators/model-routes.generator.js +27 -7
- package/dist/backend-router-trpc/generators/model-routes.generator.js.map +1 -1
- package/dist/backend-router-trpc/generators/trpc-plugin.generator.js +9 -6
- package/dist/backend-router-trpc/generators/trpc-plugin.generator.js.map +1 -1
- package/dist/backend-router-trpc/generators/trpc-shared.generator.js +4 -24
- package/dist/backend-router-trpc/generators/trpc-shared.generator.js.map +1 -1
- package/dist/backend-router-trpc/router-trpc.generator.d.ts +4 -0
- package/dist/backend-router-trpc/router-trpc.generator.js +1 -0
- package/dist/backend-router-trpc/router-trpc.generator.js.map +1 -1
- package/dist/backend-router-trpc/template/viewer.router.ts +1 -6
- package/dist/backend-update/model-update-service.generator.js +72 -9
- package/dist/backend-update/model-update-service.generator.js.map +1 -1
- package/dist/backend-update/update-actions.decoders.d.ts +4 -4
- package/dist/backend-upload/template/src/upload.controller.ts +1 -1
- package/dist/backend-upload/template/src/upload.service.ts +11 -5
- package/dist/backend-view/model-view-service.generator.js +110 -52
- package/dist/backend-view/model-view-service.generator.js.map +1 -1
- package/dist/backend-view/view.generator.d.ts +2 -1
- package/dist/backend-view/view.generator.js +8 -1
- package/dist/backend-view/view.generator.js.map +1 -1
- package/dist/base/base.generator.js +2 -0
- package/dist/base/base.generator.js.map +1 -1
- package/dist/e2e/template/e2e/specs/example.spec.ts-snapshots/Navigate-to-homepage-and-take-snapshot-1-chromium-linux.png +0 -0
- package/dist/frontend-admin/admin.generator.js +2 -0
- package/dist/frontend-admin/admin.generator.js.map +1 -1
- package/dist/frontend-admin/generators/authorization-utils.generator.d.ts +1 -0
- package/dist/frontend-admin/generators/authorization-utils.generator.js +20 -0
- package/dist/frontend-admin/generators/authorization-utils.generator.js.map +1 -0
- package/dist/frontend-admin/generators/comment-sidebar.generator.js +9 -1
- package/dist/frontend-admin/generators/comment-sidebar.generator.js.map +1 -1
- package/dist/frontend-admin/generators/model-admin-page.generator.js +347 -184
- package/dist/frontend-admin/generators/model-admin-page.generator.js.map +1 -1
- package/dist/frontend-core/frontend.generator.d.ts +6 -0
- package/dist/frontend-core/frontend.generator.js +10 -3
- package/dist/frontend-core/frontend.generator.js.map +1 -1
- package/dist/frontend-core/template/README.md +2 -0
- package/dist/frontend-core/template/src/context-providers/auth-context-provider.tsx +1 -2
- package/dist/frontend-core/template/src/pages/dashboard/dashboard.page.tsx +10 -1
- package/dist/frontend-core/template/src/pages/login/login.page.tsx +1 -1
- package/dist/frontend-core/template/vite.config.ts +5 -0
- package/dist/frontend-core/types/component.d.ts +1 -1
- package/dist/frontend-core/types/contextprovider.d.ts +1 -1
- package/dist/frontend-core/types/hook.d.ts +1 -1
- package/dist/frontend-forms/generators/discriminated-union/inputs.generator.js +1 -1
- package/dist/frontend-forms/generators/discriminated-union/inputs.generator.js.map +1 -1
- package/dist/frontend-forms/generators/enum/inputs.generator.js +1 -1
- package/dist/frontend-forms/generators/enum/inputs.generator.js.map +1 -1
- package/dist/frontend-trpc-client/generators/model-hook.generator.js +104 -39
- package/dist/frontend-trpc-client/generators/model-hook.generator.js.map +1 -1
- package/dist/frontend-trpc-client/trpc-client.generator.js +28 -14
- package/dist/frontend-trpc-client/trpc-client.generator.js.map +1 -1
- package/dist/types/types.generator.d.ts +7 -0
- package/dist/types/types.generator.js +80 -0
- package/dist/types/types.generator.js.map +1 -1
- package/package.json +3 -3
|
@@ -11,14 +11,14 @@ function generateExcelIoService(context) {
|
|
|
11
11
|
.join('\n');
|
|
12
12
|
const modelNames = models.map((model) => `'${model._conjugated.camelCase}'`).join(',\n ');
|
|
13
13
|
const allModelsDataModel = models
|
|
14
|
-
.map((model) => ` ${model._conjugated.camelCasePlural}: await this.viewService.${model.view.service.variableName}.getList(
|
|
14
|
+
.map((model) => ` ${model._conjugated.camelCasePlural}: await this.viewService.${model.view.service.variableName}.getList(authorization),`)
|
|
15
15
|
.join('\n');
|
|
16
16
|
const modelCases = models
|
|
17
17
|
.map((model) => `
|
|
18
18
|
case '${model._conjugated.camelCase}': {
|
|
19
19
|
const filters = ${model.types.filter.decoder.name}.parse(rawFilters ?? {})
|
|
20
20
|
const sort = ${model.types.sort.decoder.name}.optional().parse(rawSort)
|
|
21
|
-
const items = await this.viewService.${model.view.service.variableName}.getFiltered({ filters, sort,
|
|
21
|
+
const items = await this.viewService.${model.view.service.variableName}.getFiltered({ filters, sort, authorization })
|
|
22
22
|
return this.renderExcel({
|
|
23
23
|
dataModel: { ${model._conjugated.camelCasePlural}: items },
|
|
24
24
|
filename: \`${'${timeStamp()}'} ${model._conjugated.kebabCasePlural}.xlsx\`,
|
|
@@ -37,7 +37,7 @@ import { ImportService } from '@import/import.service'
|
|
|
37
37
|
import type { Delta } from '@import/detect-delta/models.detect-delta'
|
|
38
38
|
import { extractErrors } from '@import/detect-delta/models.detect-delta'
|
|
39
39
|
import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common'
|
|
40
|
-
import type {
|
|
40
|
+
import type { AuthorizationContext } from '@types'
|
|
41
41
|
import {
|
|
42
42
|
${filterSortImports}
|
|
43
43
|
} from '@types'
|
|
@@ -144,7 +144,7 @@ export class ExcelIoService {
|
|
|
144
144
|
return modelNameDecoder.parse(model)
|
|
145
145
|
}
|
|
146
146
|
|
|
147
|
-
public async exportAllModelsToExcel(
|
|
147
|
+
public async exportAllModelsToExcel(authorization: AuthorizationContext) {
|
|
148
148
|
this.logger.log('Exporting all models to Excel')
|
|
149
149
|
|
|
150
150
|
const dataModel: DataModel = {
|
|
@@ -158,12 +158,12 @@ ${allModelsDataModel}
|
|
|
158
158
|
model,
|
|
159
159
|
rawFilters,
|
|
160
160
|
rawSort,
|
|
161
|
-
|
|
161
|
+
authorization,
|
|
162
162
|
}: {
|
|
163
163
|
model: ExportModelName
|
|
164
164
|
rawFilters?: unknown
|
|
165
165
|
rawSort?: unknown
|
|
166
|
-
|
|
166
|
+
authorization: AuthorizationContext
|
|
167
167
|
}) {
|
|
168
168
|
this.logger.log(\`Exporting model ${'${model}'} to Excel\`)
|
|
169
169
|
|
|
@@ -173,7 +173,15 @@ ${allModelsDataModel}
|
|
|
173
173
|
}
|
|
174
174
|
}
|
|
175
175
|
|
|
176
|
-
public async importExcel({
|
|
176
|
+
public async importExcel({
|
|
177
|
+
data,
|
|
178
|
+
filename,
|
|
179
|
+
authorization,
|
|
180
|
+
}: {
|
|
181
|
+
data: Buffer
|
|
182
|
+
filename: string
|
|
183
|
+
authorization: AuthorizationContext
|
|
184
|
+
}) {
|
|
177
185
|
this.logger.log('Importing uploaded Excel file through import action')
|
|
178
186
|
|
|
179
187
|
const action: Action_Import = {
|
|
@@ -185,7 +193,11 @@ ${allModelsDataModel}
|
|
|
185
193
|
},
|
|
186
194
|
}
|
|
187
195
|
|
|
188
|
-
return this.dispatcherService.dispatch({
|
|
196
|
+
return this.dispatcherService.dispatch({
|
|
197
|
+
action,
|
|
198
|
+
user: authorization.user,
|
|
199
|
+
userRoles: authorization.userRoles,
|
|
200
|
+
})
|
|
189
201
|
}
|
|
190
202
|
|
|
191
203
|
public async previewImportExcel({
|
|
@@ -236,8 +248,8 @@ ${allModelsDataModel}
|
|
|
236
248
|
ignoreErrors,
|
|
237
249
|
confirmDeletes,
|
|
238
250
|
selectedDeltaIndicesByModel,
|
|
239
|
-
|
|
240
|
-
}: ImportExecuteRequest & {
|
|
251
|
+
authorization,
|
|
252
|
+
}: ImportExecuteRequest & { authorization: AuthorizationContext }): Promise<ImportExecutionSummary> {
|
|
241
253
|
this.logger.log(\`Executing import from preview session: \${previewSessionId}\`)
|
|
242
254
|
const stored = this.getStoredPreview(previewSessionId)
|
|
243
255
|
const selectedDelta = filterDeltaBySelectedIndices(stored.delta, selectedDeltaIndicesByModel)
|
|
@@ -266,7 +278,11 @@ ${allModelsDataModel}
|
|
|
266
278
|
},
|
|
267
279
|
}
|
|
268
280
|
|
|
269
|
-
const result = await this.dispatcherService.dispatch({
|
|
281
|
+
const result = await this.dispatcherService.dispatch({
|
|
282
|
+
action,
|
|
283
|
+
user: authorization.user,
|
|
284
|
+
userRoles: authorization.userRoles,
|
|
285
|
+
})
|
|
270
286
|
|
|
271
287
|
this.previewStore.delete(previewSessionId)
|
|
272
288
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"excel-io-service.generator.js","sourceRoot":"","sources":["../../../src/backend-excel-io/generators/excel-io-service.generator.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"excel-io-service.generator.js","sourceRoot":"","sources":["../../../src/backend-excel-io/generators/excel-io-service.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export class ExcelIoController {
|
|
|
26
26
|
@Get('export/all')
|
|
27
27
|
async exportAll(@ViewerParam() viewer: Viewer, @Res({ passthrough: true }) res: FastifyReply): Promise<void> {
|
|
28
28
|
try {
|
|
29
|
-
const { filename, file } = await this.excelIoService.exportAllModelsToExcel(viewer
|
|
29
|
+
const { filename, file } = await this.excelIoService.exportAllModelsToExcel(viewer)
|
|
30
30
|
const disposition = createContentDisposition(filename)
|
|
31
31
|
|
|
32
32
|
res.type('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
|
|
@@ -56,7 +56,7 @@ export class ExcelIoController {
|
|
|
56
56
|
model: parsedModel,
|
|
57
57
|
rawFilters,
|
|
58
58
|
rawSort,
|
|
59
|
-
|
|
59
|
+
authorization: viewer,
|
|
60
60
|
})
|
|
61
61
|
const disposition = createContentDisposition(filename)
|
|
62
62
|
|
|
@@ -86,7 +86,7 @@ export class ExcelIoController {
|
|
|
86
86
|
const result = await this.excelIoService.importExcel({
|
|
87
87
|
data: uploadData.buffer,
|
|
88
88
|
filename: uploadData.filename,
|
|
89
|
-
|
|
89
|
+
authorization: viewer,
|
|
90
90
|
})
|
|
91
91
|
|
|
92
92
|
res.status(200).send({ success: true, result })
|
|
@@ -122,7 +122,7 @@ import z from 'zod'
|
|
|
122
122
|
|
|
123
123
|
import { createFieldsDecoder, selectFields } from '@utils/fieldSelection'
|
|
124
124
|
import { paginatedResultDecoder, paginationDecoderFromQuery } from '@utils/pagination'
|
|
125
|
-
import { createWorkbookBuffer, jsonQueryParam } from './restApi.utils'
|
|
125
|
+
import { createRootAuthorization, createWorkbookBuffer, jsonQueryParam } from './restApi.utils'
|
|
126
126
|
|
|
127
127
|
// REST API decoder safe for JSON Schema / OpenAPI generation
|
|
128
128
|
// Reuses ${model.decoder.decoder.zodDecoder.name} but overrides fields with transforms or non-JSON-representable types${duComment}
|
|
@@ -192,9 +192,10 @@ export class ${model.restApi.controller.name} {
|
|
|
192
192
|
@Param() params: Get${PascalCase}ParamsDto,
|
|
193
193
|
@Query() query: Get${PascalCase}QueryDto,
|
|
194
194
|
): Promise<Get${PascalCase}Response> {
|
|
195
|
+
const authorization = createRootAuthorization(this.viewService.users.data.rootUser)
|
|
195
196
|
const data = await this.viewService.${model.view.service.variableName}.get({
|
|
196
197
|
id: ${model.types.id.toBranded.name}(params.id),
|
|
197
|
-
|
|
198
|
+
authorization,
|
|
198
199
|
})
|
|
199
200
|
return {
|
|
200
201
|
data: data ? to${PascalCase}RestApi(data, query.fields) : null,
|
|
@@ -219,8 +220,9 @@ export class ${model.restApi.controller.name} {
|
|
|
219
220
|
@ZodResponse({ type: Get${PascalCasePlural}ResponseDto })
|
|
220
221
|
@Get('')
|
|
221
222
|
async get${PascalCasePlural}(@Query() query: Get${PascalCasePlural}Dto): Promise<Get${PascalCasePlural}Response> {
|
|
223
|
+
const authorization = createRootAuthorization(this.viewService.users.data.rootUser)
|
|
222
224
|
const result = await this.viewService.${model.view.service.variableName}.getFilteredPaginated({
|
|
223
|
-
|
|
225
|
+
authorization,
|
|
224
226
|
filters: query.filters ?? {},
|
|
225
227
|
sort: query.sort,
|
|
226
228
|
cursor: query.cursor,
|
|
@@ -252,8 +254,9 @@ export class ${model.restApi.controller.name} {
|
|
|
252
254
|
@Query() query: Get${PascalCasePlural}DownloadDto,
|
|
253
255
|
@Res() res: FastifyReply,
|
|
254
256
|
): Promise<void> {
|
|
257
|
+
const authorization = createRootAuthorization(this.viewService.users.data.rootUser)
|
|
255
258
|
const result = await this.viewService.${model.view.service.variableName}.getFilteredPaginated({
|
|
256
|
-
|
|
259
|
+
authorization,
|
|
257
260
|
filters: query.filters ?? {},
|
|
258
261
|
sort: query.sort,
|
|
259
262
|
cursor: query.cursor,
|
|
@@ -291,8 +294,9 @@ export class ${model.restApi.controller.name} {
|
|
|
291
294
|
@Query() query: Get${PascalCasePlural}DownloadDto,
|
|
292
295
|
@Res() res: FastifyReply,
|
|
293
296
|
): Promise<void> {
|
|
297
|
+
const authorization = createRootAuthorization(this.viewService.users.data.rootUser)
|
|
294
298
|
const result = await this.viewService.${model.view.service.variableName}.getFilteredPaginated({
|
|
295
|
-
|
|
299
|
+
authorization,
|
|
296
300
|
filters: query.filters ?? {},
|
|
297
301
|
sort: query.sort,
|
|
298
302
|
cursor: query.cursor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-controller.generator.js","sourceRoot":"","sources":["../../../src/backend-rest-api/generators/model-controller.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,
|
|
1
|
+
{"version":3,"file":"model-controller.generator.js","sourceRoot":"","sources":["../../../src/backend-rest-api/generators/model-controller.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as Excel from 'exceljs'
|
|
2
|
+
import type { AuthorizationContext, User } from '@types'
|
|
3
|
+
import { USER_ROLES } from '@types'
|
|
2
4
|
import z from 'zod'
|
|
3
5
|
|
|
4
6
|
/**
|
|
@@ -203,6 +205,13 @@ export async function createWorkbookBuffer({
|
|
|
203
205
|
return Buffer.from(buffer)
|
|
204
206
|
}
|
|
205
207
|
|
|
208
|
+
export function createRootAuthorization(rootUser: User): AuthorizationContext {
|
|
209
|
+
return {
|
|
210
|
+
user: rootUser,
|
|
211
|
+
userRoles: [...USER_ROLES],
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
206
215
|
/**
|
|
207
216
|
* Creates a Zod schema for a query parameter that accepts a JSON string
|
|
208
217
|
* and parses it into the specified schema type.
|
|
@@ -550,10 +550,10 @@ export const auditLogs = router({
|
|
|
550
550
|
})
|
|
551
551
|
|
|
552
552
|
// Get actions map for scope/type info
|
|
553
|
-
const actionsMap = await ctx.view.actions.getAll(ctx.
|
|
553
|
+
const actionsMap = await ctx.view.actions.getAll(ctx.viewer)
|
|
554
554
|
|
|
555
555
|
// Get users map for user names
|
|
556
|
-
const usersMap = await ctx.view.users.getAll(ctx.
|
|
556
|
+
const usersMap = await ctx.view.users.getAll(ctx.viewer)
|
|
557
557
|
|
|
558
558
|
// Process entries
|
|
559
559
|
let entries: AuditLogEntry[] = []
|
|
@@ -39,8 +39,11 @@ function generateMiddleware(context) {
|
|
|
39
39
|
const imports = Generator.ImportGenerator.from(context.trpcRouter._middleware._filePath)
|
|
40
40
|
.add(context.actions.summary.action)
|
|
41
41
|
.add(context.actions.summary.resultOfActionHelper)
|
|
42
|
-
.add(context.types.user)
|
|
43
42
|
.add({ name: context.trpcRouter._shared.context.name, location: context.trpcRouter._shared._filePath })
|
|
43
|
+
.addType({
|
|
44
|
+
name: context.trpcRouter._shared.authenticatedViewer.name,
|
|
45
|
+
location: context.trpcRouter._shared._filePath,
|
|
46
|
+
})
|
|
44
47
|
.add({ name: context.trpcRouter._shared.middleware.name, location: context.trpcRouter._shared._filePath });
|
|
45
48
|
return /* ts */ `
|
|
46
49
|
import { TRPCError } from '@trpc/server'
|
|
@@ -50,10 +53,10 @@ function generateMiddleware(context) {
|
|
|
50
53
|
/**
|
|
51
54
|
* The shared context available to all routes after authentication.
|
|
52
55
|
*
|
|
53
|
-
* Contains the
|
|
56
|
+
* Contains the authenticated viewer and a dispatch function that already has the user set.
|
|
54
57
|
*/
|
|
55
58
|
export type ${context.trpcRouter._middleware.auth.context.name} = ${context.trpcRouter._shared.context.name} & {
|
|
56
|
-
|
|
59
|
+
viewer: ${context.trpcRouter._shared.authenticatedViewer.name}
|
|
57
60
|
dispatch: <A extends ${context.actions.summary.action.name}>(action: A) => Promise<${context.actions.summary.resultOfActionHelper.name}<A>>
|
|
58
61
|
}
|
|
59
62
|
|
|
@@ -71,8 +74,8 @@ export const ${context.trpcRouter._middleware.auth.name} = ${context.trpcRouter.
|
|
|
71
74
|
|
|
72
75
|
const context: ${context.trpcRouter._middleware.auth.context.name} = {
|
|
73
76
|
...ctx,
|
|
74
|
-
|
|
75
|
-
dispatch: <A extends ${context.actions.summary.action.name}>(action: A) => ctx.dispatcher.dispatch({ action, user: viewer.user }),
|
|
77
|
+
viewer,
|
|
78
|
+
dispatch: <A extends ${context.actions.summary.action.name}>(action: A) => ctx.dispatcher.dispatch({ action, user: viewer.user, userRoles: viewer.userRoles }),
|
|
76
79
|
}
|
|
77
80
|
|
|
78
81
|
return opts.next({ ctx: context })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/middleware.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"middleware.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/middleware.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,gDAiEC;AApED,6DAA8C;AAG9C,SAAgB,kBAAkB,CAAC,OAAsB;IACvD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC;SACrF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;SACnC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC;SACjD,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACtG,OAAO,CAAC;QACP,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;QACzD,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS;KAC/C,CAAC;SACD,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IAE5G,OAAO,QAAQ,CAAC;;IAEd,OAAO,CAAC,QAAQ,EAAE;;;;;;;;cAQR,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;YAC/F,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;yBACtC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,2BAA2B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI;;;;;;;;eAQzH,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;;;mBAOpF,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;2BAGxC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;;;;4BAMlC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;;;;;;;;;;;;;GAiBnE,CAAA;AACH,CAAC"}
|
|
@@ -75,20 +75,30 @@ import { z } from 'zod'
|
|
|
75
75
|
${model.trpcRoute.get.name}: procedure
|
|
76
76
|
.use(authMiddleware)
|
|
77
77
|
.input(${model.types.id.decoder.name})
|
|
78
|
-
.query(({ input, ctx }) =>
|
|
78
|
+
.query(({ input, ctx }) =>
|
|
79
|
+
ctx.view.${variableName}.get({
|
|
80
|
+
id: input,
|
|
81
|
+
authorization: ctx.viewer,
|
|
82
|
+
}),
|
|
83
|
+
),
|
|
79
84
|
|
|
80
85
|
getByKey: procedure
|
|
81
86
|
.use(authMiddleware)
|
|
82
87
|
.input(z.string())
|
|
83
|
-
.query(({ input, ctx }) =>
|
|
88
|
+
.query(({ input, ctx }) =>
|
|
89
|
+
ctx.view.${variableName}.getByKey({
|
|
90
|
+
key: input,
|
|
91
|
+
authorization: ctx.viewer,
|
|
92
|
+
}),
|
|
93
|
+
),
|
|
84
94
|
|
|
85
95
|
${model.trpcRoute.getMap.name}: procedure
|
|
86
96
|
.use(authMiddleware)
|
|
87
|
-
.query(({ ctx }) => ctx.view.${variableName}.getAll(ctx.
|
|
97
|
+
.query(({ ctx }) => ctx.view.${variableName}.getAll(ctx.viewer)),
|
|
88
98
|
|
|
89
99
|
${model.trpcRoute.getList.name}: procedure
|
|
90
100
|
.use(authMiddleware)
|
|
91
|
-
.query(({ ctx }) => ctx.view.${variableName}.getList(ctx.
|
|
101
|
+
.query(({ ctx }) => ctx.view.${variableName}.getList(ctx.viewer)),
|
|
92
102
|
|
|
93
103
|
${model.trpcRoute.getFiltered.name}: procedure
|
|
94
104
|
.use(authMiddleware)
|
|
@@ -98,7 +108,13 @@ import { z } from 'zod'
|
|
|
98
108
|
sort: ${model.types.sort.decoder.name},
|
|
99
109
|
}),
|
|
100
110
|
)
|
|
101
|
-
.query(({ input, ctx }) =>
|
|
111
|
+
.query(({ input, ctx }) =>
|
|
112
|
+
ctx.view.${variableName}.getFiltered({
|
|
113
|
+
filters: input.filters,
|
|
114
|
+
sort: input.sort,
|
|
115
|
+
authorization: ctx.viewer,
|
|
116
|
+
}),
|
|
117
|
+
),
|
|
102
118
|
|
|
103
119
|
${model.trpcRoute.getFilteredPaginated.name}: procedure
|
|
104
120
|
.use(authMiddleware)
|
|
@@ -116,7 +132,7 @@ import { z } from 'zod'
|
|
|
116
132
|
sort: input.sort,
|
|
117
133
|
cursor: input.cursor ?? 1,
|
|
118
134
|
limit: input.limit ?? 100,
|
|
119
|
-
|
|
135
|
+
authorization: ctx.viewer,
|
|
120
136
|
})),
|
|
121
137
|
|
|
122
138
|
${model.trpcRoute.getFilterOptions.name}: procedure
|
|
@@ -128,7 +144,11 @@ import { z } from 'zod'
|
|
|
128
144
|
}),
|
|
129
145
|
)
|
|
130
146
|
.query(({ input, ctx }) =>
|
|
131
|
-
ctx.view.${variableName}.getFilterOptions({
|
|
147
|
+
ctx.view.${variableName}.getFilterOptions({
|
|
148
|
+
field: input.field,
|
|
149
|
+
filters: input.filters,
|
|
150
|
+
authorization: ctx.viewer,
|
|
151
|
+
}),
|
|
132
152
|
),
|
|
133
153
|
|
|
134
154
|
${mutations.join('\n')}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,15 +43,18 @@ function generateTrpc(context) {
|
|
|
43
43
|
.add(context.ai.agentService)
|
|
44
44
|
.add(context.authentication.service)
|
|
45
45
|
.add(context.authentication.types.userInfo)
|
|
46
|
-
.
|
|
46
|
+
.addType(context.types.userRoles)
|
|
47
47
|
.add({
|
|
48
48
|
name: Generator.toClassName('ExcelIoService'),
|
|
49
49
|
location: Generator.toBackendModuleLocation('@excel-io/excel-io.service'),
|
|
50
50
|
})
|
|
51
|
-
.add(context.types.user)
|
|
52
51
|
.add(context.view.service)
|
|
53
52
|
.add({ name: context.trpcRouter.appRoutes.name, location: context.trpcRouter.appRoutes._filePath })
|
|
54
|
-
.add({ name: context.trpcRouter._shared.context.name, location: context.trpcRouter._shared._filePath })
|
|
53
|
+
.add({ name: context.trpcRouter._shared.context.name, location: context.trpcRouter._shared._filePath })
|
|
54
|
+
.addType({
|
|
55
|
+
name: context.trpcRouter._shared.authenticatedViewer.name,
|
|
56
|
+
location: context.trpcRouter._shared._filePath,
|
|
57
|
+
});
|
|
55
58
|
return /* ts */ `
|
|
56
59
|
import { Injectable, Logger } from '@nestjs/common'
|
|
57
60
|
import { NestFastifyApplication } from '@nestjs/platform-fastify'
|
|
@@ -84,10 +87,10 @@ export class ${context.trpcRouter.plugin.name} {
|
|
|
84
87
|
// In \`createContext\`, we already extract the viewer from the request. However,
|
|
85
88
|
// we do not throw in case we cannot identify/create a viewer or user to also allow anonymous routes.
|
|
86
89
|
// To ensure that only authenticated users can access particular routes, use the \`${context.trpcRouter._middleware.auth.name}\`!
|
|
87
|
-
let viewer: {
|
|
90
|
+
let viewer: ${context.trpcRouter._shared.authenticatedViewer.name} | null = null
|
|
88
91
|
|
|
89
92
|
let userInfo: UserInfo | null = null
|
|
90
|
-
let userRoles:
|
|
93
|
+
let userRoles: ${context.types.userRoles.name} = []
|
|
91
94
|
|
|
92
95
|
const associatedUserInfo = await this.authService.getUserInfoFromRequest(req)
|
|
93
96
|
|
|
@@ -121,7 +124,7 @@ export class ${context.trpcRouter.plugin.name} {
|
|
|
121
124
|
}
|
|
122
125
|
}
|
|
123
126
|
|
|
124
|
-
viewer = {
|
|
127
|
+
viewer = { userRoles, user }
|
|
125
128
|
}
|
|
126
129
|
|
|
127
130
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpc-plugin.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-plugin.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,
|
|
1
|
+
{"version":3,"file":"trpc-plugin.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-plugin.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,oCAmHC;AAvHD,6DAA8C;AAI9C,SAAgB,YAAY,CAAC,OAAsB;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe;QACvC,EAAE;SACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;SACzC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC1C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;SAChC,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SACzB,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;SAClG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACtG,OAAO,CAAC;QACP,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;QACzD,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS;KAC/C,CAAC,CAAA;IAEJ,OAAO,QAAQ,CAAC;;;;;EAKhB,OAAO,CAAC,QAAQ,EAAE;;;WAGT,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;;;;eAK1B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;yCACJ,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI;;oCAEnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;oCACzB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;0CAC7B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;uCAClC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;kBAQjD,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI;oFACiC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;+FAG5B,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;wBAC/G,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;;;2BAGhD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0DrD,CAAA;AACF,CAAC"}
|
|
@@ -39,14 +39,12 @@ function generateTrpcShared(context) {
|
|
|
39
39
|
const imports = Generator.ImportGenerator.from(context.trpcRouter._shared._filePath)
|
|
40
40
|
.add(context.actions.dispatcher)
|
|
41
41
|
.add(context.ai.agentService)
|
|
42
|
-
.
|
|
43
|
-
.add(context.authentication.types.userRoles)
|
|
42
|
+
.addType(context.types.authorizationContext)
|
|
44
43
|
.add(context.authentication.service)
|
|
45
44
|
.add({
|
|
46
45
|
name: Generator.toClassName('ExcelIoService'),
|
|
47
46
|
location: Generator.toBackendModuleLocation('@excel-io/excel-io.service'),
|
|
48
47
|
})
|
|
49
|
-
.add(context.types.user)
|
|
50
48
|
.add(context.view.service);
|
|
51
49
|
return /* ts */ `
|
|
52
50
|
// We import Fastify cookie here to ensure that the cookie plugin and its types are registered.
|
|
@@ -60,6 +58,8 @@ import { FastifyReply, FastifyRequest } from 'fastify'
|
|
|
60
58
|
|
|
61
59
|
${imports.generate()}
|
|
62
60
|
|
|
61
|
+
export type ${context.trpcRouter._shared.authenticatedViewer.name} = ${context.types.authorizationContext.name}
|
|
62
|
+
|
|
63
63
|
/**
|
|
64
64
|
* The shared context available to all routes before authentication.
|
|
65
65
|
*/
|
|
@@ -72,27 +72,7 @@ export type ${context.trpcRouter._shared.context.name} = {
|
|
|
72
72
|
/**
|
|
73
73
|
* The viewer as derived from the current session.
|
|
74
74
|
*/
|
|
75
|
-
viewer: {
|
|
76
|
-
/**
|
|
77
|
-
* Keycloak provided user information.
|
|
78
|
-
*/
|
|
79
|
-
userInfo: ${context.authentication.types.userInfo.name}
|
|
80
|
-
|
|
81
|
-
/**
|
|
82
|
-
* The roles associated with the user.
|
|
83
|
-
*/
|
|
84
|
-
userRoles: ${context.authentication.types.userRoles.name}
|
|
85
|
-
|
|
86
|
-
/**
|
|
87
|
-
* The user in the database.
|
|
88
|
-
*/
|
|
89
|
-
user: ${context.types.user.name}
|
|
90
|
-
|
|
91
|
-
/**
|
|
92
|
-
* Whether the user is authorized to access the requested resource.
|
|
93
|
-
*/
|
|
94
|
-
isAuthorized: boolean
|
|
95
|
-
} | null
|
|
75
|
+
viewer: ${context.trpcRouter._shared.authenticatedViewer.name} | null
|
|
96
76
|
|
|
97
77
|
/**
|
|
98
78
|
* Authentication service to retrieve user information from the session
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trpc-shared.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-shared.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,
|
|
1
|
+
{"version":3,"file":"trpc-shared.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/trpc-shared.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gDA2FC;AA/FD,6DAA8C;AAI9C,SAAgB,kBAAkB,CAAC,OAAsB;IACvD,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;SACjF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/B,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;SAC5B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC;SAC3C,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;SACnC,GAAG,CAAC;QACH,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC;QAC7C,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,4BAA4B,CAAC;KAC1E,CAAC;SACD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE5B,OAAO,QAAQ,CAAC;;;;;;;;;;EAUhB,OAAO,CAAC,QAAQ,EAAE;;cAEN,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,MAAM,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI;;;;;cAKhG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;;;;;WAS1C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI;;;;;SAKrD,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI;;;;;SAKnC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;;;;;cAKpB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;YAKjC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI;;;;;;;;;wFASgD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;OACvH,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,YAAY,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;6BAEzE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;;;;;WAKzD,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;eAGlC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI;;;WAG1C,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;eAErC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;;;mCAGrB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;eAE9D,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI;;CAExD,CAAA;AACD,CAAC"}
|
|
@@ -80,6 +80,10 @@ export type TrpcRouterContext = {
|
|
|
80
80
|
* Use `_middleware.auth.context` to access the user!
|
|
81
81
|
*/
|
|
82
82
|
context: Generator.ImportableType;
|
|
83
|
+
/**
|
|
84
|
+
* The authenticated viewer object (user + roles + claims).
|
|
85
|
+
*/
|
|
86
|
+
authenticatedViewer: Generator.ImportableType;
|
|
83
87
|
};
|
|
84
88
|
/**
|
|
85
89
|
* Middleware that can be used in any route
|
|
@@ -134,6 +134,7 @@ exports.generator = {
|
|
|
134
134
|
procedure: { name: Generator.toFunctionName('procedure'), location: trpcLocation },
|
|
135
135
|
middleware: { name: Generator.toFunctionName('middleware'), location: trpcLocation },
|
|
136
136
|
context: { name: Generator.toTypeName('InitialContext'), location: trpcLocation },
|
|
137
|
+
authenticatedViewer: { name: Generator.toTypeName('AuthenticatedViewer'), location: trpcLocation },
|
|
137
138
|
},
|
|
138
139
|
_middleware: {
|
|
139
140
|
_filePath: Generator.toFilePath(`./middleware.ts`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAmC;AAEnC,6DAA8C;AAE9C,wDAA2E;AAC3E,8CAAmE;AACnE,sEAAuG;AACvG,kDAA+E;AAC/E,0DAA4E;AAC5E,kEAA0F;AAC1F,sDAAyE;AACzE,kDAAkE;AAClE,kCAAmD;AAEnD,oCAAsD;AAEtD,4EAAqE;AACrE,sFAA8E;AAC9E,oFAA4E;AAC5E,4EAAsE;AACtE,gFAAyE;AACzE,8EAAuF;AACvF,4FAAoF;AACpF,8EAAuE;
|
|
1
|
+
{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,17 +6,12 @@ import { err, ok } from '@postxl/utils'
|
|
|
6
6
|
|
|
7
7
|
import { procedure, router } from '../trpc-shared'
|
|
8
8
|
|
|
9
|
-
function omit<T extends Record<string, unknown>, Key extends keyof T>(obj: T, key: Key): Omit<T, Key> {
|
|
10
|
-
const { [key]: _, ...rest } = obj
|
|
11
|
-
return rest
|
|
12
|
-
}
|
|
13
|
-
|
|
14
9
|
export const viewer = router({
|
|
15
10
|
viewer: procedure
|
|
16
11
|
.input(z.object({ pageUrl: z.string().describe('The url of the active page.') }))
|
|
17
12
|
.query(async ({ ctx, input }): Promise<ViewerResult> => {
|
|
18
13
|
if (ctx.viewer) {
|
|
19
|
-
return ok(
|
|
14
|
+
return ok(ctx.viewer)
|
|
20
15
|
}
|
|
21
16
|
const redirectUrl = await ctx.auth.getAuthenticationUrl({ redirectTo: decodeURIComponent(input.pageUrl) })
|
|
22
17
|
|