@carlonicora/nestjs-neo4jsonapi 4.11.0 → 4.13.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/agents/common/inline-entity-links.d.ts +22 -0
- package/dist/agents/common/inline-entity-links.d.ts.map +1 -0
- package/dist/agents/common/inline-entity-links.js +60 -0
- package/dist/agents/common/inline-entity-links.js.map +1 -0
- package/dist/agents/community.detector/services/community.detector.service.d.ts.map +1 -1
- package/dist/agents/community.detector/services/community.detector.service.js +4 -0
- package/dist/agents/community.detector/services/community.detector.service.js.map +1 -1
- package/dist/agents/graph/interfaces/graph.catalog.interface.d.ts +17 -0
- package/dist/agents/graph/interfaces/graph.catalog.interface.d.ts.map +1 -1
- package/dist/agents/graph/services/graph.catalog.service.d.ts +15 -2
- package/dist/agents/graph/services/graph.catalog.service.d.ts.map +1 -1
- package/dist/agents/graph/services/graph.catalog.service.js +87 -0
- package/dist/agents/graph/services/graph.catalog.service.js.map +1 -1
- package/dist/agents/graph/services/graph.index.manager.d.ts +18 -1
- package/dist/agents/graph/services/graph.index.manager.d.ts.map +1 -1
- package/dist/agents/graph/services/graph.index.manager.js +16 -2
- package/dist/agents/graph/services/graph.index.manager.js.map +1 -1
- package/dist/agents/graph/services/graph.search.service.d.ts +38 -1
- package/dist/agents/graph/services/graph.search.service.d.ts.map +1 -1
- package/dist/agents/graph/services/graph.search.service.js +126 -7
- package/dist/agents/graph/services/graph.search.service.js.map +1 -1
- package/dist/agents/graph/services/scope.guard.d.ts +30 -1
- package/dist/agents/graph/services/scope.guard.d.ts.map +1 -1
- package/dist/agents/graph/services/scope.guard.js +53 -2
- package/dist/agents/graph/services/scope.guard.js.map +1 -1
- package/dist/agents/graph/tools/search-entities.tool.d.ts.map +1 -1
- package/dist/agents/graph/tools/search-entities.tool.js +3 -1
- package/dist/agents/graph/tools/search-entities.tool.js.map +1 -1
- package/dist/agents/graph/tools/traverse.tool.d.ts.map +1 -1
- package/dist/agents/graph/tools/traverse.tool.js +18 -8
- package/dist/agents/graph/tools/traverse.tool.js.map +1 -1
- package/dist/agents/index.d.ts +1 -0
- package/dist/agents/index.d.ts.map +1 -1
- package/dist/agents/index.js +6 -2
- package/dist/agents/index.js.map +1 -1
- package/dist/agents/operator/contexts/operator.context.d.ts +8 -1
- package/dist/agents/operator/contexts/operator.context.d.ts.map +1 -1
- package/dist/agents/operator/contexts/operator.context.js +6 -0
- package/dist/agents/operator/contexts/operator.context.js.map +1 -1
- package/dist/agents/operator/controllers/operator.controller.d.ts +4 -1
- package/dist/agents/operator/controllers/operator.controller.d.ts.map +1 -1
- package/dist/agents/operator/controllers/operator.controller.js +15 -8
- package/dist/agents/operator/controllers/operator.controller.js.map +1 -1
- package/dist/agents/operator/services/operator.service.d.ts +15 -0
- package/dist/agents/operator/services/operator.service.d.ts.map +1 -1
- package/dist/agents/operator/services/operator.service.js +31 -8
- package/dist/agents/operator/services/operator.service.js.map +1 -1
- package/dist/agents/operator/tools/operator.tool.registry.d.ts +2 -1
- package/dist/agents/operator/tools/operator.tool.registry.d.ts.map +1 -1
- package/dist/agents/operator/tools/operator.tool.registry.js +8 -3
- package/dist/agents/operator/tools/operator.tool.registry.js.map +1 -1
- package/dist/agents/responder/contexts/responder.context.d.ts +6 -0
- package/dist/agents/responder/contexts/responder.context.d.ts.map +1 -1
- package/dist/agents/responder/contexts/responder.context.js +2 -0
- package/dist/agents/responder/contexts/responder.context.js.map +1 -1
- package/dist/agents/responder/nodes/responder.answer.node.service.d.ts.map +1 -1
- package/dist/agents/responder/nodes/responder.answer.node.service.js +8 -2
- package/dist/agents/responder/nodes/responder.answer.node.service.js.map +1 -1
- package/dist/agents/responder/services/responder.service.d.ts +2 -0
- package/dist/agents/responder/services/responder.service.d.ts.map +1 -1
- package/dist/agents/responder/services/responder.service.js +1 -0
- package/dist/agents/responder/services/responder.service.js.map +1 -1
- package/dist/common/decorators/oauth.scopes.decorator.d.ts +2 -2
- package/dist/common/decorators/oauth.scopes.decorator.js +2 -2
- package/dist/common/helpers/credit-gate.d.ts +8 -0
- package/dist/common/helpers/credit-gate.d.ts.map +1 -1
- package/dist/common/helpers/credit-gate.js +11 -0
- package/dist/common/helpers/credit-gate.js.map +1 -1
- package/dist/common/helpers/define-entity.d.ts.map +1 -1
- package/dist/common/helpers/define-entity.js +6 -0
- package/dist/common/helpers/define-entity.js.map +1 -1
- package/dist/common/interfaces/assistant.scope.interface.d.ts +47 -0
- package/dist/common/interfaces/assistant.scope.interface.d.ts.map +1 -0
- package/dist/common/interfaces/assistant.scope.interface.js +14 -0
- package/dist/common/interfaces/assistant.scope.interface.js.map +1 -0
- package/dist/common/interfaces/assistant.title.interface.d.ts +30 -0
- package/dist/common/interfaces/assistant.title.interface.d.ts.map +1 -0
- package/dist/common/interfaces/assistant.title.interface.js +18 -0
- package/dist/common/interfaces/assistant.title.interface.js.map +1 -0
- package/dist/common/interfaces/datamodel.interface.d.ts +1 -0
- package/dist/common/interfaces/datamodel.interface.d.ts.map +1 -1
- package/dist/common/interfaces/entity.schema.interface.d.ts +63 -6
- package/dist/common/interfaces/entity.schema.interface.d.ts.map +1 -1
- package/dist/common/interfaces/external.entity.source.interface.d.ts +43 -0
- package/dist/common/interfaces/external.entity.source.interface.d.ts.map +1 -0
- package/dist/common/interfaces/external.entity.source.interface.js +17 -0
- package/dist/common/interfaces/external.entity.source.interface.js.map +1 -0
- package/dist/common/interfaces/index.d.ts +4 -0
- package/dist/common/interfaces/index.d.ts.map +1 -1
- package/dist/common/interfaces/index.js +4 -0
- package/dist/common/interfaces/index.js.map +1 -1
- package/dist/common/interfaces/s3.key-access.policy.interface.d.ts +48 -0
- package/dist/common/interfaces/s3.key-access.policy.interface.d.ts.map +1 -0
- package/dist/common/interfaces/s3.key-access.policy.interface.js +36 -0
- package/dist/common/interfaces/s3.key-access.policy.interface.js.map +1 -0
- package/dist/common/tokens.d.ts +13 -0
- package/dist/common/tokens.d.ts.map +1 -1
- package/dist/common/tokens.js +14 -1
- package/dist/common/tokens.js.map +1 -1
- package/dist/config/base.config.d.ts +13 -0
- package/dist/config/base.config.d.ts.map +1 -1
- package/dist/config/base.config.js +2 -0
- package/dist/config/base.config.js.map +1 -1
- package/dist/config/interfaces/base.config.interface.d.ts +2 -0
- package/dist/config/interfaces/base.config.interface.d.ts.map +1 -1
- package/dist/config/interfaces/config.assistant.interface.d.ts +9 -0
- package/dist/config/interfaces/config.assistant.interface.d.ts.map +1 -0
- package/dist/config/interfaces/config.assistant.interface.js +3 -0
- package/dist/config/interfaces/config.assistant.interface.js.map +1 -0
- package/dist/config/interfaces/config.oauth.interface.d.ts +8 -0
- package/dist/config/interfaces/config.oauth.interface.d.ts.map +1 -1
- package/dist/config/interfaces/config.operator.interface.d.ts +5 -0
- package/dist/config/interfaces/config.operator.interface.d.ts.map +1 -1
- package/dist/config/interfaces/index.d.ts +1 -0
- package/dist/config/interfaces/index.d.ts.map +1 -1
- package/dist/config/interfaces/index.js +1 -0
- package/dist/config/interfaces/index.js.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.d.ts +26 -0
- package/dist/core/neo4j/abstracts/abstract.repository.d.ts.map +1 -1
- package/dist/core/neo4j/abstracts/abstract.repository.js +70 -37
- package/dist/core/neo4j/abstracts/abstract.repository.js.map +1 -1
- package/dist/core/neo4j/index.d.ts +2 -0
- package/dist/core/neo4j/index.d.ts.map +1 -1
- package/dist/core/neo4j/index.js +5 -1
- package/dist/core/neo4j/index.js.map +1 -1
- package/dist/core/neo4j/queries/update.relationship.d.ts +8 -0
- package/dist/core/neo4j/queries/update.relationship.d.ts.map +1 -1
- package/dist/core/neo4j/queries/update.relationship.js +4 -1
- package/dist/core/neo4j/queries/update.relationship.js.map +1 -1
- package/dist/core/neo4j/services/neo4j.service.d.ts +10 -0
- package/dist/core/neo4j/services/neo4j.service.d.ts.map +1 -1
- package/dist/core/neo4j/services/neo4j.service.js +12 -1
- package/dist/core/neo4j/services/neo4j.service.js.map +1 -1
- package/dist/foundations/assistant/assistant.module.d.ts +7 -2
- package/dist/foundations/assistant/assistant.module.d.ts.map +1 -1
- package/dist/foundations/assistant/assistant.module.js +37 -1
- package/dist/foundations/assistant/assistant.module.js.map +1 -1
- package/dist/foundations/assistant/controllers/assistant.controller.d.ts +4 -1
- package/dist/foundations/assistant/controllers/assistant.controller.d.ts.map +1 -1
- package/dist/foundations/assistant/controllers/assistant.controller.js +15 -8
- package/dist/foundations/assistant/controllers/assistant.controller.js.map +1 -1
- package/dist/foundations/assistant/services/assistant.service.d.ts +37 -1
- package/dist/foundations/assistant/services/assistant.service.d.ts.map +1 -1
- package/dist/foundations/assistant/services/assistant.service.js +144 -11
- package/dist/foundations/assistant/services/assistant.service.js.map +1 -1
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.d.ts +7 -1
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.d.ts.map +1 -1
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.js +15 -5
- package/dist/foundations/assistant-action/controllers/assistant-action.controller.js.map +1 -1
- package/dist/foundations/assistant-message/assistant-message.module.d.ts +4 -0
- package/dist/foundations/assistant-message/assistant-message.module.d.ts.map +1 -1
- package/dist/foundations/assistant-message/assistant-message.module.js +27 -2
- package/dist/foundations/assistant-message/assistant-message.module.js.map +1 -1
- package/dist/foundations/company/entities/company.d.ts +4 -4
- package/dist/foundations/company/entities/company.d.ts.map +1 -1
- package/dist/foundations/company/entities/company.js +2 -2
- package/dist/foundations/company/entities/company.js.map +1 -1
- package/dist/foundations/content/interfaces/content.extension.interface.d.ts +22 -0
- package/dist/foundations/content/interfaces/content.extension.interface.d.ts.map +1 -1
- package/dist/foundations/content/interfaces/content.extension.interface.js.map +1 -1
- package/dist/foundations/content/services/content.cypher.service.d.ts +27 -0
- package/dist/foundations/content/services/content.cypher.service.d.ts.map +1 -1
- package/dist/foundations/content/services/content.cypher.service.js +68 -9
- package/dist/foundations/content/services/content.cypher.service.js.map +1 -1
- package/dist/foundations/oauth/constants/oauth.scopes.d.ts +26 -11
- package/dist/foundations/oauth/constants/oauth.scopes.d.ts.map +1 -1
- package/dist/foundations/oauth/constants/oauth.scopes.js +13 -18
- package/dist/foundations/oauth/constants/oauth.scopes.js.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.authorize.controller.d.ts.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.authorize.controller.js +3 -0
- package/dist/foundations/oauth/controllers/oauth.authorize.controller.js.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.registration.controller.d.ts.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.registration.controller.js +2 -0
- package/dist/foundations/oauth/controllers/oauth.registration.controller.js.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.token.controller.d.ts.map +1 -1
- package/dist/foundations/oauth/controllers/oauth.token.controller.js +2 -0
- package/dist/foundations/oauth/controllers/oauth.token.controller.js.map +1 -1
- package/dist/foundations/oauth/dtos/oauth.authorize.dto.d.ts +1 -0
- package/dist/foundations/oauth/dtos/oauth.authorize.dto.d.ts.map +1 -1
- package/dist/foundations/oauth/dtos/oauth.authorize.dto.js +5 -0
- package/dist/foundations/oauth/dtos/oauth.authorize.dto.js.map +1 -1
- package/dist/foundations/oauth/entities/oauth.authorization.code.entity.d.ts +2 -0
- package/dist/foundations/oauth/entities/oauth.authorization.code.entity.d.ts.map +1 -1
- package/dist/foundations/oauth/entities/oauth.authorization.code.entity.js.map +1 -1
- package/dist/foundations/oauth/entities/oauth.authorization.code.model.d.ts.map +1 -1
- package/dist/foundations/oauth/entities/oauth.authorization.code.model.js +1 -0
- package/dist/foundations/oauth/entities/oauth.authorization.code.model.js.map +1 -1
- package/dist/foundations/oauth/filters/oauth.error.filter.d.ts +16 -0
- package/dist/foundations/oauth/filters/oauth.error.filter.d.ts.map +1 -0
- package/dist/foundations/oauth/filters/oauth.error.filter.js +70 -0
- package/dist/foundations/oauth/filters/oauth.error.filter.js.map +1 -0
- package/dist/foundations/oauth/guards/oauth.token.guard.d.ts +2 -2
- package/dist/foundations/oauth/guards/oauth.token.guard.js +2 -2
- package/dist/foundations/oauth/index.d.ts +2 -1
- package/dist/foundations/oauth/index.d.ts.map +1 -1
- package/dist/foundations/oauth/index.js +3 -1
- package/dist/foundations/oauth/index.js.map +1 -1
- package/dist/foundations/oauth/oauth.module.d.ts +2 -2
- package/dist/foundations/oauth/oauth.module.d.ts.map +1 -1
- package/dist/foundations/oauth/oauth.module.js +11 -5
- package/dist/foundations/oauth/oauth.module.js.map +1 -1
- package/dist/foundations/oauth/repositories/oauth.repository.d.ts +20 -1
- package/dist/foundations/oauth/repositories/oauth.repository.d.ts.map +1 -1
- package/dist/foundations/oauth/repositories/oauth.repository.js +54 -10
- package/dist/foundations/oauth/repositories/oauth.repository.js.map +1 -1
- package/dist/foundations/oauth/services/index.d.ts +1 -0
- package/dist/foundations/oauth/services/index.d.ts.map +1 -1
- package/dist/foundations/oauth/services/index.js +1 -0
- package/dist/foundations/oauth/services/index.js.map +1 -1
- package/dist/foundations/oauth/services/oauth.client.service.d.ts +3 -1
- package/dist/foundations/oauth/services/oauth.client.service.d.ts.map +1 -1
- package/dist/foundations/oauth/services/oauth.client.service.js +7 -5
- package/dist/foundations/oauth/services/oauth.client.service.js.map +1 -1
- package/dist/foundations/oauth/services/oauth.scope.service.d.ts +32 -0
- package/dist/foundations/oauth/services/oauth.scope.service.d.ts.map +1 -0
- package/dist/foundations/oauth/services/oauth.scope.service.js +71 -0
- package/dist/foundations/oauth/services/oauth.scope.service.js.map +1 -0
- package/dist/foundations/oauth/services/oauth.service.d.ts +13 -1
- package/dist/foundations/oauth/services/oauth.service.d.ts.map +1 -1
- package/dist/foundations/oauth/services/oauth.service.js +18 -8
- package/dist/foundations/oauth/services/oauth.service.js.map +1 -1
- package/dist/foundations/relevancy/queries/relevance.d.ts +20 -0
- package/dist/foundations/relevancy/queries/relevance.d.ts.map +1 -1
- package/dist/foundations/relevancy/queries/relevance.js +44 -8
- package/dist/foundations/relevancy/queries/relevance.js.map +1 -1
- package/dist/foundations/relevancy/repositories/relevancy.repository.d.ts +41 -2
- package/dist/foundations/relevancy/repositories/relevancy.repository.d.ts.map +1 -1
- package/dist/foundations/relevancy/repositories/relevancy.repository.js +89 -6
- package/dist/foundations/relevancy/repositories/relevancy.repository.js.map +1 -1
- package/dist/foundations/relevancy/services/relevancy.service.js +1 -1
- package/dist/foundations/relevancy/services/relevancy.service.js.map +1 -1
- package/dist/foundations/s3/controllers/s3.controller.d.ts +10 -1
- package/dist/foundations/s3/controllers/s3.controller.d.ts.map +1 -1
- package/dist/foundations/s3/controllers/s3.controller.js +33 -2
- package/dist/foundations/s3/controllers/s3.controller.js.map +1 -1
- package/dist/foundations/user/controllers/user.controller.d.ts +1 -1
- package/dist/foundations/user/controllers/user.controller.d.ts.map +1 -1
- package/dist/foundations/user/controllers/user.controller.js +4 -4
- package/dist/foundations/user/controllers/user.controller.js.map +1 -1
- package/dist/foundations/user/entities/user.d.ts +17 -17
- package/dist/foundations/user/entities/user.d.ts.map +1 -1
- package/dist/foundations/user/entities/user.js +7 -7
- package/dist/foundations/user/entities/user.js.map +1 -1
- package/dist/foundations/user/user.module.js +2 -2
- package/dist/foundations/user/user.module.js.map +1 -1
- package/dist/mcp/services/mcp.entity.write.service.d.ts +9 -4
- package/dist/mcp/services/mcp.entity.write.service.d.ts.map +1 -1
- package/dist/mcp/services/mcp.entity.write.service.js +12 -4
- package/dist/mcp/services/mcp.entity.write.service.js.map +1 -1
- package/dist/mcp/services/mcp.errors.d.ts +1 -1
- package/dist/mcp/services/mcp.errors.d.ts.map +1 -1
- package/dist/mcp/services/mcp.errors.js.map +1 -1
- package/dist/mcp/services/mcp.tool.registry.d.ts +10 -1
- package/dist/mcp/services/mcp.tool.registry.d.ts.map +1 -1
- package/dist/mcp/services/mcp.tool.registry.js +24 -2
- package/dist/mcp/services/mcp.tool.registry.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./oauth.client.service"), exports);
|
|
18
18
|
__exportStar(require("./oauth.pkce.service"), exports);
|
|
19
|
+
__exportStar(require("./oauth.scope.service"), exports);
|
|
19
20
|
__exportStar(require("./oauth.service"), exports);
|
|
20
21
|
__exportStar(require("./oauth.token.service"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,uDAAqC;AACrC,kDAAgC;AAChC,wDAAsC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,uDAAqC;AACrC,wDAAsC;AACtC,kDAAgC;AAChC,wDAAsC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { OAuthClient } from "../entities/oauth.client.entity";
|
|
2
2
|
import { OAuthRepository } from "../repositories/oauth.repository";
|
|
3
|
+
import { OAuthScopeService } from "./oauth.scope.service";
|
|
3
4
|
export interface CreateClientParams {
|
|
4
5
|
name: string;
|
|
5
6
|
description?: string;
|
|
@@ -28,8 +29,9 @@ export interface UpdateClientParams {
|
|
|
28
29
|
*/
|
|
29
30
|
export declare class OAuthClientService {
|
|
30
31
|
private readonly oauthRepository;
|
|
32
|
+
private readonly scopeService;
|
|
31
33
|
private static readonly DEFAULT_GRANT_TYPES;
|
|
32
|
-
constructor(oauthRepository: OAuthRepository);
|
|
34
|
+
constructor(oauthRepository: OAuthRepository, scopeService: OAuthScopeService);
|
|
33
35
|
/**
|
|
34
36
|
* Creates a new OAuth client.
|
|
35
37
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.client.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.client.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauth.client.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.client.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sFAAsF;IACtF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,qBACa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJ/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA2C;gBAGnE,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,iBAAiB;IAGlD;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IA8CvG;;OAEG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAI9D;;OAEG;IACG,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAIhE;;;;;;;;;OASG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IA0B1F;;;;;;;;;OASG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAKtE;;;;;;OAMG;IACH,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO;IAUvE;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAIlE;;;;OAIG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC;IA4BtF;;;;;;;OAOG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAiB3E;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,kBAAkB;CA0C3B"}
|
|
@@ -47,8 +47,8 @@ exports.OAuthClientService = void 0;
|
|
|
47
47
|
const common_1 = require("@nestjs/common");
|
|
48
48
|
const bcrypt = __importStar(require("bcrypt"));
|
|
49
49
|
const oauth_errors_1 = require("../constants/oauth.errors");
|
|
50
|
-
const oauth_scopes_1 = require("../constants/oauth.scopes");
|
|
51
50
|
const oauth_repository_1 = require("../repositories/oauth.repository");
|
|
51
|
+
const oauth_scope_service_1 = require("./oauth.scope.service");
|
|
52
52
|
/**
|
|
53
53
|
* OAuth Client Service
|
|
54
54
|
*
|
|
@@ -56,8 +56,9 @@ const oauth_repository_1 = require("../repositories/oauth.repository");
|
|
|
56
56
|
* Handles client credentials securely using bcrypt hashing.
|
|
57
57
|
*/
|
|
58
58
|
let OAuthClientService = OAuthClientService_1 = class OAuthClientService {
|
|
59
|
-
constructor(oauthRepository) {
|
|
59
|
+
constructor(oauthRepository, scopeService) {
|
|
60
60
|
this.oauthRepository = oauthRepository;
|
|
61
|
+
this.scopeService = scopeService;
|
|
61
62
|
}
|
|
62
63
|
/**
|
|
63
64
|
* Creates a new OAuth client.
|
|
@@ -76,7 +77,7 @@ let OAuthClientService = OAuthClientService_1 = class OAuthClientService {
|
|
|
76
77
|
}
|
|
77
78
|
// Validate scopes
|
|
78
79
|
for (const scope of params.allowedScopes) {
|
|
79
|
-
if (!
|
|
80
|
+
if (!this.scopeService.isValid(scope)) {
|
|
80
81
|
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.INVALID_SCOPE, `Invalid scope: ${scope}`), 400);
|
|
81
82
|
}
|
|
82
83
|
}
|
|
@@ -197,7 +198,7 @@ let OAuthClientService = OAuthClientService_1 = class OAuthClientService {
|
|
|
197
198
|
// Validate new scopes if provided
|
|
198
199
|
if (params.allowedScopes) {
|
|
199
200
|
for (const scope of params.allowedScopes) {
|
|
200
|
-
if (!
|
|
201
|
+
if (!this.scopeService.isValid(scope)) {
|
|
201
202
|
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.INVALID_SCOPE, `Invalid scope: ${scope}`), 400);
|
|
202
203
|
}
|
|
203
204
|
}
|
|
@@ -286,6 +287,7 @@ exports.OAuthClientService = OAuthClientService;
|
|
|
286
287
|
OAuthClientService.DEFAULT_GRANT_TYPES = ["authorization_code", "refresh_token"];
|
|
287
288
|
exports.OAuthClientService = OAuthClientService = OAuthClientService_1 = __decorate([
|
|
288
289
|
(0, common_1.Injectable)(),
|
|
289
|
-
__metadata("design:paramtypes", [oauth_repository_1.OAuthRepository
|
|
290
|
+
__metadata("design:paramtypes", [oauth_repository_1.OAuthRepository,
|
|
291
|
+
oauth_scope_service_1.OAuthScopeService])
|
|
290
292
|
], OAuthClientService);
|
|
291
293
|
//# sourceMappingURL=oauth.client.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.client.service.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.client.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA2D;AAC3D,+CAAiC;AACjC,4DAA8E;
|
|
1
|
+
{"version":3,"file":"oauth.client.service.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { ConfigService } from "@nestjs/config";
|
|
2
|
+
import { BaseConfigInterface } from "../../../config/interfaces/base.config.interface";
|
|
3
|
+
import { OAuthScopeDefinition } from "../constants/oauth.scopes";
|
|
4
|
+
/**
|
|
5
|
+
* OAuth Scope Service
|
|
6
|
+
*
|
|
7
|
+
* The runtime registry of OAuth scopes: the package built-ins followed by the
|
|
8
|
+
* app-specific scopes registered through config (`oauth.additionalScopes`).
|
|
9
|
+
* Every runtime scope check goes through here rather than the built-in-only
|
|
10
|
+
* helpers in `constants/oauth.scopes.ts`.
|
|
11
|
+
*/
|
|
12
|
+
export declare class OAuthScopeService {
|
|
13
|
+
private readonly configService;
|
|
14
|
+
private readonly definitions;
|
|
15
|
+
private readonly byScope;
|
|
16
|
+
constructor(configService: ConfigService<BaseConfigInterface>);
|
|
17
|
+
/** All registered scopes: built-ins first, then config additional scopes. */
|
|
18
|
+
all(): OAuthScopeDefinition[];
|
|
19
|
+
/** True when the scope is a built-in or a registered additional scope. */
|
|
20
|
+
isValid(scope: string): boolean;
|
|
21
|
+
/**
|
|
22
|
+
* Validates that every requested scope is registered.
|
|
23
|
+
* @param scopes - Space-separated scope string or array of scopes
|
|
24
|
+
*/
|
|
25
|
+
validate(scopes: string | string[]): boolean;
|
|
26
|
+
/** Consent-screen label and description for a scope; falls back for unknown scopes. */
|
|
27
|
+
describe(scope: string): {
|
|
28
|
+
name: string;
|
|
29
|
+
description: string;
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=oauth.scope.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth.scope.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.scope.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAEL,oBAAoB,EAIrB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;GAOG;AACH,qBACa,iBAAiB;IAIhB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAH1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoC;gBAE/B,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAkB9E,6EAA6E;IAC7E,GAAG,IAAI,oBAAoB,EAAE;IAI7B,0EAA0E;IAC1E,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAI/B;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO;IAK5C,uFAAuF;IACvF,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;CAK/D"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.OAuthScopeService = void 0;
|
|
13
|
+
const common_1 = require("@nestjs/common");
|
|
14
|
+
const config_1 = require("@nestjs/config");
|
|
15
|
+
const oauth_scopes_1 = require("../constants/oauth.scopes");
|
|
16
|
+
/**
|
|
17
|
+
* OAuth Scope Service
|
|
18
|
+
*
|
|
19
|
+
* The runtime registry of OAuth scopes: the package built-ins followed by the
|
|
20
|
+
* app-specific scopes registered through config (`oauth.additionalScopes`).
|
|
21
|
+
* Every runtime scope check goes through here rather than the built-in-only
|
|
22
|
+
* helpers in `constants/oauth.scopes.ts`.
|
|
23
|
+
*/
|
|
24
|
+
let OAuthScopeService = class OAuthScopeService {
|
|
25
|
+
constructor(configService) {
|
|
26
|
+
this.configService = configService;
|
|
27
|
+
const builtIns = Object.values(oauth_scopes_1.OAuth2Scopes).map((scope) => ({
|
|
28
|
+
scope,
|
|
29
|
+
name: oauth_scopes_1.OAuthScopeNames[scope],
|
|
30
|
+
description: oauth_scopes_1.OAuthScopeDescriptions[scope],
|
|
31
|
+
}));
|
|
32
|
+
const additional = this.configService.get("oauth", { infer: true })?.additionalScopes ?? [];
|
|
33
|
+
this.definitions = [...builtIns, ...additional];
|
|
34
|
+
this.byScope = new Map();
|
|
35
|
+
for (const definition of this.definitions) {
|
|
36
|
+
if (this.byScope.has(definition.scope)) {
|
|
37
|
+
throw new Error(`Duplicate OAuth scope "${definition.scope}" in oauth.additionalScopes`);
|
|
38
|
+
}
|
|
39
|
+
this.byScope.set(definition.scope, definition);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/** All registered scopes: built-ins first, then config additional scopes. */
|
|
43
|
+
all() {
|
|
44
|
+
return [...this.definitions];
|
|
45
|
+
}
|
|
46
|
+
/** True when the scope is a built-in or a registered additional scope. */
|
|
47
|
+
isValid(scope) {
|
|
48
|
+
return this.byScope.has(scope);
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Validates that every requested scope is registered.
|
|
52
|
+
* @param scopes - Space-separated scope string or array of scopes
|
|
53
|
+
*/
|
|
54
|
+
validate(scopes) {
|
|
55
|
+
const scopeArray = Array.isArray(scopes) ? scopes : (0, oauth_scopes_1.parseScopes)(scopes);
|
|
56
|
+
return scopeArray.every((scope) => this.isValid(scope));
|
|
57
|
+
}
|
|
58
|
+
/** Consent-screen label and description for a scope; falls back for unknown scopes. */
|
|
59
|
+
describe(scope) {
|
|
60
|
+
const definition = this.byScope.get(scope);
|
|
61
|
+
if (!definition)
|
|
62
|
+
return { name: scope, description: `Access to ${scope}` };
|
|
63
|
+
return { name: definition.name, description: definition.description };
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
exports.OAuthScopeService = OAuthScopeService;
|
|
67
|
+
exports.OAuthScopeService = OAuthScopeService = __decorate([
|
|
68
|
+
(0, common_1.Injectable)(),
|
|
69
|
+
__metadata("design:paramtypes", [config_1.ConfigService])
|
|
70
|
+
], OAuthScopeService);
|
|
71
|
+
//# sourceMappingURL=oauth.scope.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth.scope.service.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.scope.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAE/C,4DAMmC;AAEnC;;;;;;;GAOG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAI5B,YAA6B,aAAiD;QAAjD,kBAAa,GAAb,aAAa,CAAoC;QAC5E,MAAM,QAAQ,GAA2B,MAAM,CAAC,MAAM,CAAC,2BAAY,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnF,KAAK;YACL,IAAI,EAAE,8BAAe,CAAC,KAAK,CAAC;YAC5B,WAAW,EAAE,qCAAsB,CAAC,KAAK,CAAC;SAC3C,CAAC,CAAC,CAAC;QACJ,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,gBAAgB,IAAI,EAAE,CAAC;QAE5F,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,KAAK,6BAA6B,CAAC,CAAC;YAC3F,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,GAAG;QACD,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAED,0EAA0E;IAC1E,OAAO,CAAC,KAAa;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,MAAyB;QAChC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,CAAC;QACxE,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,uFAAuF;IACvF,QAAQ,CAAC,KAAa;QACpB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,KAAK,EAAE,EAAE,CAAC;QAC3E,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;IACxE,CAAC;CACF,CAAA;AA/CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAKiC,sBAAa;GAJ9C,iBAAiB,CA+C7B"}
|
|
@@ -3,6 +3,7 @@ import { BaseConfigInterface } from "../../../config/interfaces/base.config.inte
|
|
|
3
3
|
import { OAuthRepository } from "../repositories/oauth.repository";
|
|
4
4
|
import { OAuthClientService } from "./oauth.client.service";
|
|
5
5
|
import { OAuthPkceService } from "./oauth.pkce.service";
|
|
6
|
+
import { OAuthScopeService } from "./oauth.scope.service";
|
|
6
7
|
import { OAuthTokenService } from "./oauth.token.service";
|
|
7
8
|
export interface AuthorizeParams {
|
|
8
9
|
responseType: string;
|
|
@@ -13,6 +14,8 @@ export interface AuthorizeParams {
|
|
|
13
14
|
codeChallenge?: string;
|
|
14
15
|
codeChallengeMethod?: string;
|
|
15
16
|
userId: string;
|
|
17
|
+
/** Company the user chose on the consent screen; stored on the authorization code */
|
|
18
|
+
companyId?: string;
|
|
16
19
|
}
|
|
17
20
|
export interface TokenCodeParams {
|
|
18
21
|
grantType: "authorization_code";
|
|
@@ -58,6 +61,7 @@ export interface ConsentInfoParams {
|
|
|
58
61
|
clientId: string;
|
|
59
62
|
redirectUri: string;
|
|
60
63
|
scope?: string;
|
|
64
|
+
userId: string;
|
|
61
65
|
}
|
|
62
66
|
export interface ConsentInfoResponse {
|
|
63
67
|
client: {
|
|
@@ -73,6 +77,11 @@ export interface ConsentInfoResponse {
|
|
|
73
77
|
name: string;
|
|
74
78
|
description: string;
|
|
75
79
|
}>;
|
|
80
|
+
/** Companies the user BELONGS_TO, ordered by name, for the studio picker */
|
|
81
|
+
companies: Array<{
|
|
82
|
+
id: string;
|
|
83
|
+
name: string;
|
|
84
|
+
}>;
|
|
76
85
|
}
|
|
77
86
|
export interface ConsentApproveParams {
|
|
78
87
|
clientId: string;
|
|
@@ -82,6 +91,8 @@ export interface ConsentApproveParams {
|
|
|
82
91
|
codeChallenge?: string;
|
|
83
92
|
codeChallengeMethod?: string;
|
|
84
93
|
userId: string;
|
|
94
|
+
/** Company chosen on the consent screen; must be one the user BELONGS_TO */
|
|
95
|
+
companyId?: string;
|
|
85
96
|
}
|
|
86
97
|
export interface ConsentDenyParams {
|
|
87
98
|
redirectUri: string;
|
|
@@ -99,7 +110,8 @@ export declare class OAuthService {
|
|
|
99
110
|
private readonly tokenService;
|
|
100
111
|
private readonly pkceService;
|
|
101
112
|
private readonly configService;
|
|
102
|
-
|
|
113
|
+
private readonly scopeService;
|
|
114
|
+
constructor(oauthRepository: OAuthRepository, clientService: OAuthClientService, tokenService: OAuthTokenService, pkceService: OAuthPkceService, configService: ConfigService<BaseConfigInterface>, scopeService: OAuthScopeService);
|
|
103
115
|
/**
|
|
104
116
|
* Initiates the authorization code flow.
|
|
105
117
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;
|
|
1
|
+
{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ const oauth_scopes_1 = require("../constants/oauth.scopes");
|
|
|
51
51
|
const oauth_repository_1 = require("../repositories/oauth.repository");
|
|
52
52
|
const oauth_client_service_1 = require("./oauth.client.service");
|
|
53
53
|
const oauth_pkce_service_1 = require("./oauth.pkce.service");
|
|
54
|
+
const oauth_scope_service_1 = require("./oauth.scope.service");
|
|
54
55
|
const oauth_token_service_1 = require("./oauth.token.service");
|
|
55
56
|
/**
|
|
56
57
|
* Main OAuth Service
|
|
@@ -59,12 +60,13 @@ const oauth_token_service_1 = require("./oauth.token.service");
|
|
|
59
60
|
* and refresh token grants. Implements RFC 6749, RFC 7009, and RFC 7662.
|
|
60
61
|
*/
|
|
61
62
|
let OAuthService = class OAuthService {
|
|
62
|
-
constructor(oauthRepository, clientService, tokenService, pkceService, configService) {
|
|
63
|
+
constructor(oauthRepository, clientService, tokenService, pkceService, configService, scopeService) {
|
|
63
64
|
this.oauthRepository = oauthRepository;
|
|
64
65
|
this.clientService = clientService;
|
|
65
66
|
this.tokenService = tokenService;
|
|
66
67
|
this.pkceService = pkceService;
|
|
67
68
|
this.configService = configService;
|
|
69
|
+
this.scopeService = scopeService;
|
|
68
70
|
}
|
|
69
71
|
/**
|
|
70
72
|
* Initiates the authorization code flow.
|
|
@@ -94,7 +96,7 @@ let OAuthService = class OAuthService {
|
|
|
94
96
|
}
|
|
95
97
|
// Parse and validate scopes
|
|
96
98
|
const requestedScopes = params.scope ? (0, oauth_scopes_1.parseScopes)(params.scope) : client.allowedScopes;
|
|
97
|
-
if (!
|
|
99
|
+
if (!this.scopeService.validate(requestedScopes)) {
|
|
98
100
|
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.INVALID_SCOPE), 400);
|
|
99
101
|
}
|
|
100
102
|
if (!this.clientService.validateScopes(client, requestedScopes)) {
|
|
@@ -128,6 +130,7 @@ let OAuthService = class OAuthService {
|
|
|
128
130
|
codeChallenge: params.codeChallenge,
|
|
129
131
|
codeChallengeMethod,
|
|
130
132
|
expiresAt,
|
|
133
|
+
companyId: params.companyId ?? null,
|
|
131
134
|
});
|
|
132
135
|
return { code, state: params.state };
|
|
133
136
|
}
|
|
@@ -183,8 +186,8 @@ let OAuthService = class OAuthService {
|
|
|
183
186
|
if (!marked) {
|
|
184
187
|
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.INVALID_GRANT, "Authorization code already used"), 400);
|
|
185
188
|
}
|
|
186
|
-
//
|
|
187
|
-
const companyId = await this.oauthRepository.findCompanyIdForUser(storedCode.userId);
|
|
189
|
+
// Use the company chosen at consent; fall back to the user's company for codes issued without one
|
|
190
|
+
const companyId = storedCode.companyId ?? (await this.oauthRepository.findCompanyIdForUser(storedCode.userId));
|
|
188
191
|
// Generate tokens
|
|
189
192
|
const { token: accessToken, expiresIn, tokenId: accessTokenId, } = await this.tokenService.generateAccessToken({
|
|
190
193
|
clientId: params.clientId,
|
|
@@ -393,7 +396,7 @@ let OAuthService = class OAuthService {
|
|
|
393
396
|
}
|
|
394
397
|
// Parse and validate scopes
|
|
395
398
|
const requestedScopes = params.scope ? (0, oauth_scopes_1.parseScopes)(params.scope) : client.allowedScopes;
|
|
396
|
-
if (!
|
|
399
|
+
if (!this.scopeService.validate(requestedScopes)) {
|
|
397
400
|
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.INVALID_SCOPE), 400);
|
|
398
401
|
}
|
|
399
402
|
if (!this.clientService.validateScopes(client, requestedScopes)) {
|
|
@@ -402,8 +405,7 @@ let OAuthService = class OAuthService {
|
|
|
402
405
|
// Build scope info for consent screen
|
|
403
406
|
const scopeInfo = requestedScopes.map((scope) => ({
|
|
404
407
|
scope,
|
|
405
|
-
|
|
406
|
-
description: oauth_scopes_1.OAuthScopeDescriptions[scope] || `Access to ${scope}`,
|
|
408
|
+
...this.scopeService.describe(scope),
|
|
407
409
|
}));
|
|
408
410
|
return {
|
|
409
411
|
client: {
|
|
@@ -415,6 +417,7 @@ let OAuthService = class OAuthService {
|
|
|
415
417
|
},
|
|
416
418
|
},
|
|
417
419
|
scopes: scopeInfo,
|
|
420
|
+
companies: await this.oauthRepository.findCompaniesForUser(params.userId),
|
|
418
421
|
};
|
|
419
422
|
}
|
|
420
423
|
/**
|
|
@@ -424,6 +427,11 @@ let OAuthService = class OAuthService {
|
|
|
424
427
|
* Returns a redirect URL with the authorization code.
|
|
425
428
|
*/
|
|
426
429
|
async approveAuthorization(params) {
|
|
430
|
+
// A chosen company must be one the user belongs to
|
|
431
|
+
if (params.companyId &&
|
|
432
|
+
!(await this.oauthRepository.userBelongsToCompany({ userId: params.userId, companyId: params.companyId }))) {
|
|
433
|
+
throw new common_1.HttpException((0, oauth_errors_1.createOAuthError)(oauth_errors_1.OAuthErrorCodes.ACCESS_DENIED, "User does not belong to company"), 403);
|
|
434
|
+
}
|
|
427
435
|
// Use existing initiateAuthorization logic
|
|
428
436
|
const { code, state } = await this.initiateAuthorization({
|
|
429
437
|
responseType: "code",
|
|
@@ -434,6 +442,7 @@ let OAuthService = class OAuthService {
|
|
|
434
442
|
codeChallenge: params.codeChallenge,
|
|
435
443
|
codeChallengeMethod: params.codeChallengeMethod,
|
|
436
444
|
userId: params.userId,
|
|
445
|
+
companyId: params.companyId,
|
|
437
446
|
});
|
|
438
447
|
// Build redirect URL with code
|
|
439
448
|
const redirectUrl = new URL(params.redirectUri);
|
|
@@ -465,6 +474,7 @@ exports.OAuthService = OAuthService = __decorate([
|
|
|
465
474
|
oauth_client_service_1.OAuthClientService,
|
|
466
475
|
oauth_token_service_1.OAuthTokenService,
|
|
467
476
|
oauth_pkce_service_1.OAuthPkceService,
|
|
468
|
-
config_1.ConfigService
|
|
477
|
+
config_1.ConfigService,
|
|
478
|
+
oauth_scope_service_1.OAuthScopeService])
|
|
469
479
|
], OAuthService);
|
|
470
480
|
//# sourceMappingURL=oauth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../../../src/foundations/oauth/services/oauth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA2D;AAC3D,2CAA+C;AAC/C,+CAAiC;AAEjC,4DAA8E;AAC9E,4DAAwD;AACxD,uEAAmE;AACnE,iEAA4D;AAC5D,6DAAwD;AACxD,+DAA0D;AAC1D,+DAA0D;AAuG1D;;;;;GAKG;AAEI,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACmB,eAAgC,EAChC,aAAiC,EACjC,YAA+B,EAC/B,WAA6B,EAC7B,aAAiD,EACjD,YAA+B;QAL/B,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAoB;QACjC,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,gBAAW,GAAX,WAAW,CAAkB;QAC7B,kBAAa,GAAb,aAAa,CAAoC;QACjD,iBAAY,GAAZ,YAAY,CAAmB;IAC/C,CAAC;IAEJ;;;;;;;OAOG;IACH,KAAK,CAAC,qBAAqB,CAAC,MAAuB;QACjD,yBAAyB;QACzB,IAAI,MAAM,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,yBAAyB,EAAE,sCAAsC,CAAC,EACnG,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,kBAAkB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,CAAC;QACnG,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,eAAe,EAAE,sBAAsB,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1G,CAAC;QAED,sBAAsB;QACtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,mBAAmB,EAAE,oDAAoD,CAAC,EAC3G,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,4BAA4B;QAC5B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QACxF,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,wCAAwC,CAAC,EACzF,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,MAAM,WAAW,GACf,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC;QAEnH,IAAI,WAAW,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YACzC,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,eAAe,EAAE,4CAA4C,CAAC,EAC/F,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,iCAAiC;QACjC,IAAI,mBAAiD,CAAC;QACtD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,mBAAmB,GAAI,MAAM,CAAC,mBAAwC,IAAI,MAAM,CAAC;YACjF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBAClE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,eAAe,EAAE,+BAA+B,CAAC,EAClF,GAAG,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;QAED,8BAA8B;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,IAAI,GAAG,CAAC;QACvG,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,IAAI,CAAC,CAAC;QAC7D,2BAA2B;QAC3B,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC;YACjD,IAAI;YACJ,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,mBAAmB;YACnB,SAAS;YACT,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI;SACpC,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,yBAAyB,CAAC,MAAuB;QACrD,kBAAkB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;QAED,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE/E,uCAAuC;QACvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACpF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,4BAA4B,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9G,CAAC;QAED,2DAA2D;QAC3D,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,6DAA6D;YAC7D,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChF,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,iCAAiC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnH,CAAC;QAED,mBAAmB;QACnB,IAAI,IAAI,IAAI,EAAE,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC;YACtC,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,4BAA4B,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9G,CAAC;QAED,0BAA0B;QAC1B,IAAI,UAAU,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;QACnG,CAAC;QAED,6BAA6B;QAC7B,IAAI,UAAU,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,uBAAuB,CAAC,EAAE,GAAG,CAAC,CAAC;QACzG,CAAC;QAED,gBAAgB;QAChB,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;gBACzB,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,eAAe,EAAE,wBAAwB,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5G,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,qBAAqB,CACpD,MAAM,CAAC,YAAY,EACnB,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,mBAAoB,CAChC,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,uBAAuB,CAAC,EAAE,GAAG,CAAC,CAAC;YACzG,CAAC;QACH,CAAC;QAED,iCAAiC;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,iCAAiC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnH,CAAC;QAED,kGAAkG;QAClG,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/G,kBAAkB;QAClB,MAAM,EACJ,KAAK,EAAE,WAAW,EAClB,SAAS,EACT,OAAO,EAAE,aAAa,GACvB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC;YAC9C,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,SAAS,IAAI,SAAS;YACjC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,SAAS,EAAE,oBAAoB;YAC/B,eAAe,EAAE,MAAM,CAAC,mBAAmB;SAC5C,CAAC,CAAC;QAEH,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC;YAC3E,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,SAAS,IAAI,SAAS;YACjC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,aAAa;YACb,eAAe,EAAE,MAAM,CAAC,oBAAoB;SAC7C,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,SAAS;YACrB,aAAa,EAAE,YAAY;YAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,sBAAsB,CAAC,MAA+B;QAC1D,8BAA8B;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,mBAAmB,EAAE,oDAAoD,CAAC,EAC3G,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,4BAA4B;QAC5B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QACxF,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;QAChF,CAAC;QAED,kEAAkE;QAClE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC;YACpF,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YAChC,SAAS,EAAE,oBAAoB;YAC/B,eAAe,EAAE,MAAM,CAAC,mBAAmB;SAC5C,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,SAAS;YACrB,KAAK,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;SACjC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAA0B;QAChD,kBAAkB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;QAED,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC3F,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,uBAAuB,CAAC,EAAE,GAAG,CAAC,CAAC;QACzG,CAAC;QAED,0BAA0B;QAC1B,IAAI,gBAAgB,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClD,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;QACnG,CAAC;QAED,8CAA8C;QAC9C,IAAI,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;QACnC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,eAAe,GAAG,IAAA,0BAAW,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,IAAA,0BAAW,EAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC3D,mDAAmD;YACnD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,2CAA2C,CAAC,EAC5F,GAAG,CACJ,CAAC;YACJ,CAAC;YACD,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QACvB,CAAC;QAED,2BAA2B;QAC3B,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAEhE,sBAAsB;QACtB,MAAM,EACJ,KAAK,EAAE,WAAW,EAClB,SAAS,EACT,OAAO,EAAE,aAAa,GACvB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC;YAC9C,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS,IAAI,SAAS;YAClD,KAAK;YACL,SAAS,EAAE,eAAe;YAC1B,eAAe,EAAE,MAAM,CAAC,mBAAmB;SAC5C,CAAC,CAAC;QAEH,oDAAoD;QACpD,IAAI,eAAmC,CAAC;QACxC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;YACjF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC;gBAC7D,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,gBAAgB,CAAC,MAAM;gBAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS,IAAI,SAAS;gBAClD,KAAK;gBACL,aAAa;gBACb,eAAe,EAAE,MAAM,CAAC,oBAAoB;aAC7C,CAAC,CAAC;YACH,eAAe,GAAG,KAAK,CAAC;QAC1B,CAAC;QAED,OAAO;YACL,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,SAAS;YACrB,aAAa,EAAE,eAAe;YAC9B,KAAK;SACN,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,MAAoB;QACpC,6CAA6C;QAC7C,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,yDAAyD;gBACzD,OAAO;YACT,CAAC;QACH,CAAC;QAED,yDAAyD;QACzD,IAAI,MAAM,CAAC,aAAa,KAAK,eAAe,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC;YAAC,MAAM,CAAC;gBACP,2DAA2D;YAC7D,CAAC;QACH,CAAC;QAED,iCAAiC;QACjC,IAAI,MAAM,CAAC,aAAa,KAAK,cAAc,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3D,CAAC;YAAC,MAAM,CAAC;gBACP,gBAAgB;YAClB,CAAC;QACH,CAAC;QAED,qCAAqC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CAAC,MAAwB;QAY5C,2DAA2D;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;QACjF,CAAC;QAED,4BAA4B;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3F,uBAAuB;QACvB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,IAAI,wBAAwB,CAAC;YAC9F,OAAO;gBACL,GAAG,MAAM;gBACT,GAAG,EAAE,MAAM;aACZ,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,+CAA+C;IAC/C,uBAAuB;IACvB,+CAA+C;IAE/C;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,MAAyB;QAC5C,kBAAkB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,CAAC;QACnG,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,eAAe,EAAE,sBAAsB,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1G,CAAC;QAED,sBAAsB;QACtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,mBAAmB,EAAE,oDAAoD,CAAC,EAC3G,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,4BAA4B;QAC5B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,0BAAW,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QACxF,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,sBAAa,CACrB,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,wCAAwC,CAAC,EACzF,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,sCAAsC;QACtC,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAChD,KAAK;YACL,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;SACrC,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,QAAQ;gBACnB,IAAI,EAAE,eAAe;gBACrB,UAAU,EAAE;oBACV,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC;aACF;YACD,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC;SAC1E,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,oBAAoB,CAAC,MAA4B;QACrD,mDAAmD;QACnD,IACE,MAAM,CAAC,SAAS;YAChB,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,EAC1G,CAAC;YACD,MAAM,IAAI,sBAAa,CAAC,IAAA,+BAAgB,EAAC,8BAAe,CAAC,aAAa,EAAE,iCAAiC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnH,CAAC;QAED,2CAA2C;QAC3C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC;YACvD,YAAY,EAAE,MAAM;YACpB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC;QAEH,+BAA+B;QAC/B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAChD,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC3C,IAAI,KAAK,EAAE,CAAC;YACV,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAyB;QAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAChD,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,8BAAe,CAAC,aAAa,CAAC,CAAC;QACrE,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,2CAA2C,CAAC,CAAC;QAC/F,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;IACjD,CAAC;CACF,CAAA;AAngBY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAGyB,kCAAe;QACjB,yCAAkB;QACnB,uCAAiB;QAClB,qCAAgB;QACd,sBAAa;QACd,uCAAiB;GAPvC,YAAY,CAmgBxB"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The scored contents related to the source content `$id`, WITHOUT the page cut:
|
|
3
|
+
* the fragment ends on the `content, totalScore` projection, and the caller
|
|
4
|
+
* filters the rows (source exclusion, score threshold, access check) and then
|
|
5
|
+
* appends `ORDER BY totalScore DESC {CURSOR}`.
|
|
6
|
+
*/
|
|
1
7
|
export declare const contentQuery: (params: {
|
|
2
8
|
term?: string;
|
|
9
|
+
sourceLabels?: string[];
|
|
3
10
|
}) => string;
|
|
11
|
+
/**
|
|
12
|
+
* The scored contents related to the author `$id`. By default the fragment cuts
|
|
13
|
+
* the page itself (`ORDER BY totalScore DESC {CURSOR}`); a caller that filters
|
|
14
|
+
* the scored rows afterwards passes `deferCursor: true` and appends the cut after
|
|
15
|
+
* its own filters (see `query`).
|
|
16
|
+
*
|
|
17
|
+
* The author must belong to the caller's company (`$companyId`), stated in the
|
|
18
|
+
* fragment itself rather than relying on the caller having bound `company`
|
|
19
|
+
* first: an author from another company, or a call with no company in context,
|
|
20
|
+
* matches nothing.
|
|
21
|
+
*/
|
|
4
22
|
export declare const authorQuery: (params: {
|
|
5
23
|
term?: string;
|
|
24
|
+
deferCursor?: boolean;
|
|
6
25
|
}) => string;
|
|
7
26
|
export declare const contentToAuthorQuery: (params: {
|
|
8
27
|
term?: string;
|
|
28
|
+
sourceLabels?: string[];
|
|
9
29
|
}) => string;
|
|
10
30
|
export declare const authorToAuthorQuery: (params: {
|
|
11
31
|
term?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relevance.d.ts","sourceRoot":"","sources":["../../../../src/foundations/relevancy/queries/relevance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relevance.d.ts","sourceRoot":"","sources":["../../../../src/foundations/relevancy/queries/relevance.ts"],"names":[],"mappings":"AA2HA;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,MAMjF,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,KAAG,MAM9E,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,QAAQ;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG,MAMzF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,QAAQ;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,MAM/D,CAAC"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.authorToAuthorQuery = exports.contentToAuthorQuery = exports.authorQuery = exports.contentQuery = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* The relevance scoring shared by every relevance read.
|
|
6
|
+
*
|
|
7
|
+
* By default the fragment ends with `ORDER BY totalScore DESC {CURSOR}`, so the
|
|
8
|
+
* page is cut here. A caller that filters the scored rows afterwards passes
|
|
9
|
+
* `deferCursor: true`: the fragment then ends on the scored projection and the
|
|
10
|
+
* caller appends `ORDER BY totalScore DESC {CURSOR}` after its own filters, so a
|
|
11
|
+
* page is filled from rows that survive them and the pagination total (the
|
|
12
|
+
* query up to `{CURSOR}`) counts the same rows.
|
|
13
|
+
*/
|
|
4
14
|
const query = (params) => {
|
|
5
15
|
return `
|
|
6
16
|
OPTIONAL MATCH (chunk)-[:HAS_ATOMIC_FACT]->(:AtomicFact)-[:HAS_KEY_CONCEPT]->(startingKC:KeyConcept)
|
|
@@ -43,9 +53,11 @@ const query = (params) => {
|
|
|
43
53
|
END AS totalScore
|
|
44
54
|
|
|
45
55
|
${params.term ? "WHERE toLower(content.name) CONTAINS toLower($term)" : ""}
|
|
46
|
-
|
|
56
|
+
${params.deferCursor
|
|
57
|
+
? ``
|
|
58
|
+
: `
|
|
47
59
|
ORDER BY totalScore DESC
|
|
48
|
-
{CURSOR}
|
|
60
|
+
{CURSOR}`}
|
|
49
61
|
`;
|
|
50
62
|
};
|
|
51
63
|
const queryForAuthor = (params) => {
|
|
@@ -99,25 +111,49 @@ const queryForAuthor = (params) => {
|
|
|
99
111
|
{CURSOR}
|
|
100
112
|
`;
|
|
101
113
|
};
|
|
114
|
+
/**
|
|
115
|
+
* The `source` node of a content relevance read: constrained to the configured
|
|
116
|
+
* content labels (`:Article|Document|…`) so the `{id: $id}` lookup is an index
|
|
117
|
+
* seek per label instead of a scan of every node. Unlabelled (the historical
|
|
118
|
+
* pattern) when no content label is configured.
|
|
119
|
+
*/
|
|
120
|
+
const sourcePattern = (sourceLabels) => `source${sourceLabels?.length ? `:${sourceLabels.join("|")}` : ``} {id: $id}`;
|
|
121
|
+
/**
|
|
122
|
+
* The scored contents related to the source content `$id`, WITHOUT the page cut:
|
|
123
|
+
* the fragment ends on the `content, totalScore` projection, and the caller
|
|
124
|
+
* filters the rows (source exclusion, score threshold, access check) and then
|
|
125
|
+
* appends `ORDER BY totalScore DESC {CURSOR}`.
|
|
126
|
+
*/
|
|
102
127
|
const contentQuery = (params) => {
|
|
103
128
|
return `
|
|
104
|
-
MATCH (
|
|
129
|
+
MATCH (${sourcePattern(params.sourceLabels)})-[:BELONGS_TO]->(company)
|
|
105
130
|
MATCH (source)-[:HAS_CHUNK]->(chunk:Chunk)
|
|
106
|
-
${query({ term: params.term })}
|
|
131
|
+
${query({ term: params.term, deferCursor: true })}
|
|
107
132
|
`;
|
|
108
133
|
};
|
|
109
134
|
exports.contentQuery = contentQuery;
|
|
135
|
+
/**
|
|
136
|
+
* The scored contents related to the author `$id`. By default the fragment cuts
|
|
137
|
+
* the page itself (`ORDER BY totalScore DESC {CURSOR}`); a caller that filters
|
|
138
|
+
* the scored rows afterwards passes `deferCursor: true` and appends the cut after
|
|
139
|
+
* its own filters (see `query`).
|
|
140
|
+
*
|
|
141
|
+
* The author must belong to the caller's company (`$companyId`), stated in the
|
|
142
|
+
* fragment itself rather than relying on the caller having bound `company`
|
|
143
|
+
* first: an author from another company, or a call with no company in context,
|
|
144
|
+
* matches nothing.
|
|
145
|
+
*/
|
|
110
146
|
const authorQuery = (params) => {
|
|
111
147
|
return `
|
|
112
|
-
MATCH (author {id: $id})-[:BELONGS_TO]->(company)
|
|
148
|
+
MATCH (author {id: $id})-[:BELONGS_TO]->(company:Company {id: $companyId})
|
|
113
149
|
OPTIONAL MATCH (author)<-[:AUTHORED_BY|EDITED_BY]->()-[:HAS_CHUNK]->(chunk:Chunk)
|
|
114
|
-
${query({ term: params.term })}
|
|
150
|
+
${query({ term: params.term, deferCursor: params.deferCursor })}
|
|
115
151
|
`;
|
|
116
152
|
};
|
|
117
153
|
exports.authorQuery = authorQuery;
|
|
118
154
|
const contentToAuthorQuery = (params) => {
|
|
119
155
|
return `
|
|
120
|
-
MATCH (
|
|
156
|
+
MATCH (${sourcePattern(params.sourceLabels)})-[:BELONGS_TO]->(company)
|
|
121
157
|
MATCH (source)-[:HAS_CHUNK]->(chunk:Chunk)
|
|
122
158
|
${queryForAuthor({ term: params.term })}
|
|
123
159
|
`;
|
|
@@ -125,7 +161,7 @@ const contentToAuthorQuery = (params) => {
|
|
|
125
161
|
exports.contentToAuthorQuery = contentToAuthorQuery;
|
|
126
162
|
const authorToAuthorQuery = (params) => {
|
|
127
163
|
return `
|
|
128
|
-
MATCH (author {id: $id})-[:BELONGS_TO]->(company)
|
|
164
|
+
MATCH (author {id: $id})-[:BELONGS_TO]->(company:Company {id: $companyId})
|
|
129
165
|
OPTIONAL MATCH (author)<-[:AUTHORED_BY|EDITED_BY]->()-[:HAS_CHUNK]->(chunk:Chunk)
|
|
130
166
|
${queryForAuthor({ term: params.term })}
|
|
131
167
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relevance.js","sourceRoot":"","sources":["../../../../src/foundations/relevancy/queries/relevance.ts"],"names":[],"mappings":";;;AAAA,MAAM,KAAK,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"relevance.js","sourceRoot":"","sources":["../../../../src/foundations/relevancy/queries/relevance.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,MAAM,KAAK,GAAG,CAAC,MAAgD,EAAU,EAAE;IACzE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAwCC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,qDAAqD,CAAC,CAAC,CAAC,EAAE;EAEhF,MAAM,CAAC,WAAW;QAChB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;;iBAGN;KACK,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,MAAyB,EAAU,EAAE;IAC3D,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA4CC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,EAAE;;;;KAI5E,CAAC;AACN,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,YAAuB,EAAU,EAAE,CACxD,SAAS,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC;AAEhF;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,MAAkD,EAAU,EAAE;IACzF,OAAO;aACI,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC;;MAEzC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;CACpD,CAAC;AACF,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB;AAEF;;;;;;;;;;GAUG;AACI,MAAM,WAAW,GAAG,CAAC,MAAgD,EAAU,EAAE;IACtF,OAAO;;;MAGH,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;CAClE,CAAC;AACF,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB;AAEK,MAAM,oBAAoB,GAAG,CAAC,MAAkD,EAAU,EAAE;IACjG,OAAO;aACI,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC;;MAEzC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;CAC1C,CAAC;AACF,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEK,MAAM,mBAAmB,GAAG,CAAC,MAAyB,EAAU,EAAE;IACvE,OAAO;;;MAGH,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;CAC1C,CAAC;AACF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B"}
|