@cloud-cli/on 1.66.2 → 1.68.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/{oidc-user-repository-CiprwzOj.js → oidc-user-repository-C4HnJLyx.js} +19 -0
- package/dist/oidc-user-repository-pPSfFkOo.js +2 -0
- package/dist/oidc-user-repository.d.ts +7 -2
- package/dist/oidc-user-repository.d.ts.map +1 -1
- package/dist/oidc.d.ts +2 -1
- package/dist/oidc.d.ts.map +1 -1
- package/dist/on.js +3 -3
- package/dist/{server-CQ3FDHUe.js → server-B7i5UZY1.js} +195 -48
- package/dist/server.d.ts +3 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/user-preferences.d.ts +6 -0
- package/dist/user-preferences.d.ts.map +1 -0
- package/dist/{worker-BwNyfSpp.js → worker-FXzBXCLz.js} +2 -0
- package/package.json +3 -1
- package/dist/oidc-user-repository-BNQF3qnb.js +0 -2
|
@@ -15,6 +15,25 @@ var t = class {
|
|
|
15
15
|
async role(t) {
|
|
16
16
|
return (await e.get("SELECT role FROM oidc_users WHERE subject = ?", [t]))?.role === "admin" ? "admin" : "user";
|
|
17
17
|
}
|
|
18
|
+
async list() {
|
|
19
|
+
return (await e.all("SELECT subject, name, email, role FROM oidc_users ORDER BY name, email, subject")).map((e) => ({
|
|
20
|
+
id: e.subject,
|
|
21
|
+
name: e.name || void 0,
|
|
22
|
+
email: e.email || void 0,
|
|
23
|
+
role: e.role === "admin" ? "admin" : "user"
|
|
24
|
+
}));
|
|
25
|
+
}
|
|
26
|
+
async setRole(t, n) {
|
|
27
|
+
let r = await e.get("SELECT role FROM oidc_users WHERE subject = ?", [t]);
|
|
28
|
+
if (!r) return "not-found";
|
|
29
|
+
if (r.role === n) return "updated";
|
|
30
|
+
let i = await e.run("UPDATE oidc_users SET role = ?, updated_at = CURRENT_TIMESTAMP\n WHERE subject = ? AND (? = 'admin' OR role != 'admin' OR\n (SELECT COUNT(*) FROM oidc_users WHERE role = 'admin') > 1)", [
|
|
31
|
+
n,
|
|
32
|
+
t,
|
|
33
|
+
n
|
|
34
|
+
]);
|
|
35
|
+
return Number(i?.changes || 0) > 0 ? "updated" : await e.get("SELECT subject FROM oidc_users WHERE subject = ?", [t]) ? "last-admin" : "not-found";
|
|
36
|
+
}
|
|
18
37
|
async promote(t) {
|
|
19
38
|
let n = await e.run("UPDATE oidc_users SET role = 'admin', updated_at = CURRENT_TIMESTAMP WHERE subject = ?", [t]);
|
|
20
39
|
return Number(n?.changes || 0) > 0;
|
|
@@ -1,9 +1,14 @@
|
|
|
1
|
-
import type { OidcUser } from
|
|
2
|
-
export type OidcRole =
|
|
1
|
+
import type { OidcUser } from "./oidc.js";
|
|
2
|
+
export type OidcRole = "user" | "admin";
|
|
3
|
+
export type OidcUserRecord = Pick<OidcUser, "id" | "name" | "email"> & {
|
|
4
|
+
role: OidcRole;
|
|
5
|
+
};
|
|
3
6
|
export declare class OidcUserRepository {
|
|
4
7
|
init(): Promise<void>;
|
|
5
8
|
upsert(user: OidcUser): Promise<void>;
|
|
6
9
|
role(subject: string): Promise<OidcRole>;
|
|
10
|
+
list(): Promise<OidcUserRecord[]>;
|
|
11
|
+
setRole(subject: string, role: OidcRole): Promise<"updated" | "not-found" | "last-admin">;
|
|
7
12
|
promote(subject: string): Promise<boolean>;
|
|
8
13
|
}
|
|
9
14
|
//# sourceMappingURL=oidc-user-repository.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-user-repository.d.ts","sourceRoot":"","sources":["../src/oidc-user-repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc-user-repository.d.ts","sourceRoot":"","sources":["../src/oidc-user-repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AACxC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE1F,qBAAa,kBAAkB;IACvB,IAAI;IASJ,MAAM,CAAC,IAAI,EAAE,QAAQ;IAQrB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKxC,IAAI,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAUjC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,WAAW,GAAG,YAAY,CAAC;IAmBzF,OAAO,CAAC,OAAO,EAAE,MAAM;CAO9B"}
|
package/dist/oidc.d.ts
CHANGED
|
@@ -23,7 +23,8 @@ export declare class OidcClient {
|
|
|
23
23
|
cookie: string;
|
|
24
24
|
}>;
|
|
25
25
|
userFromCookie(cookieHeader: string | undefined): OidcUser | undefined;
|
|
26
|
-
setRole(cookieHeader: string, role:
|
|
26
|
+
setRole(cookieHeader: string, role: "user" | "admin"): void;
|
|
27
|
+
setRoleForUser(subject: string, role: "user" | "admin"): void;
|
|
27
28
|
roleFromCookie(cookieHeader: string | undefined): "user" | "admin" | undefined;
|
|
28
29
|
accessTokenFromCookie(cookieHeader: string | undefined): {
|
|
29
30
|
accessToken: string;
|
package/dist/oidc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../src/oidc.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAoBD,qBAAa,UAAU;IACrB,OAAO,CAAC,qBAAqB,CAAC,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;gBAE3C,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IAEpC,IAAI,OAAO,YAEV;IAED,IAAI,QAAQ,WAEX;IAEK,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA+BpH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS;IAKtE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAMpD,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;IAI/C,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;;;;IAMhD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../src/oidc.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAoBD,qBAAa,UAAU;IACrB,OAAO,CAAC,qBAAqB,CAAC,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;gBAE3C,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IAEpC,IAAI,OAAO,YAEV;IAED,IAAI,QAAQ,WAEX;IAEK,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA+BpH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS;IAKtE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAMpD,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAMtD,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;IAI/C,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;;;;IAMhD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAgBvD,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,EAAE,WAAW,CAAC,EAAE,MAAM;IAUlH,WAAW,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;IAM5C,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,WAAW;YAOL,cAAc;IAkB5B,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;CAYnB"}
|
package/dist/on.js
CHANGED
|
@@ -104,11 +104,11 @@ async function m() {
|
|
|
104
104
|
let [{ QueueManager: r }, { SecretStore: i }, { WebhookServer: a }, { startWorkers: o }, { WorkflowRepository: s }, { WorkflowScheduler: c }, { OidcUserRepository: l }] = await Promise.all([
|
|
105
105
|
import("./queue-DhXXzxm3.js"),
|
|
106
106
|
import("./secrets-DhkqmawU.js"),
|
|
107
|
-
import("./server-
|
|
108
|
-
import("./worker-
|
|
107
|
+
import("./server-B7i5UZY1.js"),
|
|
108
|
+
import("./worker-FXzBXCLz.js"),
|
|
109
109
|
import("./workflows-DQQIVH7c.js"),
|
|
110
110
|
import("./scheduler-2d1UPcxM.js"),
|
|
111
|
-
import("./oidc-user-repository-
|
|
111
|
+
import("./oidc-user-repository-pPSfFkOo.js")
|
|
112
112
|
]);
|
|
113
113
|
if (t === "promote-admin") {
|
|
114
114
|
if (!n) throw Error("Usage: on promote-admin --subject <oidc-subject>");
|