@yadsh/dsh-qa-integrations 0.6.0 → 0.8.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/README.md +341 -303
- package/lib/broker.js +12 -0
- package/lib/broker.js.map +1 -1
- package/lib/client/bitrix24.js +66 -5
- package/lib/client/bitrix24.js.map +1 -1
- package/lib/client/confluence.js +117 -128
- package/lib/client/confluence.js.map +1 -1
- package/lib/client/gitlab.js +1 -1
- package/lib/client/gitlab.js.map +1 -1
- package/lib/client/index.js +25 -5
- package/lib/client/index.js.map +1 -1
- package/lib/client/integrations.js +1 -1
- package/lib/client/integrations.js.map +1 -1
- package/lib/client/jira.js +115 -126
- package/lib/client/jira.js.map +1 -1
- package/lib/client/operator-card.js +537 -0
- package/lib/client/operator-card.js.map +1 -0
- package/lib/client/operator-controls.js +232 -0
- package/lib/client/operator-controls.js.map +1 -0
- package/lib/client/styles.js +60 -0
- package/lib/client/styles.js.map +1 -1
- package/lib/client/testit.js +39 -3
- package/lib/client/testit.js.map +1 -1
- package/lib/client/weblate.js +38 -3
- package/lib/client/weblate.js.map +1 -1
- package/lib/client.js +2966 -871
- package/lib/client.js.map +1 -1
- package/lib/coerce.js +17 -1
- package/lib/coerce.js.map +1 -1
- package/lib/config.js.map +1 -1
- package/lib/errors.js +22 -0
- package/lib/errors.js.map +1 -1
- package/lib/index.js +211 -52
- package/lib/index.js.map +1 -1
- package/lib/providers/bitrix24/catalog.js +138 -8
- package/lib/providers/bitrix24/catalog.js.map +1 -1
- package/lib/providers/bitrix24/config.js +84 -14
- package/lib/providers/bitrix24/config.js.map +1 -1
- package/lib/providers/bitrix24/index.js +100 -0
- package/lib/providers/bitrix24/index.js.map +1 -1
- package/lib/providers/bitrix24/operations.js +5 -9
- package/lib/providers/bitrix24/operations.js.map +1 -1
- package/lib/providers/bitrix24/transport.js +11 -31
- package/lib/providers/bitrix24/transport.js.map +1 -1
- package/lib/providers/confluence/adf.js +28 -23
- package/lib/providers/confluence/adf.js.map +1 -1
- package/lib/providers/confluence/catalog.js +91 -7
- package/lib/providers/confluence/catalog.js.map +1 -1
- package/lib/providers/confluence/config.js +27 -2
- package/lib/providers/confluence/config.js.map +1 -1
- package/lib/providers/confluence/credential-help.js +14 -8
- package/lib/providers/confluence/credential-help.js.map +1 -1
- package/lib/providers/confluence/dialect.js +215 -0
- package/lib/providers/confluence/dialect.js.map +1 -0
- package/lib/providers/confluence/index.js +393 -79
- package/lib/providers/confluence/index.js.map +1 -1
- package/lib/providers/confluence/operations.js +208 -153
- package/lib/providers/confluence/operations.js.map +1 -1
- package/lib/providers/confluence/storage.js +690 -0
- package/lib/providers/confluence/storage.js.map +1 -0
- package/lib/providers/confluence/transport.js +26 -89
- package/lib/providers/confluence/transport.js.map +1 -1
- package/lib/providers/gitlab/config.js +2 -3
- package/lib/providers/gitlab/config.js.map +1 -1
- package/lib/providers/gitlab/index.js +2 -20
- package/lib/providers/gitlab/index.js.map +1 -1
- package/lib/providers/gitlab/operations.js +7 -45
- package/lib/providers/gitlab/operations.js.map +1 -1
- package/lib/providers/gitlab/transport.js +2 -18
- package/lib/providers/gitlab/transport.js.map +1 -1
- package/lib/providers/jira/adf.js +19 -14
- package/lib/providers/jira/adf.js.map +1 -1
- package/lib/providers/jira/catalog.js +125 -4
- package/lib/providers/jira/catalog.js.map +1 -1
- package/lib/providers/jira/config.js +27 -2
- package/lib/providers/jira/config.js.map +1 -1
- package/lib/providers/jira/credential-help.js +16 -7
- package/lib/providers/jira/credential-help.js.map +1 -1
- package/lib/providers/jira/dialect.js +94 -0
- package/lib/providers/jira/dialect.js.map +1 -0
- package/lib/providers/jira/index.js +327 -67
- package/lib/providers/jira/index.js.map +1 -1
- package/lib/providers/jira/jql.js +54 -21
- package/lib/providers/jira/jql.js.map +1 -1
- package/lib/providers/jira/operations.js +77 -55
- package/lib/providers/jira/operations.js.map +1 -1
- package/lib/providers/jira/tools.js +1 -1
- package/lib/providers/jira/tools.js.map +1 -1
- package/lib/providers/jira/transport.js +12 -83
- package/lib/providers/jira/transport.js.map +1 -1
- package/lib/providers/shared/health.js +31 -0
- package/lib/providers/shared/health.js.map +1 -0
- package/lib/providers/shared/http.js +20 -0
- package/lib/providers/shared/http.js.map +1 -1
- package/lib/providers/shared/paths.js +14 -0
- package/lib/providers/shared/paths.js.map +1 -0
- package/lib/providers/shared/payload.js +46 -0
- package/lib/providers/shared/payload.js.map +1 -0
- package/lib/providers/teamcity/artifacts.js +0 -8
- package/lib/providers/teamcity/artifacts.js.map +1 -1
- package/lib/providers/teamcity/config.js +2 -3
- package/lib/providers/teamcity/config.js.map +1 -1
- package/lib/providers/teamcity/index.js +2 -20
- package/lib/providers/teamcity/index.js.map +1 -1
- package/lib/providers/teamcity/operations.js +5 -39
- package/lib/providers/teamcity/operations.js.map +1 -1
- package/lib/providers/teamcity/transport.js +2 -11
- package/lib/providers/teamcity/transport.js.map +1 -1
- package/lib/providers/testit/catalog.js +77 -0
- package/lib/providers/testit/catalog.js.map +1 -1
- package/lib/providers/testit/config.js +2 -3
- package/lib/providers/testit/config.js.map +1 -1
- package/lib/providers/testit/index.js +260 -4
- package/lib/providers/testit/index.js.map +1 -1
- package/lib/providers/testit/operations.js +34 -63
- package/lib/providers/testit/operations.js.map +1 -1
- package/lib/providers/testit/transport.js +2 -18
- package/lib/providers/testit/transport.js.map +1 -1
- package/lib/providers/weblate/catalog.js +103 -9
- package/lib/providers/weblate/catalog.js.map +1 -1
- package/lib/providers/weblate/config.js +2 -3
- package/lib/providers/weblate/config.js.map +1 -1
- package/lib/providers/weblate/index.js +227 -6
- package/lib/providers/weblate/index.js.map +1 -1
- package/lib/providers/weblate/operations.js +3 -33
- package/lib/providers/weblate/operations.js.map +1 -1
- package/lib/providers/weblate/query.js +3 -6
- package/lib/providers/weblate/query.js.map +1 -1
- package/lib/providers/weblate/transport.js +2 -12
- package/lib/providers/weblate/transport.js.map +1 -1
- package/lib/service-credentials/config.js +2 -3
- package/lib/service-credentials/config.js.map +1 -1
- package/lib/shared/settings.js +14 -0
- package/lib/shared/settings.js.map +1 -0
- package/lib/typert.host.js +159 -60
- package/lib/typert.remote-client.d.ts +13 -11
- package/lib/typert.remote-client.js +98 -52
- package/lib/types/broker.d.ts +11 -3
- package/lib/types/client/bitrix24.d.ts +24 -2
- package/lib/types/client/confluence.d.ts +24 -4
- package/lib/types/client/index.d.ts +7 -6
- package/lib/types/client/integrations.d.ts +2 -2
- package/lib/types/client/jira.d.ts +25 -4
- package/lib/types/client/operator-card.d.ts +22 -0
- package/lib/types/client/operator-controls.d.ts +135 -0
- package/lib/types/client/testit.d.ts +14 -1
- package/lib/types/client/weblate.d.ts +14 -1
- package/lib/types/coerce.d.ts +14 -0
- package/lib/types/config.d.ts +4 -4
- package/lib/types/errors.d.ts +16 -0
- package/lib/types/index.d.ts +91 -15
- package/lib/types/providers/bitrix24/catalog.d.ts +8 -0
- package/lib/types/providers/bitrix24/config.d.ts +14 -23
- package/lib/types/providers/bitrix24/index.d.ts +37 -1
- package/lib/types/providers/confluence/catalog.d.ts +44 -8
- package/lib/types/providers/confluence/config.d.ts +39 -7
- package/lib/types/providers/confluence/credential-help.d.ts +9 -4
- package/lib/types/providers/confluence/dialect.d.ts +113 -0
- package/lib/types/providers/confluence/index.d.ts +82 -8
- package/lib/types/providers/confluence/operations.d.ts +14 -4
- package/lib/types/providers/confluence/storage.d.ts +28 -0
- package/lib/types/providers/confluence/transport.d.ts +10 -21
- package/lib/types/providers/jira/catalog.d.ts +49 -2
- package/lib/types/providers/jira/config.d.ts +37 -6
- package/lib/types/providers/jira/credential-help.d.ts +11 -3
- package/lib/types/providers/jira/dialect.d.ts +79 -0
- package/lib/types/providers/jira/index.d.ts +76 -19
- package/lib/types/providers/jira/jql.d.ts +14 -4
- package/lib/types/providers/jira/operations.d.ts +3 -0
- package/lib/types/providers/jira/transport.d.ts +6 -13
- package/lib/types/providers/shared/health.d.ts +18 -0
- package/lib/types/providers/shared/http.d.ts +9 -0
- package/lib/types/providers/shared/paths.d.ts +10 -0
- package/lib/types/providers/shared/payload.d.ts +26 -0
- package/lib/types/providers/teamcity/artifacts.d.ts +0 -2
- package/lib/types/providers/teamcity/index.d.ts +2 -0
- package/lib/types/providers/testit/catalog.d.ts +12 -0
- package/lib/types/providers/testit/index.d.ts +63 -2
- package/lib/types/providers/weblate/catalog.d.ts +19 -2
- package/lib/types/providers/weblate/index.d.ts +43 -1
- package/lib/types/shared/settings.d.ts +14 -0
- package/lib/types/types.d.ts +8 -0
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/providers/confluence/catalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/providers/confluence/catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import z from "@deepseek-ai/schemastery";
|
|
2
|
+
import { scopedConfigError } from "../../errors.js";
|
|
2
3
|
export const CONFLUENCE_DEFAULTS = Object.freeze({
|
|
3
4
|
enabled: true,
|
|
4
5
|
allowInsecureHttp: false,
|
|
@@ -21,8 +22,30 @@ const INSTANCE_ID = /^[a-z0-9][a-z0-9-]{0,31}$/u;
|
|
|
21
22
|
const SPACE_KEY = /^[A-Z0-9][A-Z0-9_-]{0,254}$/u;
|
|
22
23
|
const MAX_INSTANCES = 16;
|
|
23
24
|
const MAX_ALLOWED_SPACES = 64;
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
const configError = scopedConfigError("confluence integration config");
|
|
26
|
+
/**
|
|
27
|
+
* Deployment types as an operator may spell them. `data-center` and
|
|
28
|
+
* `datacenter` are accepted because that is what an administrator calls the
|
|
29
|
+
* product on the stand; both name the same API as `server`.
|
|
30
|
+
*/
|
|
31
|
+
const DEPLOYMENT_TYPES = Object.freeze({
|
|
32
|
+
cloud: "cloud",
|
|
33
|
+
server: "server",
|
|
34
|
+
"data-center": "server",
|
|
35
|
+
datacenter: "server",
|
|
36
|
+
});
|
|
37
|
+
/** The deployment type of one configured instance; Cloud when undeclared. */
|
|
38
|
+
function normalizeDeployment(input, index) {
|
|
39
|
+
if (input === undefined || input === null)
|
|
40
|
+
return "cloud";
|
|
41
|
+
const raw = typeof input === "string" ? input.trim().toLowerCase() : "";
|
|
42
|
+
if (raw === "")
|
|
43
|
+
return "cloud";
|
|
44
|
+
const deployment = DEPLOYMENT_TYPES[raw];
|
|
45
|
+
if (deployment === undefined) {
|
|
46
|
+
throw configError(`instances[${index}].deploymentType must be cloud, server or data-center`);
|
|
47
|
+
}
|
|
48
|
+
return deployment;
|
|
26
49
|
}
|
|
27
50
|
/**
|
|
28
51
|
* Canonicalize one configured site. Everything here is operator input, so a
|
|
@@ -66,6 +89,7 @@ function normalizeInstance(input, index, allowInsecureHttp, seen) {
|
|
|
66
89
|
id,
|
|
67
90
|
label: label === "" ? url.host : label,
|
|
68
91
|
baseUrl: `${url.origin}${path}`,
|
|
92
|
+
deploymentType: normalizeDeployment(record["deploymentType"], index),
|
|
69
93
|
});
|
|
70
94
|
}
|
|
71
95
|
function normalizeInstances(input, allowInsecureHttp) {
|
|
@@ -112,6 +136,7 @@ export const confluenceConfigSchema = z.object({
|
|
|
112
136
|
id: z.string(),
|
|
113
137
|
label: z.string(),
|
|
114
138
|
baseUrl: z.string(),
|
|
139
|
+
deploymentType: z.string(),
|
|
115
140
|
}))
|
|
116
141
|
.default([]),
|
|
117
142
|
identityRead: z.boolean().default(CONFLUENCE_DEFAULTS.identityRead),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/providers/confluence/config.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/providers/confluence/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Confluence authenticates
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
* about Confluence
|
|
2
|
+
* Confluence authenticates in one of two ways, depending on where it runs.
|
|
3
|
+
* Atlassian Cloud takes an API token next to the account e-mail, and that token
|
|
4
|
+
* is account-wide: the same one opens Jira and the other Atlassian Cloud
|
|
5
|
+
* products, so the scopes are about the account rather than about Confluence
|
|
6
|
+
* alone. A self-hosted Server / Data Center instance takes a personal access
|
|
7
|
+
* token and no account, because the token belongs to the account that minted
|
|
8
|
+
* it. Which one the connect form asks for follows the instance the operator
|
|
9
|
+
* configured, and the instructions name both so the page is not wrong for
|
|
10
|
+
* either product.
|
|
6
11
|
*/
|
|
7
12
|
export const CONFLUENCE_CREDENTIAL_HELP = Object.freeze({
|
|
8
13
|
kind: "api-key",
|
|
@@ -16,14 +21,15 @@ export const CONFLUENCE_CREDENTIAL_HELP = Object.freeze({
|
|
|
16
21
|
label: "Документация Atlassian",
|
|
17
22
|
},
|
|
18
23
|
instructions: [
|
|
19
|
-
"Войдите в
|
|
20
|
-
"
|
|
21
|
-
"
|
|
24
|
+
"Войдите в аккаунт, которым пользуетесь в Confluence.",
|
|
25
|
+
"Atlassian Cloud: на странице API-токенов нажмите «Create API token» и вставьте токен вместе с адресом почты аккаунта.",
|
|
26
|
+
"Server / Data Center: откройте «Профиль → Личные токены доступа» (Personal Access Tokens), создайте токен и вставьте его — почта не нужна.",
|
|
22
27
|
].join("\n"),
|
|
23
28
|
scopes: ["Чтение страниц и пространств, доступных вашему аккаунту"],
|
|
24
29
|
notes: [
|
|
25
30
|
"Токен действует от вашего имени и наследует ваши права в Confluence.",
|
|
26
|
-
"
|
|
31
|
+
"Для Cloud нужен адрес почты аккаунта; для Server / Data Center достаточно самого токена.",
|
|
32
|
+
"Токен хранится в зашифрованном виде и после сохранения не отображается.",
|
|
27
33
|
],
|
|
28
34
|
});
|
|
29
35
|
//# sourceMappingURL=credential-help.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-help.js","sourceRoot":"","sources":["../../../src/providers/confluence/credential-help.ts"],"names":[],"mappings":"AAEA
|
|
1
|
+
{"version":3,"file":"credential-help.js","sourceRoot":"","sources":["../../../src/providers/confluence/credential-help.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAmB,MAAM,CAAC,MAAM,CAAC;IACtE,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,qBAAqB;IAC5B,MAAM,EAAE;QACN,GAAG,EAAE,6DAA6D;QAClE,KAAK,EAAE,mBAAmB;KAC3B;IACD,IAAI,EAAE;QACJ,GAAG,EAAE,oGAAoG;QACzG,KAAK,EAAE,wBAAwB;KAChC;IACD,YAAY,EAAE;QACZ,sDAAsD;QACtD,uHAAuH;QACvH,4IAA4I;KAC7I,CAAC,IAAI,CAAC,IAAI,CAAC;IACZ,MAAM,EAAE,CAAC,yDAAyD,CAAC;IACnE,KAAK,EAAE;QACL,sEAAsE;QACtE,0FAA0F;QAC1F,yEAAyE;KAC1E;CACF,CAAC,CAAC"}
|
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
import { IntegrationError } from "../../errors.js";
|
|
2
|
+
import { CONFLUENCE_COMPANION_PATHS, CONFLUENCE_INLINE_COMMENTS_PATH, CONFLUENCE_SERVER_COMPANION_PATHS, confluenceOperationPath, } from "./catalog.js";
|
|
3
|
+
/** The catalog's path of one operation on one product. */
|
|
4
|
+
function operationPath(operation, deployment) {
|
|
5
|
+
return confluenceOperationPath(operation, deployment) ?? "";
|
|
6
|
+
}
|
|
7
|
+
/** The same, with one `:placeholder` filled from a value we validated first. */
|
|
8
|
+
function fill(operation, deployment, placeholders, declared) {
|
|
9
|
+
let path = declared ?? operationPath(operation, deployment);
|
|
10
|
+
for (const [name, value] of Object.entries(placeholders)) {
|
|
11
|
+
path = path.replace(`:${name}`, value);
|
|
12
|
+
}
|
|
13
|
+
return path;
|
|
14
|
+
}
|
|
15
|
+
/** The comment collection of one Cloud page, by the kind the caller named. */
|
|
16
|
+
function commentCollection(pageId, kind) {
|
|
17
|
+
const declared = kind === "footer"
|
|
18
|
+
? confluenceOperationPath("pages.comments", "cloud")
|
|
19
|
+
: CONFLUENCE_INLINE_COMMENTS_PATH;
|
|
20
|
+
return fill("pages.comments", "cloud", { pageId }, declared);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* The continuation parameter of one paged read. Cloud continues a v2 collection
|
|
24
|
+
* with the opaque cursor it handed out; a Server / Data Center installation
|
|
25
|
+
* continues a v1 collection at the row offset it reported. Keeping this here is
|
|
26
|
+
* what makes every caller of the dialect paging-agnostic.
|
|
27
|
+
*/
|
|
28
|
+
function paged(cursor, limit) {
|
|
29
|
+
return cursor === undefined ? { limit } : { limit, start: Number(cursor) };
|
|
30
|
+
}
|
|
31
|
+
/** The same, for the one collection Cloud pages by cursor. */
|
|
32
|
+
function cursorPaged(cursor, limit) {
|
|
33
|
+
return cursor === undefined ? { limit } : { limit, cursor };
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Atlassian Cloud: the v2 API under the site's `/wiki` root, an API token over
|
|
37
|
+
* HTTP Basic, and listings paged by an opaque upstream cursor.
|
|
38
|
+
*/
|
|
39
|
+
const CLOUD = Object.freeze({
|
|
40
|
+
deployment: "cloud",
|
|
41
|
+
credentialLabel: "Atlassian API token",
|
|
42
|
+
tokenShape: /^[A-Za-z0-9._=+/-]{16,512}$/u,
|
|
43
|
+
requiresEmail: true,
|
|
44
|
+
productName: "Confluence Cloud",
|
|
45
|
+
commentKinds: "path",
|
|
46
|
+
currentUserPath: operationPath("connection.get", "cloud"),
|
|
47
|
+
searchPath: ({ cql, start, limit, includeArchived }) => ({
|
|
48
|
+
path: operationPath("search.run", "cloud"),
|
|
49
|
+
query: {
|
|
50
|
+
cql,
|
|
51
|
+
limit,
|
|
52
|
+
start,
|
|
53
|
+
includeArchivedSpaces: includeArchived === true ? "true" : undefined,
|
|
54
|
+
},
|
|
55
|
+
}),
|
|
56
|
+
spacePath: (ref) => isNumericSpace(ref)
|
|
57
|
+
? {
|
|
58
|
+
path: fill("spaces.get", "cloud", { spaceId: ref }),
|
|
59
|
+
query: { "description-format": "plain" },
|
|
60
|
+
}
|
|
61
|
+
: {
|
|
62
|
+
path: operationPath("spaces.list", "cloud"),
|
|
63
|
+
query: { keys: ref, limit: 2, "description-format": "plain" },
|
|
64
|
+
},
|
|
65
|
+
spaceList: ({ keys, type, cursor, limit }) => ({
|
|
66
|
+
path: operationPath("spaces.list", "cloud"),
|
|
67
|
+
query: {
|
|
68
|
+
keys: keys.length === 0 ? undefined : keys.join(","),
|
|
69
|
+
type,
|
|
70
|
+
...cursorPaged(cursor, limit),
|
|
71
|
+
},
|
|
72
|
+
}),
|
|
73
|
+
pageSpacePath: (pageId) => ({
|
|
74
|
+
path: fill("pages.get", "cloud", { pageId }),
|
|
75
|
+
query: {},
|
|
76
|
+
}),
|
|
77
|
+
pagePath: (pageId) => ({
|
|
78
|
+
path: fill("pages.get", "cloud", { pageId }),
|
|
79
|
+
query: { "body-format": "atlas_doc_format", "include-labels": "true" },
|
|
80
|
+
}),
|
|
81
|
+
commentPath: ({ pageId, kind, cursor, limit }) => ({
|
|
82
|
+
path: commentCollection(pageId, kind),
|
|
83
|
+
query: {
|
|
84
|
+
"body-format": "atlas_doc_format",
|
|
85
|
+
sort: "created-date",
|
|
86
|
+
...cursorPaged(cursor, limit),
|
|
87
|
+
},
|
|
88
|
+
}),
|
|
89
|
+
commentChildrenPath: ({ commentId, kind, cursor, limit }) => ({
|
|
90
|
+
path: fill("commentChildren", "cloud", { commentId }, kind === "footer"
|
|
91
|
+
? CONFLUENCE_COMPANION_PATHS[0]
|
|
92
|
+
: CONFLUENCE_COMPANION_PATHS[1]),
|
|
93
|
+
query: {
|
|
94
|
+
"body-format": "atlas_doc_format",
|
|
95
|
+
sort: "created-date",
|
|
96
|
+
...cursorPaged(cursor, limit),
|
|
97
|
+
},
|
|
98
|
+
}),
|
|
99
|
+
attachmentPath: ({ pageId, cursor, limit }) => ({
|
|
100
|
+
path: fill("pages.attachments", "cloud", { pageId }),
|
|
101
|
+
query: { sort: "created-date", ...cursorPaged(cursor, limit) },
|
|
102
|
+
}),
|
|
103
|
+
versionPath: ({ pageId, cursor, limit }) => ({
|
|
104
|
+
path: fill("pages.versions", "cloud", { pageId }),
|
|
105
|
+
query: cursorPaged(cursor, limit),
|
|
106
|
+
}),
|
|
107
|
+
});
|
|
108
|
+
/**
|
|
109
|
+
* Server and Data Center: the v1 API under the installation's own base, a
|
|
110
|
+
* personal access token over Bearer, and listings paged by row offset. A
|
|
111
|
+
* self-hosted installation has no `/wiki` context of its own — an installation
|
|
112
|
+
* that lives behind a context path declares it in `baseUrl`, and every path
|
|
113
|
+
* below is relative to that.
|
|
114
|
+
*/
|
|
115
|
+
const SERVER = Object.freeze({
|
|
116
|
+
deployment: "server",
|
|
117
|
+
credentialLabel: "personal access token",
|
|
118
|
+
// A Data Center personal access token is base64, so it may carry `+`, `/` and
|
|
119
|
+
// padding; the shape is checked for "one opaque token" rather than an
|
|
120
|
+
// alphabet an API token happens to use.
|
|
121
|
+
tokenShape: /^[A-Za-z0-9._+/=-]{16,1024}$/u,
|
|
122
|
+
requiresEmail: false,
|
|
123
|
+
productName: "Confluence Server / Data Center",
|
|
124
|
+
// The v1 API keeps footer and inline comments in one collection and marks
|
|
125
|
+
// each comment with its location, so the kind is filtered after the read
|
|
126
|
+
// instead of selecting an endpoint.
|
|
127
|
+
commentKinds: "marker",
|
|
128
|
+
currentUserPath: operationPath("connection.get", "server"),
|
|
129
|
+
searchPath: ({ cql, start, limit }) => ({
|
|
130
|
+
path: operationPath("search.run", "server"),
|
|
131
|
+
query: {
|
|
132
|
+
cql,
|
|
133
|
+
limit,
|
|
134
|
+
start,
|
|
135
|
+
// The excerpt is what a search answer hands the model instead of the
|
|
136
|
+
// whole body, so the collection read asks for it explicitly.
|
|
137
|
+
expand: "space,version,excerpt",
|
|
138
|
+
},
|
|
139
|
+
}),
|
|
140
|
+
spacePath: (ref) => ({
|
|
141
|
+
path: operationPath("spaces.list", "server"),
|
|
142
|
+
query: { keys: ref, limit: 2, expand: "description.plain" },
|
|
143
|
+
}),
|
|
144
|
+
spaceList: ({ keys, type, cursor, limit }) => ({
|
|
145
|
+
path: operationPath("spaces.list", "server"),
|
|
146
|
+
query: {
|
|
147
|
+
keys: keys.length === 0 ? undefined : keys.join(","),
|
|
148
|
+
type,
|
|
149
|
+
...paged(cursor, limit),
|
|
150
|
+
},
|
|
151
|
+
}),
|
|
152
|
+
pageSpacePath: (pageId) => ({
|
|
153
|
+
path: fill("pages.get", "server", { pageId }),
|
|
154
|
+
query: { expand: "space" },
|
|
155
|
+
}),
|
|
156
|
+
pagePath: (pageId) => ({
|
|
157
|
+
path: fill("pages.get", "server", { pageId }),
|
|
158
|
+
query: {
|
|
159
|
+
expand: "body.storage,version,space,ancestors,metadata.labels",
|
|
160
|
+
},
|
|
161
|
+
}),
|
|
162
|
+
commentPath: ({ pageId, cursor, limit }) => ({
|
|
163
|
+
path: fill("pages.comments", "server", { pageId }),
|
|
164
|
+
query: {
|
|
165
|
+
expand: "body.storage,version,extensions",
|
|
166
|
+
...paged(cursor, limit),
|
|
167
|
+
},
|
|
168
|
+
}),
|
|
169
|
+
commentChildrenPath: ({ commentId, cursor, limit }) => ({
|
|
170
|
+
path: fill("commentChildren", "server", { commentId }, CONFLUENCE_SERVER_COMPANION_PATHS[0]),
|
|
171
|
+
query: {
|
|
172
|
+
expand: "body.storage,version,extensions",
|
|
173
|
+
...paged(cursor, limit),
|
|
174
|
+
},
|
|
175
|
+
}),
|
|
176
|
+
attachmentPath: ({ pageId, cursor, limit }) => ({
|
|
177
|
+
path: fill("pages.attachments", "server", { pageId }),
|
|
178
|
+
query: { expand: "version", ...paged(cursor, limit) },
|
|
179
|
+
}),
|
|
180
|
+
versionPath: ({ pageId, cursor, limit }) => ({
|
|
181
|
+
path: fill("pages.versions", "server", { pageId }),
|
|
182
|
+
query: paged(cursor, limit),
|
|
183
|
+
}),
|
|
184
|
+
});
|
|
185
|
+
export const CONFLUENCE_DIALECTS = Object.freeze({ cloud: CLOUD, server: SERVER });
|
|
186
|
+
/** The dialect of one configured instance. */
|
|
187
|
+
export function dialectOf(instance) {
|
|
188
|
+
return CONFLUENCE_DIALECTS[instance.deploymentType];
|
|
189
|
+
}
|
|
190
|
+
const NUMERIC = /^\d{1,20}$/u;
|
|
191
|
+
/** Whether a space reference is the numeric id the v2 API addresses it by. */
|
|
192
|
+
function isNumericSpace(value) {
|
|
193
|
+
return NUMERIC.test(value);
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* The `Authorization` header of one stored credential. Cloud spends an
|
|
197
|
+
* Atlassian API token as HTTP Basic over `email:token`; a Server / Data Center
|
|
198
|
+
* personal access token is a bearer token whose account is the token's own, so
|
|
199
|
+
* no e-mail travels with it.
|
|
200
|
+
*
|
|
201
|
+
* The credential carries what the operator's instance declared, so an instance
|
|
202
|
+
* whose deployment type no longer matches the stored credential is refused
|
|
203
|
+
* here, before the secret is spent: a token minted for one product must not be
|
|
204
|
+
* offered to the other.
|
|
205
|
+
*/
|
|
206
|
+
export function authorizationFor(dialect, credential) {
|
|
207
|
+
if (dialect.deployment === "server")
|
|
208
|
+
return `Bearer ${credential.token}`;
|
|
209
|
+
if (credential.email.trim() === "") {
|
|
210
|
+
throw new IntegrationError("CredentialRevoked", "This Confluence site is configured as Cloud and needs the account e-mail; reconnect it");
|
|
211
|
+
}
|
|
212
|
+
const pair = Buffer.from(`${credential.email}:${credential.token}`, "utf8").toString("base64");
|
|
213
|
+
return `Basic ${pair}`;
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=dialect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../../src/providers/confluence/dialect.ts"],"names":[],"mappings":"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"}
|