@adaptive-ds/project-registry 0.2.4 → 0.3.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/access/projectAuthorize.d.ts.map +1 -1
- package/dist/access/projectAuthorize.js +15 -6
- package/dist/access/projectAuthorize.js.map +1 -1
- package/dist/access-log/projectAccessLogListUseCase.d.ts.map +1 -1
- package/dist/access-log/projectAccessLogListUseCase.js +3 -3
- package/dist/access-log/projectAccessLogListUseCase.js.map +1 -1
- package/dist/api/projectRegistryApiHandlerCreate.d.ts.map +1 -1
- package/dist/api/projectRegistryApiHandlerCreate.js +99 -38
- package/dist/api/projectRegistryApiHandlerCreate.js.map +1 -1
- package/dist/caddy/caddyConfigInspect.js +1 -1
- package/dist/caddy/caddyConfigInspect.js.map +1 -1
- package/dist/caddy/caddyConfigInspectUseCase.js +1 -1
- package/dist/caddy/caddyConfigInspectUseCase.js.map +1 -1
- package/dist/caddy/caddyConfigSelect.d.ts.map +1 -1
- package/dist/caddy/caddyConfigSelect.js +2 -2
- package/dist/caddy/caddyConfigSelect.js.map +1 -1
- package/dist/caddy/projectDocsUrls.d.ts.map +1 -1
- package/dist/caddy/projectDocsUrls.js +51 -25
- package/dist/caddy/projectDocsUrls.js.map +1 -1
- package/dist/caddy/projectDocsUrlsUseCase.d.ts.map +1 -1
- package/dist/caddy/projectDocsUrlsUseCase.js +7 -13
- package/dist/caddy/projectDocsUrlsUseCase.js.map +1 -1
- package/dist/cli/projectRegistryCliArgumentsParse.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliArgumentsParse.js +20 -5
- package/dist/cli/projectRegistryCliArgumentsParse.js.map +1 -1
- package/dist/cli/projectRegistryCliHelp.d.ts +1 -1
- package/dist/cli/projectRegistryCliHelp.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliHelp.js +3 -0
- package/dist/cli/projectRegistryCliHelp.js.map +1 -1
- package/dist/cli/projectRegistryCliRequest.d.ts +6 -1
- package/dist/cli/projectRegistryCliRequest.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliRequest.js +15 -10
- package/dist/cli/projectRegistryCliRequest.js.map +1 -1
- package/dist/cli/projectRegistryCliRun.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliRun.js +14 -9
- package/dist/cli/projectRegistryCliRun.js.map +1 -1
- package/dist/cli/projectRegistryCliSocketResolve.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliSocketResolve.js +10 -8
- package/dist/cli/projectRegistryCliSocketResolve.js.map +1 -1
- package/dist/identity/preferredUsernameMap.d.ts.map +1 -1
- package/dist/identity/preferredUsernameMap.js +7 -3
- package/dist/identity/preferredUsernameMap.js.map +1 -1
- package/dist/identity/userRoleResolve.d.ts.map +1 -1
- package/dist/identity/userRoleResolve.js +8 -4
- package/dist/identity/userRoleResolve.js.map +1 -1
- package/dist/identity/visibleUserDirectoryList.d.ts.map +1 -1
- package/dist/identity/visibleUserDirectoryList.js +37 -14
- package/dist/identity/visibleUserDirectoryList.js.map +1 -1
- package/dist/project/projectCollisions.d.ts.map +1 -1
- package/dist/project/projectCollisions.js +4 -4
- package/dist/project/projectCollisions.js.map +1 -1
- package/dist/project/projectCreate.d.ts.map +1 -1
- package/dist/project/projectCreate.js +2 -2
- package/dist/project/projectCreate.js.map +1 -1
- package/dist/project/projectDelete.d.ts.map +1 -1
- package/dist/project/projectDelete.js +2 -2
- package/dist/project/projectDelete.js.map +1 -1
- package/dist/project/projectEdit.d.ts.map +1 -1
- package/dist/project/projectEdit.js +4 -4
- package/dist/project/projectEdit.js.map +1 -1
- package/dist/project/projectGet.d.ts.map +1 -1
- package/dist/project/projectGet.js +2 -2
- package/dist/project/projectGet.js.map +1 -1
- package/dist/project/projectMutationExpectedRevision.d.ts.map +1 -1
- package/dist/project/projectMutationExpectedRevision.js +5 -5
- package/dist/project/projectMutationExpectedRevision.js.map +1 -1
- package/dist/project/projectNormalize.d.ts.map +1 -1
- package/dist/project/projectNormalize.js +3 -3
- package/dist/project/projectNormalize.js.map +1 -1
- package/dist/project/projectPortNext.d.ts.map +1 -1
- package/dist/project/projectPortNext.js +3 -3
- package/dist/project/projectPortNext.js.map +1 -1
- package/dist/project/projectValidate.d.ts.map +1 -1
- package/dist/project/projectValidate.js +4 -4
- package/dist/project/projectValidate.js.map +1 -1
- package/dist/project-store/projectRepositoryOpen.d.ts.map +1 -1
- package/dist/project-store/projectRepositoryOpen.js +12 -12
- package/dist/project-store/projectRepositoryOpen.js.map +1 -1
- package/dist/session/sessionActorResolve.d.ts.map +1 -1
- package/dist/session/sessionActorResolve.js +29 -17
- package/dist/session/sessionActorResolve.js.map +1 -1
- package/dist/session/sessionRequestResolve.d.ts.map +1 -1
- package/dist/session/sessionRequestResolve.js +8 -4
- package/dist/session/sessionRequestResolve.js.map +1 -1
- package/dist/ui/assets/index-CQMmJz6j.js +1 -0
- package/dist/ui/index.html +1 -1
- package/dist/zitadel/zitadelCallbackHandle.d.ts.map +1 -1
- package/dist/zitadel/zitadelCallbackHandle.js +17 -10
- package/dist/zitadel/zitadelCallbackHandle.js.map +1 -1
- package/dist/zitadel/zitadelLoginStart.d.ts.map +1 -1
- package/dist/zitadel/zitadelLoginStart.js +15 -10
- package/dist/zitadel/zitadelLoginStart.js.map +1 -1
- package/package.json +1 -1
- package/dist/ui/assets/index-CSCiyyWx.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectRegistryCliSocketResolve.js","sourceRoot":"","sources":["../../src/cli/projectRegistryCliSocketResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAe,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"projectRegistryCliSocketResolve.js","sourceRoot":"","sources":["../../src/cli/projectRegistryCliSocketResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAe,MAAM,SAAS,CAAA;AAItE,SAAS,kBAAkB,CAAC,EAAU,EAAE,YAAoB,EAAE,IAAY;IACxE,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,CAAA;AACzD,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,cAAkC,EAClC,WAAyD;IAEzD,MAAM,EAAE,GAAG,iCAAiC,CAAA;IAC5C,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,YAAY,CAAC,cAAc,CAAC,CAAA;IAErE,MAAM,iBAAiB,GAAG,WAAW,CAAC,uBAAuB,CAAA;IAC7D,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;QACpC,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,kBAAkB,CACvB,EAAE,EACF,4CAA4C,EAC5C,4EAA4E,CAC7E,CAAA;QACH,CAAC;QACD,OAAO,YAAY,CAAC,iBAAiB,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAA;IACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QACjD,OAAO,kBAAkB,CACvB,EAAE,EACF,iEAAiE,EACjE,mCAAmC,CACpC,CAAA;IACH,IAAI,QAAQ,CAAC,MAAM,GAAG,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzE,OAAO,kBAAkB,CACvB,EAAE,EACF,sDAAsD,EACtD,4DAA4D,CAC7D,CAAA;IACH,OAAO,YAAY,CAAC,yBAAyB,QAAQ,OAAO,CAAC,CAAA;AAC/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferredUsernameMap.d.ts","sourceRoot":"","sources":["../../src/identity/preferredUsernameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"preferredUsernameMap.d.ts","sourceRoot":"","sources":["../../src/identity/preferredUsernameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAQjE,wBAAsB,oBAAoB,CACxC,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,kBAAkB,EAC9B,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GACzD,aAAa,CAAC,MAAM,CAAC,CAiBvB"}
|
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
import { createResult, createResultError } from "#result";
|
|
2
2
|
import { promiseBoundedRace } from "../runtime/promiseBoundedRace.js";
|
|
3
|
+
const mappingHint = "Ask an administrator to verify that your login account maps to a local user, then retry.";
|
|
4
|
+
function mappingError(op) {
|
|
5
|
+
return { ...createResultError(op, "preferred username mapping is unavailable"), hint: mappingHint };
|
|
6
|
+
}
|
|
3
7
|
export async function preferredUsernameMap(preferredUsername, posixUsers, options = {}) {
|
|
4
8
|
const op = "preferredUsernameMap";
|
|
5
9
|
if (typeof preferredUsername !== "string" || preferredUsername.length === 0 || preferredUsername.length > 256) {
|
|
6
|
-
return
|
|
10
|
+
return mappingError(op);
|
|
7
11
|
}
|
|
8
12
|
try {
|
|
9
13
|
const existsR = await promiseBoundedRace(Promise.resolve().then(() => posixUsers.usernameExists(preferredUsername)), options);
|
|
10
14
|
if (existsR.success !== true || existsR.data.success !== true || existsR.data.data !== true) {
|
|
11
|
-
return
|
|
15
|
+
return mappingError(op);
|
|
12
16
|
}
|
|
13
17
|
return createResult(preferredUsername);
|
|
14
18
|
}
|
|
15
19
|
catch {
|
|
16
|
-
return
|
|
20
|
+
return mappingError(op);
|
|
17
21
|
}
|
|
18
22
|
}
|
|
19
23
|
//# sourceMappingURL=preferredUsernameMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferredUsernameMap.js","sourceRoot":"","sources":["../../src/identity/preferredUsernameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAGrE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,iBAAyB,EACzB,UAA8B,EAC9B,UAAwD,EAAE;IAE1D,MAAM,EAAE,GAAG,sBAAsB,CAAA;IACjC,IAAI,OAAO,iBAAiB,KAAK,QAAQ,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC9G,OAAO,
|
|
1
|
+
{"version":3,"file":"preferredUsernameMap.js","sourceRoot":"","sources":["../../src/identity/preferredUsernameMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAGrE,MAAM,WAAW,GAAG,0FAA0F,CAAA;AAE9G,SAAS,YAAY,CAAC,EAAU;IAC9B,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,EAAE,2CAA2C,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAA;AACrG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,iBAAyB,EACzB,UAA8B,EAC9B,UAAwD,EAAE;IAE1D,MAAM,EAAE,GAAG,sBAAsB,CAAA;IACjC,IAAI,OAAO,iBAAiB,KAAK,QAAQ,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC9G,OAAO,YAAY,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,kBAAkB,CACtC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,EAC1E,OAAO,CACR,CAAA;QACD,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC5F,OAAO,YAAY,CAAC,EAAE,CAAC,CAAA;QACzB,CAAC;QACD,OAAO,YAAY,CAAC,iBAAiB,CAAC,CAAA;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,YAAY,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userRoleResolve.d.ts","sourceRoot":"","sources":["../../src/identity/userRoleResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAG7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"userRoleResolve.d.ts","sourceRoot":"","sources":["../../src/identity/userRoleResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAG7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAQ/D,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GACzD,aAAa,CAAC,IAAI,CAAC,CA+BrB"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { createResult, createResultError } from "#result";
|
|
2
2
|
import { roleResolve } from "../access/roleResolve.js";
|
|
3
3
|
import { promiseBoundedRace } from "../runtime/promiseBoundedRace.js";
|
|
4
|
+
const roleHint = "Ask an administrator to verify that your account has a Project Registry role, then retry.";
|
|
5
|
+
function roleError(op) {
|
|
6
|
+
return { ...createResultError(op, "current role is unavailable"), hint: roleHint };
|
|
7
|
+
}
|
|
4
8
|
export async function userRoleResolve(subject, accessToken, directory, options = {}) {
|
|
5
9
|
const op = "userRoleResolve";
|
|
6
10
|
if (typeof subject !== "string" ||
|
|
@@ -9,7 +13,7 @@ export async function userRoleResolve(subject, accessToken, directory, options =
|
|
|
9
13
|
typeof accessToken !== "string" ||
|
|
10
14
|
accessToken.length === 0 ||
|
|
11
15
|
accessToken.length > 8192) {
|
|
12
|
-
return
|
|
16
|
+
return roleError(op);
|
|
13
17
|
}
|
|
14
18
|
try {
|
|
15
19
|
const rolesR = await promiseBoundedRace(Promise.resolve().then(() => directory.userRolesList(subject, accessToken)), options);
|
|
@@ -17,15 +21,15 @@ export async function userRoleResolve(subject, accessToken, directory, options =
|
|
|
17
21
|
rolesR.data.success !== true ||
|
|
18
22
|
!Array.isArray(rolesR.data.data) ||
|
|
19
23
|
rolesR.data.data.length > 32) {
|
|
20
|
-
return
|
|
24
|
+
return roleError(op);
|
|
21
25
|
}
|
|
22
26
|
const roleR = roleResolve(rolesR.data.data);
|
|
23
27
|
if (!roleR.success)
|
|
24
|
-
return
|
|
28
|
+
return roleError(op);
|
|
25
29
|
return createResult(roleR.data);
|
|
26
30
|
}
|
|
27
31
|
catch {
|
|
28
|
-
return
|
|
32
|
+
return roleError(op);
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
//# sourceMappingURL=userRoleResolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userRoleResolve.js","sourceRoot":"","sources":["../../src/identity/userRoleResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAE7E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAGrE,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,WAAmB,EACnB,SAA4B,EAC5B,UAAwD,EAAE;IAE1D,MAAM,EAAE,GAAG,iBAAiB,CAAA;IAC5B,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,OAAO,CAAC,MAAM,GAAG,GAAG;QACpB,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,CAAC,MAAM,KAAK,CAAC;QACxB,WAAW,CAAC,MAAM,GAAG,IAAI,EACzB,CAAC;QACD,OAAO,
|
|
1
|
+
{"version":3,"file":"userRoleResolve.js","sourceRoot":"","sources":["../../src/identity/userRoleResolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAE7E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAGrE,MAAM,QAAQ,GAAG,2FAA2F,CAAA;AAE5G,SAAS,SAAS,CAAC,EAAU;IAC3B,OAAO,EAAE,GAAG,iBAAiB,CAAC,EAAE,EAAE,6BAA6B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AACpF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAe,EACf,WAAmB,EACnB,SAA4B,EAC5B,UAAwD,EAAE;IAE1D,MAAM,EAAE,GAAG,iBAAiB,CAAA;IAC5B,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,OAAO,CAAC,MAAM,GAAG,GAAG;QACpB,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,CAAC,MAAM,KAAK,CAAC;QACxB,WAAW,CAAC,MAAM,GAAG,IAAI,EACzB,CAAC;QACD,OAAO,SAAS,CAAC,EAAE,CAAC,CAAA;IACtB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CACrC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EAC3E,OAAO,CACR,CAAA;QACD,IACE,MAAM,CAAC,OAAO,KAAK,IAAI;YACvB,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI;YAC5B,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAC5B,CAAC;YACD,OAAO,SAAS,CAAC,EAAE,CAAC,CAAA;QACtB,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC,EAAE,CAAC,CAAA;QACxC,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC,EAAE,CAAC,CAAA;IACtB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibleUserDirectoryList.d.ts","sourceRoot":"","sources":["../../src/identity/visibleUserDirectoryList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;
|
|
1
|
+
{"version":3,"file":"visibleUserDirectoryList.d.ts","sourceRoot":"","sources":["../../src/identity/visibleUserDirectoryList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAM/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AA6B3F,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,+BAA+B,GACvC,aAAa,CAAC,WAAW,EAAE,CAAC,CAoE9B"}
|
|
@@ -3,12 +3,32 @@ import { visibleUserList } from "../access/visibleUserList.js";
|
|
|
3
3
|
import { promiseBoundedRace } from "../runtime/promiseBoundedRace.js";
|
|
4
4
|
import { preferredUsernameMap } from "./preferredUsernameMap.js";
|
|
5
5
|
import { userRoleResolve } from "./userRoleResolve.js";
|
|
6
|
+
const directoryRetryHint = "Retry loading the user directory. If the problem persists, contact an administrator.";
|
|
7
|
+
const directoryMappingHint = "Ask an administrator to fix the user directory mapping, then retry.";
|
|
8
|
+
const directorySizeHint = "Ask an administrator to reduce the user directory size, then retry.";
|
|
9
|
+
const directoryLimitHint = "Ask an administrator to reduce the directory lookup scope, then retry.";
|
|
10
|
+
const directoryRoleHint = "Retry loading the user directory. If the problem persists, ask an administrator to verify user roles.";
|
|
11
|
+
function directoryError(op, hint) {
|
|
12
|
+
return { ...createResultError(op, "user directory is unavailable"), hint };
|
|
13
|
+
}
|
|
14
|
+
function directoryMappingError(op) {
|
|
15
|
+
return { ...createResultError(op, "user directory contains an invalid mapping"), hint: directoryMappingHint };
|
|
16
|
+
}
|
|
17
|
+
function directorySizeError(op) {
|
|
18
|
+
return { ...createResultError(op, "user directory is too large"), hint: directorySizeHint };
|
|
19
|
+
}
|
|
20
|
+
function directoryLimitError(op) {
|
|
21
|
+
return { ...createResultError(op, "user directory lookup limit exceeded"), hint: directoryLimitHint };
|
|
22
|
+
}
|
|
23
|
+
function directoryRoleError(op) {
|
|
24
|
+
return { ...createResultError(op, "user directory role lookup is unavailable"), hint: directoryRoleHint };
|
|
25
|
+
}
|
|
6
26
|
export async function visibleUserDirectoryList(actor, options) {
|
|
7
27
|
const op = "visibleUserDirectoryList";
|
|
8
28
|
if (actor.role === "own") {
|
|
9
29
|
const actorR = visibleUserList(actor, []);
|
|
10
30
|
if (!actorR.success)
|
|
11
|
-
return
|
|
31
|
+
return directoryError(op, directoryRetryHint);
|
|
12
32
|
return createResult([]);
|
|
13
33
|
}
|
|
14
34
|
const maxUsers = options.maxUsers ?? 1_000;
|
|
@@ -22,15 +42,16 @@ export async function visibleUserDirectoryList(actor, options) {
|
|
|
22
42
|
!Number.isSafeInteger(maxLookupCount) ||
|
|
23
43
|
maxLookupCount < 1 ||
|
|
24
44
|
maxLookupCount > 20_000) {
|
|
25
|
-
return
|
|
45
|
+
return directoryError(op, directoryRetryHint);
|
|
26
46
|
}
|
|
27
47
|
try {
|
|
28
48
|
const usersR = await promiseBoundedRace(Promise.resolve().then(() => options.identityDirectory.usersList(options.accessToken)), options);
|
|
29
49
|
if (usersR.success !== true || usersR.data.success !== true || !Array.isArray(usersR.data.data)) {
|
|
30
|
-
return
|
|
50
|
+
return directoryError(op, directoryRetryHint);
|
|
51
|
+
}
|
|
52
|
+
if (usersR.data.data.length > maxUsers) {
|
|
53
|
+
return directorySizeError(op);
|
|
31
54
|
}
|
|
32
|
-
if (usersR.data.data.length > maxUsers)
|
|
33
|
-
return createResultError(op, "user directory is too large");
|
|
34
55
|
const mappedUsers = [];
|
|
35
56
|
let lookupCount = 0;
|
|
36
57
|
for (const user of usersR.data.data) {
|
|
@@ -42,29 +63,31 @@ export async function visibleUserDirectoryList(actor, options) {
|
|
|
42
63
|
typeof user.preferredUsername !== "string" ||
|
|
43
64
|
user.preferredUsername.length === 0 ||
|
|
44
65
|
user.preferredUsername.length > 256) {
|
|
45
|
-
return
|
|
66
|
+
return directoryMappingError(op);
|
|
46
67
|
}
|
|
47
68
|
lookupCount += 1;
|
|
48
|
-
if (lookupCount > maxLookupCount)
|
|
49
|
-
return
|
|
69
|
+
if (lookupCount > maxLookupCount) {
|
|
70
|
+
return directoryLimitError(op);
|
|
71
|
+
}
|
|
50
72
|
const usernameR = await preferredUsernameMap(user.preferredUsername, options.posixUsers, options);
|
|
51
73
|
if (!usernameR.success)
|
|
52
|
-
return
|
|
74
|
+
return directoryMappingError(op);
|
|
53
75
|
lookupCount += 1;
|
|
54
|
-
if (lookupCount > maxLookupCount)
|
|
55
|
-
return
|
|
76
|
+
if (lookupCount > maxLookupCount) {
|
|
77
|
+
return directoryLimitError(op);
|
|
78
|
+
}
|
|
56
79
|
const roleR = await userRoleResolve(user.subject, options.accessToken, options.identityDirectory, options);
|
|
57
80
|
if (!roleR.success)
|
|
58
|
-
return
|
|
81
|
+
return directoryRoleError(op);
|
|
59
82
|
mappedUsers.push({ subject: user.subject, username: usernameR.data, role: roleR.data });
|
|
60
83
|
}
|
|
61
84
|
const visibleR = visibleUserList(actor, mappedUsers);
|
|
62
85
|
if (!visibleR.success)
|
|
63
|
-
return
|
|
86
|
+
return directoryError(op, directoryRetryHint);
|
|
64
87
|
return createResult(visibleR.data);
|
|
65
88
|
}
|
|
66
89
|
catch {
|
|
67
|
-
return
|
|
90
|
+
return directoryError(op, directoryRetryHint);
|
|
68
91
|
}
|
|
69
92
|
}
|
|
70
93
|
//# sourceMappingURL=visibleUserDirectoryList.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibleUserDirectoryList.js","sourceRoot":"","sources":["../../src/identity/visibleUserDirectoryList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAE7E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAErE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,KAAY,EACZ,OAAwC;IAExC,MAAM,EAAE,GAAG,0BAA0B,CAAA;IACrC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACzC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"visibleUserDirectoryList.js","sourceRoot":"","sources":["../../src/identity/visibleUserDirectoryList.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCollisions.d.ts","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectCollisions.d.ts","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAmCD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,OAAO,GAAE,uBAAuB,GAAG,UAAe,GACjD,MAAM,CAAC,IAAI,CAAC,CAyCd"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectDomainNormalize } from "./projectDomainNormalize.js";
|
|
3
3
|
import { projectKey } from "./projectKey.js";
|
|
4
4
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
@@ -41,7 +41,7 @@ export function projectCollisions(projects, options = {}) {
|
|
|
41
41
|
for (const project of projectCollisionCandidates(projects, options)) {
|
|
42
42
|
const previousKey = keys.find((candidate) => projectKeyEqual(candidate, project));
|
|
43
43
|
if (previousKey && previousKey !== project) {
|
|
44
|
-
return
|
|
44
|
+
return createResultErrorCode(op, `project key collision: ${projectKey(project)}`, "projects.conflict");
|
|
45
45
|
}
|
|
46
46
|
keys.push(project);
|
|
47
47
|
if (!projectActive(project))
|
|
@@ -52,13 +52,13 @@ export function projectCollisions(projects, options = {}) {
|
|
|
52
52
|
for (const domain of new Set(caddy.domains.map(projectDomainNormalize))) {
|
|
53
53
|
const previous = domains.get(domain);
|
|
54
54
|
if (previous && !projectKeyEqual(previous, project)) {
|
|
55
|
-
return
|
|
55
|
+
return createResultErrorCode(op, `active domain collision: ${domain} used by ${projectKey(previous)} and ${projectKey(project)}`, "projects.conflict");
|
|
56
56
|
}
|
|
57
57
|
domains.set(domain, project);
|
|
58
58
|
}
|
|
59
59
|
const previous = ports.get(caddy.port);
|
|
60
60
|
if (previous && !projectKeyEqual(previous, project)) {
|
|
61
|
-
return
|
|
61
|
+
return createResultErrorCode(op, `active port collision: ${caddy.port} used by ${projectKey(previous)} and ${projectKey(project)}`, "projects.conflict");
|
|
62
62
|
}
|
|
63
63
|
ports.set(caddy.port, project);
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCollisions.js","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectCollisions.js","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCreate.d.ts","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectCreate.d.ts","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAavE,wBAAsB,aAAa,CACjC,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAyB1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
3
3
|
import { projectNormalize } from "./projectNormalize.js";
|
|
4
4
|
import { projectOwnerAuthorize } from "./projectOwnerAuthorize.js";
|
|
@@ -18,7 +18,7 @@ export async function projectCreate(options, input, mutationOptions) {
|
|
|
18
18
|
return actorR;
|
|
19
19
|
const owner = projectInputOwner(input);
|
|
20
20
|
if (owner === undefined)
|
|
21
|
-
return
|
|
21
|
+
return createResultErrorCode(op, "project owner is required", "request.invalid");
|
|
22
22
|
const authorizationR = await projectOwnerAuthorize(options.access, actorR.data, owner);
|
|
23
23
|
if (!authorizationR.success)
|
|
24
24
|
return authorizationR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCreate.js","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectCreate.js","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,SAAS,CAAA;AAInE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IACjF,MAAM,KAAK,GAAI,KAAiC,CAAC,KAAK,CAAA;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IAC/C,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IACpC,OAAO,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAA;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA8B,EAC9B,KAAc,EACd,eAAuC;IAEvC,MAAM,EAAE,GAAG,eAAe,CAAA;IAC1B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;IAClD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACtC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,2BAA2B,EAAE,iBAAiB,CAAC,CAAA;IAEzG,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtF,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO,cAAc,CAAA;IAElD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IACjD,IAAI,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAExC,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACvG,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAAE,OAAO,iBAAiB,CAAA;IAExD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE;QACvC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAA;IAEtC,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAA;IACnG,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AACpE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectDelete.d.ts","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectDelete.d.ts","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAKjD,wBAAsB,aAAa,CACjC,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,UAAU,EACf,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAkB1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
4
4
|
import { projectOwnerAuthorize } from "./projectOwnerAuthorize.js";
|
|
@@ -13,7 +13,7 @@ export async function projectDelete(options, key, mutationOptions) {
|
|
|
13
13
|
if (!snapshotR.success)
|
|
14
14
|
return snapshotR;
|
|
15
15
|
if (!snapshotR.data.projects.some((project) => projectKeyEqual(project, key))) {
|
|
16
|
-
return
|
|
16
|
+
return createResultErrorCode("projectDelete", "project not found", "projects.not-found");
|
|
17
17
|
}
|
|
18
18
|
const expectedRevisionR = projectMutationExpectedRevision(mutationOptions, snapshotR.data.revision, "projectDelete");
|
|
19
19
|
if (!expectedRevisionR.success)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectDelete.js","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectDelete.js","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,SAAS,CAAA;AAKnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA8B,EAC9B,GAAe,EACf,eAAuC;IAEvC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;IAClD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;IAC1F,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO,cAAc,CAAA;IAElD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IACjD,IAAI,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,qBAAqB,CAAC,eAAe,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IAC1F,CAAC;IAED,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IACpH,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAAE,OAAO,iBAAiB,CAAA;IAExD,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAA;IACnG,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;AAC1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectEdit.d.ts","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectEdit.d.ts","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAE9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAoDjD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAgC1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
4
4
|
import { projectNormalize } from "./projectNormalize.js";
|
|
@@ -58,14 +58,14 @@ export async function projectEdit(options, key, input, mutationOptions) {
|
|
|
58
58
|
if (!authorizationR.success)
|
|
59
59
|
return authorizationR;
|
|
60
60
|
if (projectInputIdentityMatches(input, key) === false) {
|
|
61
|
-
return
|
|
61
|
+
return createResultErrorCode(op, "project owner and name are immutable", "request.invalid");
|
|
62
62
|
}
|
|
63
63
|
const snapshotR = await options.repository.read();
|
|
64
64
|
if (!snapshotR.success)
|
|
65
65
|
return snapshotR;
|
|
66
66
|
const existing = snapshotR.data.projects.find((project) => projectKeyEqual(project, key));
|
|
67
67
|
if (!existing)
|
|
68
|
-
return
|
|
68
|
+
return createResultErrorCode(op, "project not found", "projects.not-found");
|
|
69
69
|
const projectR = projectNormalize(projectEditInputMerge(existing, input), {
|
|
70
70
|
projects: snapshotR.data.projects,
|
|
71
71
|
portRange: options.portRange,
|
|
@@ -75,7 +75,7 @@ export async function projectEdit(options, key, input, mutationOptions) {
|
|
|
75
75
|
if (!projectR.success)
|
|
76
76
|
return projectR;
|
|
77
77
|
if (!projectKeyEqual(projectR.data, key))
|
|
78
|
-
return
|
|
78
|
+
return createResultErrorCode(op, "project owner and name are immutable", "request.invalid");
|
|
79
79
|
const expectedRevisionR = projectMutationExpectedRevision(mutationOptions, snapshotR.data.revision, op);
|
|
80
80
|
if (!expectedRevisionR.success)
|
|
81
81
|
return expectedRevisionR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectEdit.js","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectEdit.js","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectGet.d.ts","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectGet.d.ts","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAIjD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAOzF"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKey } from "./projectKey.js";
|
|
3
3
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
4
4
|
export function projectGet(projects, key) {
|
|
5
5
|
const op = "projectGet";
|
|
6
6
|
const project = projects.find((item) => projectKeyEqual(item, key));
|
|
7
7
|
if (!project) {
|
|
8
|
-
return
|
|
8
|
+
return { ...createResultErrorCode(op, "project not found", "projects.not-found"), errorData: projectKey(key) };
|
|
9
9
|
}
|
|
10
10
|
return createResult(project);
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectGet.js","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectGet.js","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAG1E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,UAAU,UAAU,CAAC,QAA4B,EAAE,GAAe;IACtE,MAAM,EAAE,GAAG,YAAY,CAAA;IACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,GAAG,qBAAqB,CAAC,EAAE,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAA;IAChH,CAAC;IACD,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMutationExpectedRevision.d.ts","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectMutationExpectedRevision.d.ts","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAG9F,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,OAAO,EACxB,EAAE,EAAE,MAAM,GACT,MAAM,CAAC,yBAAyB,CAAC,CAoBnC"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectRevisionValidate } from "./projectRevisionValidate.js";
|
|
3
3
|
export function projectMutationExpectedRevision(input, currentRevision, op) {
|
|
4
4
|
const currentRevisionR = projectRevisionValidate(currentRevision, op);
|
|
5
5
|
if (!currentRevisionR.success) {
|
|
6
|
-
return
|
|
6
|
+
return createResultErrorCode(op, `current revision is invalid: ${currentRevisionR.errorMessage}`, "request.invalid");
|
|
7
7
|
}
|
|
8
8
|
if (!input || typeof input !== "object" || Array.isArray(input)) {
|
|
9
|
-
return
|
|
9
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
10
10
|
}
|
|
11
11
|
const expectedRevision = input.expectedRevision;
|
|
12
12
|
const expectedRevisionR = projectRevisionValidate(expectedRevision, op);
|
|
13
13
|
if (!expectedRevisionR.success) {
|
|
14
|
-
return
|
|
14
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
15
15
|
}
|
|
16
16
|
if (expectedRevisionR.data === "" && currentRevisionR.data !== "") {
|
|
17
|
-
return
|
|
17
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
18
18
|
}
|
|
19
19
|
return createResult(expectedRevisionR.data);
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMutationExpectedRevision.js","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectMutationExpectedRevision.js","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAE1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,MAAM,UAAU,+BAA+B,CAC7C,KAAc,EACd,eAAwB,EACxB,EAAU;IAEV,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;IACrE,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,OAAO,qBAAqB,CAAC,EAAE,EAAE,gCAAgC,gBAAgB,CAAC,YAAY,EAAE,EAAE,iBAAiB,CAAC,CAAA;IACtH,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IAED,MAAM,gBAAgB,GAAI,KAAiC,CAAC,gBAAgB,CAAA;IAC5E,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAA;IACvE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IACD,IAAI,iBAAiB,CAAC,IAAI,KAAK,EAAE,IAAI,gBAAgB,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;QAClE,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IAED,OAAO,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectNormalize.d.ts","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectNormalize.d.ts","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAG1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAmB,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAGjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;IAC7B,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAqJD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAE,uBAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,CAgBvG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as a from "valibot";
|
|
2
|
-
import { createResult,
|
|
2
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
3
3
|
import { projectDomainNormalize } from "./projectDomainNormalize.js";
|
|
4
4
|
import { projectInputSchema } from "./projectInputSchema.js";
|
|
5
5
|
import { projectPortNext } from "./projectPortNext.js";
|
|
@@ -157,7 +157,7 @@ export function projectNormalize(input, options = {}) {
|
|
|
157
157
|
const op = "projectNormalize";
|
|
158
158
|
const parsed = a.safeParse(projectInputSchema, projectInputNormalize(input));
|
|
159
159
|
if (!parsed.success)
|
|
160
|
-
return
|
|
160
|
+
return createResultErrorCode(op, a.summarize(parsed.issues), "request.invalid");
|
|
161
161
|
let normalized = parsed.output;
|
|
162
162
|
if (normalized.caddy && normalized.caddy.port === undefined) {
|
|
163
163
|
const excludeKey = options.excludeProject ?? options.excludeKey;
|
|
@@ -168,7 +168,7 @@ export function projectNormalize(input, options = {}) {
|
|
|
168
168
|
}
|
|
169
169
|
const projectResult = projectValidate(normalized, options);
|
|
170
170
|
if (!projectResult.success)
|
|
171
|
-
return
|
|
171
|
+
return { ...projectResult, op };
|
|
172
172
|
return createResult(projectResult.data);
|
|
173
173
|
}
|
|
174
174
|
//# sourceMappingURL=projectNormalize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectNormalize.js","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectNormalize.js","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectPortNext.d.ts","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectPortNext.d.ts","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAWD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,KAAK,GAAE,gBAAmC,EAC1C,UAAU,CAAC,EAAE,UAAU,GACtB,MAAM,CAAC,MAAM,CAAC,CAiBhB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
const defaultPortRange = { from: 3000, to: 3999 };
|
|
4
4
|
function projectPortRangeValidate(range) {
|
|
@@ -14,7 +14,7 @@ export function projectPortNext(projects, range = defaultPortRange, excludeKey)
|
|
|
14
14
|
const op = "projectPortNext";
|
|
15
15
|
const rangeError = projectPortRangeValidate(range);
|
|
16
16
|
if (rangeError)
|
|
17
|
-
return
|
|
17
|
+
return createResultErrorCode(op, rangeError, "request.invalid");
|
|
18
18
|
const used = new Set();
|
|
19
19
|
for (const project of projects) {
|
|
20
20
|
if (excludeKey && projectKeyEqual(project, excludeKey))
|
|
@@ -27,6 +27,6 @@ export function projectPortNext(projects, range = defaultPortRange, excludeKey)
|
|
|
27
27
|
if (!used.has(port))
|
|
28
28
|
return createResult(port);
|
|
29
29
|
}
|
|
30
|
-
return
|
|
30
|
+
return createResultErrorCode(op, `no free port in range ${range.from}-${range.to}`, "request.invalid");
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=projectPortNext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectPortNext.js","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectPortNext.js","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAQtD,MAAM,gBAAgB,GAAqB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AAEnE,SAAS,wBAAwB,CAAC,KAAuB;IACvD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAAE,OAAO,oCAAoC,CAAA;IAC7G,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,GAAG,KAAK;QAAE,OAAO,+CAA+C,CAAA;IAC9F,IAAI,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE;QAAE,OAAO,0CAA0C,CAAA;IAC5E,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,QAA4B,EAC5B,QAA0B,gBAAgB,EAC1C,UAAuB;IAEvB,MAAM,EAAE,GAAG,iBAAiB,CAAA;IAC5B,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAA;IAClD,IAAI,UAAU;QAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAA;IAE/E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,UAAU,IAAI,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC;YAAE,SAAQ;QAChE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ;YAAE,SAAQ;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,YAAY,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,qBAAqB,CAAC,EAAE,EAAE,yBAAyB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;AACxG,CAAC"}
|