@dosgato/api 1.1.11 → 1.2.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/globalrule/globalrule.service.js +7 -1
- package/dist/globalrule/globalrule.service.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/migrations.js +42 -0
- package/dist/migrations.js.map +1 -1
- package/dist/role/role.database.d.ts +1 -1
- package/dist/role/role.database.js +3 -1
- package/dist/role/role.database.js.map +1 -1
- package/dist/user/user.database.d.ts +9 -3
- package/dist/user/user.database.js +81 -21
- package/dist/user/user.database.js.map +1 -1
- package/dist/user/user.model.d.ts +10 -3
- package/dist/user/user.model.js +33 -11
- package/dist/user/user.model.js.map +1 -1
- package/dist/user/user.resolver.d.ts +5 -2
- package/dist/user/user.resolver.js +37 -4
- package/dist/user/user.resolver.js.map +1 -1
- package/dist/user/user.service.d.ts +4 -2
- package/dist/user/user.service.js +17 -5
- package/dist/user/user.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -88,7 +88,13 @@ export class GlobalRuleService extends DosGatoService {
|
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
async tooPowerful(rule) {
|
|
91
|
-
const grants = await this.currentGlobalGrants()
|
|
91
|
+
const grants = await this.currentGlobalGrants() ?? {
|
|
92
|
+
manageAccess: false,
|
|
93
|
+
manageGlobalData: false,
|
|
94
|
+
manageParentRoles: false,
|
|
95
|
+
manageTemplates: false,
|
|
96
|
+
createSites: false
|
|
97
|
+
};
|
|
92
98
|
return (rule.grants.createSites && !grants.createSites) ||
|
|
93
99
|
(rule.grants.manageAccess && !grants.manageAccess) ||
|
|
94
100
|
(rule.grants.manageGlobalData && !grants.manageGlobalData) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EACL,cAAc,EAAE,UAAU,EAAE,cAAc,EAAqB,WAAW,EAC9C,gBAAgB,EAAE,kBAAkB,EAChE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EACxD,MAAM,gBAAgB,CAAA;AAEvB,MAAM,qBAAqB,GAAG,IAAI,gBAAgB,CAAC;IACjD,KAAK,EAAE,KAAK,EAAE,GAAa,EAAE,EAAE;QAC7B,OAAO,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IACtC,CAAC;CACF,CAAC,CAAA;AACF,MAAM,uBAAuB,GAAG,IAAI,eAAe,CAAC;IAClD,KAAK,EAAE,KAAK,EAAE,OAAiB,EAAE,EAAE;QACjC,OAAO,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAC1C,CAAC;IACD,UAAU,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;CACxC,CAAC,CAAA;AAEF,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACxD,KAAK,CAAC,QAAQ,CAAE,MAAc;QAC5B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAc;QAChC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrE,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,cAA0B;IAAjE;;QACE,QAAG,GAAG,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -59,7 +59,7 @@ export class DGServer {
|
|
|
59
59
|
if (!user) {
|
|
60
60
|
const details = (opts.userLookup ? (await opts.userLookup([userId]))[userId] : undefined) ?? { firstname: 'Training', lastname: 'User', email: '', enabled: true };
|
|
61
61
|
if (details.enabled !== false) {
|
|
62
|
-
const internalId = await createUser(userId, details.firstname, details.lastname, details.email,
|
|
62
|
+
const internalId = await createUser(userId, details.firstname, details.lastname, details.email, [], false);
|
|
63
63
|
user = await ctx.svc(UserServiceInternal).findByInternalId(internalId);
|
|
64
64
|
}
|
|
65
65
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/migrations.js
CHANGED
|
@@ -41,6 +41,46 @@ const dgMigrations = [
|
|
|
41
41
|
await db.execute('ALTER TABLE datarules ADD COLUMN isGlobal TINYINT UNSIGNED NOT NULL DEFAULT 0');
|
|
42
42
|
await db.execute('CREATE INDEX `mime_idx` ON `binaries`(`mime`)');
|
|
43
43
|
}
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
id: 20231130103000,
|
|
47
|
+
description: 'add trainings table and users_trainings table',
|
|
48
|
+
run: async (db) => {
|
|
49
|
+
await db.execute(`
|
|
50
|
+
CREATE TABLE IF NOT EXISTS trainings (
|
|
51
|
+
id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
|
52
|
+
name VARCHAR(50) NOT NULL,
|
|
53
|
+
PRIMARY KEY (id),
|
|
54
|
+
UNIQUE name_idx (name)
|
|
55
|
+
)
|
|
56
|
+
ENGINE = InnoDB
|
|
57
|
+
DEFAULT CHARACTER SET = utf8mb4
|
|
58
|
+
DEFAULT COLLATE = utf8mb4_general_ci
|
|
59
|
+
`);
|
|
60
|
+
await db.execute(`
|
|
61
|
+
CREATE TABLE IF NOT EXISTS users_trainings (
|
|
62
|
+
userId MEDIUMINT UNSIGNED NOT NULL,
|
|
63
|
+
trainingId SMALLINT UNSIGNED NOT NULL,
|
|
64
|
+
recordedAt DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
65
|
+
PRIMARY KEY (userId, trainingId),
|
|
66
|
+
INDEX trainingId_idx (trainingId),
|
|
67
|
+
CONSTRAINT FK_users_trainings_user FOREIGN KEY (userId) REFERENCES users (\`id\`),
|
|
68
|
+
CONSTRAINT FK_users_trainings_training FOREIGN KEY (trainingId) REFERENCES trainings (\`id\`)
|
|
69
|
+
)
|
|
70
|
+
ENGINE = InnoDB
|
|
71
|
+
DEFAULT CHARACTER SET = utf8mb4
|
|
72
|
+
DEFAULT COLLATE = utf8mb4_general_ci
|
|
73
|
+
`);
|
|
74
|
+
const basicId = await db.insert('INSERT INTO trainings (name) VALUES (?)', ['basic']);
|
|
75
|
+
await db.insert('INSERT INTO users_trainings (userId, trainingId) SELECT u.id, ' + basicId + ' FROM users u WHERE u.trained = 1');
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
id: 20231130110000,
|
|
80
|
+
description: 'remove user has been trained boolean from users table',
|
|
81
|
+
run: async (db) => {
|
|
82
|
+
await db.execute('ALTER TABLE users DROP COLUMN trained');
|
|
83
|
+
}
|
|
44
84
|
}
|
|
45
85
|
];
|
|
46
86
|
export async function migrations(moreMigrations) {
|
|
@@ -89,6 +129,8 @@ export async function resetdb() {
|
|
|
89
129
|
db.execute('DROP TABLE IF EXISTS users_roles'),
|
|
90
130
|
db.execute('DROP TABLE IF EXISTS groups_roles'),
|
|
91
131
|
db.execute('DROP TABLE IF EXISTS users_groups'),
|
|
132
|
+
db.execute('DROP TABLE IF EXISTS users_trainings'),
|
|
133
|
+
db.execute('DROP TABLE IF EXISTS trainings'),
|
|
92
134
|
db.execute('DROP TABLE IF EXISTS siterules'),
|
|
93
135
|
db.execute('DROP TABLE IF EXISTS groups_groups'),
|
|
94
136
|
db.execute('DROP TABLE IF EXISTS assets'),
|
package/dist/migrations.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAoB,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAElE,MAAM,YAAY,GAAkB;IAClC;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,uBAAuB;QACpC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAChB,MAAM,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC/B,MAAM,IAAI,CAAC,EAAE,CAAC,CAAA;YACd,MAAM,MAAM,CAAC,EAAE,CAAC,CAAA;QAClB,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,0CAA0C;QACvD,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAA;YACrE,MAAM,EAAE,CAAC,OAAO,CAAC,kDAAkD,CAAC,CAAA;QACtE,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,wBAAwB;QACrC,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,yDAAyD,CAAC,CAAA;QAC7E,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,qCAAqC;QAClD,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,iEAAiE,CAAC,CAAA;QACrF,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,yDAAyD;QACtE,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,+EAA+E,CAAC,CAAA;YACjG,MAAM,EAAE,CAAC,OAAO,CAAC,+CAA+C,CAAC,CAAA;QACnE,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,+CAA+C;QAC5D,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;OAUhB,CAAC,CAAA;YACF,MAAM,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;;;OAahB,CAAC,CAAA;YACF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,yCAAyC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;YACrF,MAAM,EAAE,CAAC,MAAM,CAAC,gEAAgE,GAAG,OAAO,GAAG,mCAAmC,CAAC,CAAA;QACnI,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,uDAAuD;QACpE,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAA;QAC3D,CAAC;KACF;CACF,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAE,cAA8B;IAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;IACf,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACjC,MAAM,EAAE,CAAC,OAAO,CAAC;;;;;KAKhB,CAAC,CAAA;KACH;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAS,0BAA0B,CAAC,CAAC,CAAA;IAC7E,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;IAC7E,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE;QACrC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,SAAQ;QACvC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;gBAC3E,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACvB,MAAM,EAAE,CAAC,MAAM,CAAC,uCAAuC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxE,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC,EAAE,CAAC,CAAA;aACvD;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAClC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;QAC9B,MAAM,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QAC9C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC;YACvC,EAAE,CAAC,OAAO,CAAC,0CAA0C,CAAC;YACtD,EAAE,CAAC,OAAO,CAAC,iCAAiC,CAAC;YAC7C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC;YAClD,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;YAC1C,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC;YACnD,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC;YAClD,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC;YACzC,EAAE,CAAC,OAAO,CAAC,qCAAqC,CAAC;YACjD,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC;YACzC,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;YAC1C,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC;YACvC,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,iCAAiC,CAAC;YAC7C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;SAC3C,CAAC,CAAA;QACF,MAAM,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAAiB,EAAE;IAC/C,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAA;IACvF,MAAM,CAAC,EAAC,EAAC,EAAC,EAAC,EAAC,EAAC,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,wJAAwJ,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvM,GAAG,CAAC,MAAM,CAAC,0GAA0G,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtJ,GAAG,CAAC,MAAM,CAAC,0GAA0G,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtJ,GAAG,CAAC,MAAM,CAAC,qIAAqI,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvL,GAAG,CAAC,MAAM,CAAC,qIAAqI,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvL,GAAG,CAAC,MAAM,CAAC,0DAA0D,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC1F,GAAG,CAAC,MAAM,CAAC,mKAAmK,CAAC;KAChL,CAAC,CAAA;IACF,MAAM,GAAG,CAAC,MAAM,CAAC,wDAAwD,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;AACrG,CAAC"}
|
|
@@ -16,7 +16,7 @@ export declare function roleNameIsUnique(name: string): Promise<boolean>;
|
|
|
16
16
|
export declare function createRole(name: string): Promise<number>;
|
|
17
17
|
export declare function updateRole(id: string, name: string): Promise<number>;
|
|
18
18
|
export declare function deleteRole(id: string): Promise<void>;
|
|
19
|
-
export declare function addRolesToUser(roleIds: string[], userId: number): Promise<number>;
|
|
19
|
+
export declare function addRolesToUser(roleIds: string[], userId: number): Promise<number | undefined>;
|
|
20
20
|
export declare function assignRoleToUsers(roleId: string, userIds: number[]): Promise<number | undefined>;
|
|
21
21
|
export declare function removeRoleFromUser(roleId: string, userId: number): Promise<number>;
|
|
22
22
|
export declare function addRoleToGroups(groupIds: string[], roleId: string): Promise<number | undefined>;
|
|
@@ -98,7 +98,9 @@ export async function deleteRole(id) {
|
|
|
98
98
|
}
|
|
99
99
|
export async function addRolesToUser(roleIds, userId) {
|
|
100
100
|
const binds = [];
|
|
101
|
-
|
|
101
|
+
if (roleIds.length) {
|
|
102
|
+
return await db.insert(`INSERT INTO users_roles (userId, roleId) VALUES ${db.in(binds, roleIds.map(id => [userId, id]))} ON DUPLICATE KEY UPDATE userId=userId`, binds);
|
|
103
|
+
}
|
|
102
104
|
}
|
|
103
105
|
export async function assignRoleToUsers(roleId, userIds) {
|
|
104
106
|
const binds = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.database.js","sourceRoot":"","sources":["../../src/role/role.database.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"role.database.js","sourceRoot":"","sources":["../../src/role/role.database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { User, type UserFilter } from '../internal.js';
|
|
1
|
+
import { Training, User, type UserFilter } from '../internal.js';
|
|
2
2
|
export declare function getUsers(filter: UserFilter): Promise<User[]>;
|
|
3
3
|
export declare function getUsersByInternalId(ids: number[]): Promise<User[]>;
|
|
4
4
|
export declare function getUsersInGroup(groupIds: string[], filter?: UserFilter): Promise<{
|
|
@@ -17,7 +17,13 @@ export declare function getUsersManagingGroups(groupIds: string[], direct?: bool
|
|
|
17
17
|
key: string;
|
|
18
18
|
value: User;
|
|
19
19
|
}[]>;
|
|
20
|
-
export declare function
|
|
21
|
-
|
|
20
|
+
export declare function getTrainingsForUsers(userInternalIds: number[]): Promise<{
|
|
21
|
+
key: any;
|
|
22
|
+
value: Training;
|
|
23
|
+
}[]>;
|
|
24
|
+
export declare function getAllTrainings(): Promise<Training[]>;
|
|
25
|
+
export declare function addTrainings(trainingId: string, userIds: string[]): Promise<void>;
|
|
26
|
+
export declare function createUser(id: string, firstname: string, lastname: string, email: string, trainings: string[] | undefined, system: boolean): Promise<number>;
|
|
27
|
+
export declare function updateUser(id: string, firstname: string | undefined, lastname: string | undefined, email: string | undefined, trainings: string[] | undefined): Promise<void>;
|
|
22
28
|
export declare function disableUsers(users: User[]): Promise<number>;
|
|
23
29
|
export declare function enableUsers(users: User[]): Promise<number>;
|
|
@@ -1,10 +1,43 @@
|
|
|
1
1
|
import db from 'mysql2-async/db';
|
|
2
|
-
import { isNotNull, unique } from 'txstate-utils';
|
|
3
|
-
import { User } from '../internal.js';
|
|
4
|
-
function processFilters(filter) {
|
|
2
|
+
import { intersect, isNotNull, unique } from 'txstate-utils';
|
|
3
|
+
import { Training, User } from '../internal.js';
|
|
4
|
+
async function processFilters(filter) {
|
|
5
5
|
const binds = [];
|
|
6
6
|
const where = [];
|
|
7
7
|
if (typeof filter !== 'undefined') {
|
|
8
|
+
let trainingAllPromise;
|
|
9
|
+
let trainingAnyPromise;
|
|
10
|
+
let trainingNonePromise;
|
|
11
|
+
if (filter.trainingAll?.length) {
|
|
12
|
+
const tbinds = [];
|
|
13
|
+
trainingAllPromise = db.getvals(`SELECT userId FROM users_trainings WHERE trainingId IN (${db.in(tbinds, filter.trainingAll)}) GROUP BY userId HAVING COUNT(*) = ?`, [...tbinds, filter.trainingAll.length]);
|
|
14
|
+
}
|
|
15
|
+
if (filter.trainingAny?.length) {
|
|
16
|
+
const tbinds = [];
|
|
17
|
+
trainingAnyPromise = db.getvals(`SELECT userId FROM users_trainings WHERE trainingId IN (${db.in(tbinds, filter.trainingAny)})`, tbinds);
|
|
18
|
+
}
|
|
19
|
+
if (filter.trainingNone?.length) {
|
|
20
|
+
const tbinds = [];
|
|
21
|
+
trainingNonePromise = db.getvals(`SELECT u.id FROM users u LEFT JOIN users_trainings ut ON u.id=ut.userId AND ut.trainingId IN (${db.in(tbinds, filter.trainingNone)}) WHERE ut.userId IS NULL`, tbinds);
|
|
22
|
+
}
|
|
23
|
+
if (trainingAllPromise) {
|
|
24
|
+
const ids = await trainingAllPromise;
|
|
25
|
+
if (!ids.length)
|
|
26
|
+
filter.noresults = true;
|
|
27
|
+
filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
|
|
28
|
+
}
|
|
29
|
+
if (trainingAnyPromise) {
|
|
30
|
+
const ids = await trainingAnyPromise;
|
|
31
|
+
if (!ids.length)
|
|
32
|
+
filter.noresults = true;
|
|
33
|
+
filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
|
|
34
|
+
}
|
|
35
|
+
if (trainingNonePromise) {
|
|
36
|
+
const ids = await trainingNonePromise;
|
|
37
|
+
if (!ids.length)
|
|
38
|
+
filter.noresults = true;
|
|
39
|
+
filter.internalIds = intersect({ skipEmpty: true }, filter.internalIds, ids);
|
|
40
|
+
}
|
|
8
41
|
if (filter.internalIds?.length) {
|
|
9
42
|
where.push(`users.id IN (${db.in(binds, filter.internalIds)})`);
|
|
10
43
|
}
|
|
@@ -23,14 +56,6 @@ function processFilters(filter) {
|
|
|
23
56
|
where.push('users.disabledAt > ?');
|
|
24
57
|
binds.push(filter.hideDisabledBefore.toISO());
|
|
25
58
|
}
|
|
26
|
-
if (isNotNull(filter.trained)) {
|
|
27
|
-
if (filter.trained) {
|
|
28
|
-
where.push('users.trained IS TRUE');
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
where.push('users.trained IS FALSE');
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
59
|
if (isNotNull(filter.system)) {
|
|
35
60
|
if (filter.system) {
|
|
36
61
|
where.push('users.system IS TRUE');
|
|
@@ -43,7 +68,9 @@ function processFilters(filter) {
|
|
|
43
68
|
return { binds, where };
|
|
44
69
|
}
|
|
45
70
|
export async function getUsers(filter) {
|
|
46
|
-
const { binds, where } = processFilters(filter);
|
|
71
|
+
const { binds, where } = await processFilters(filter);
|
|
72
|
+
if (filter.noresults)
|
|
73
|
+
return [];
|
|
47
74
|
const users = where.length
|
|
48
75
|
? await db.getall(`SELECT * FROM users WHERE (${where.join(') AND (')}) ORDER BY login`, binds)
|
|
49
76
|
: await db.getall('SELECT * FROM users ORDER BY login');
|
|
@@ -57,7 +84,7 @@ export async function getUsersByInternalId(ids) {
|
|
|
57
84
|
return users.map(u => new User(u));
|
|
58
85
|
}
|
|
59
86
|
export async function getUsersInGroup(groupIds, filter) {
|
|
60
|
-
const { binds, where } = processFilters(filter);
|
|
87
|
+
const { binds, where } = await processFilters(filter);
|
|
61
88
|
where.push(`users_groups.groupId IN (${db.in(binds, groupIds)})`);
|
|
62
89
|
const users = await db.getall(`SELECT users.*, users_groups.groupId AS groupId FROM users
|
|
63
90
|
INNER JOIN users_groups ON users.id = users_groups.userId
|
|
@@ -65,7 +92,7 @@ export async function getUsersInGroup(groupIds, filter) {
|
|
|
65
92
|
return users.map(row => ({ key: String(row.groupId), value: new User(row) }));
|
|
66
93
|
}
|
|
67
94
|
export async function getUsersWithRole(roleIds, filter) {
|
|
68
|
-
const { binds, where } = processFilters(filter);
|
|
95
|
+
const { binds, where } = await processFilters(filter);
|
|
69
96
|
where.push(`users_roles.roleId IN (${db.in(binds, roleIds)})`);
|
|
70
97
|
const users = await db.getall(`SELECT users.*, users_roles.roleId AS roleId
|
|
71
98
|
FROM users INNER JOIN users_roles ON users.id = users_roles.userId
|
|
@@ -105,10 +132,42 @@ export async function getUsersManagingGroups(groupIds, direct) {
|
|
|
105
132
|
return unique(all, row => [row.id, row.groupId])
|
|
106
133
|
.map(row => ({ key: String(row.groupId), value: new User(row) }));
|
|
107
134
|
}
|
|
108
|
-
export async function
|
|
109
|
-
|
|
135
|
+
export async function getTrainingsForUsers(userInternalIds) {
|
|
136
|
+
const rows = await db.getall(`SELECT ut.userId, t.id, t.name FROM users_trainings ut INNER JOIN trainings t ON ut.trainingId=t.id WHERE ut.userId IN (${db.in([], userInternalIds)})`, userInternalIds);
|
|
137
|
+
return rows.map(r => ({ key: r.userId, value: new Training(r) }));
|
|
138
|
+
}
|
|
139
|
+
export async function getAllTrainings() {
|
|
140
|
+
return (await db.getall('SELECT * FROM trainings')).map(r => new Training(r));
|
|
141
|
+
}
|
|
142
|
+
async function syncTrainings(userInternalId, trainings) {
|
|
143
|
+
if (trainings == null)
|
|
144
|
+
return;
|
|
145
|
+
const binds = [userInternalId];
|
|
146
|
+
if (trainings.length) {
|
|
147
|
+
await db.delete(`DELETE FROM users_trainings WHERE userId = ? AND trainingId NOT IN (${db.in(binds, trainings)})`, binds);
|
|
148
|
+
const ibinds = [];
|
|
149
|
+
await db.insert(`INSERT INTO users_trainings (userId, trainingId) VALUES ${db.in(ibinds, trainings.map(t => [userInternalId, t]))} ON DUPLICATE KEY UPDATE userId=userId`, ibinds);
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
await db.delete('DELETE FROM users_trainings WHERE userId = ?', binds);
|
|
153
|
+
}
|
|
110
154
|
}
|
|
111
|
-
export async function
|
|
155
|
+
export async function addTrainings(trainingId, userIds) {
|
|
156
|
+
if (!userIds.length)
|
|
157
|
+
return;
|
|
158
|
+
const binds = [trainingId];
|
|
159
|
+
await db.insert(`
|
|
160
|
+
INSERT INTO users_trainings (userId, trainingId)
|
|
161
|
+
SELECT id, ? FROM users WHERE login IN (${db.in(binds, userIds)})
|
|
162
|
+
ON DUPLICATE KEY UPDATE userId=userId
|
|
163
|
+
`, binds);
|
|
164
|
+
}
|
|
165
|
+
export async function createUser(id, firstname, lastname, email, trainings, system) {
|
|
166
|
+
const userInternalId = await db.insert('INSERT INTO users (login, firstname, lastname, email, system) VALUES (?, ?, ?, ?, ?, ?)', [id, firstname, lastname, email, system]);
|
|
167
|
+
await syncTrainings(userInternalId, trainings);
|
|
168
|
+
return userInternalId;
|
|
169
|
+
}
|
|
170
|
+
export async function updateUser(id, firstname, lastname, email, trainings) {
|
|
112
171
|
const updates = [];
|
|
113
172
|
const binds = [];
|
|
114
173
|
if (firstname) {
|
|
@@ -123,14 +182,15 @@ export async function updateUser(id, firstname, lastname, email, trained) {
|
|
|
123
182
|
updates.push('email = ?');
|
|
124
183
|
binds.push(email);
|
|
125
184
|
}
|
|
126
|
-
if (typeof trained !== 'undefined') {
|
|
127
|
-
updates.push('trained = ?');
|
|
128
|
-
binds.push(trained);
|
|
129
|
-
}
|
|
130
185
|
if (updates.length) {
|
|
131
186
|
binds.push(id);
|
|
132
187
|
await db.update(`UPDATE users SET ${updates.join(',')} WHERE login = ?`, binds);
|
|
133
188
|
}
|
|
189
|
+
if (trainings != null) {
|
|
190
|
+
const userInternalId = await db.getval('SELECT id FROM users WHERE login=?', [id]);
|
|
191
|
+
if (userInternalId)
|
|
192
|
+
await syncTrainings(userInternalId, trainings);
|
|
193
|
+
}
|
|
134
194
|
}
|
|
135
195
|
export async function disableUsers(users) {
|
|
136
196
|
const binds = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.database.js","sourceRoot":"","sources":["../../src/user/user.database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"user.database.js","sourceRoot":"","sources":["../../src/user/user.database.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ export declare class User {
|
|
|
9
9
|
email: string;
|
|
10
10
|
disabled: boolean;
|
|
11
11
|
disabledAt?: DateTime;
|
|
12
|
-
trained: boolean;
|
|
13
12
|
system: boolean;
|
|
14
13
|
lastlogin?: DateTime;
|
|
15
14
|
internalId: number;
|
|
@@ -18,9 +17,12 @@ export declare class User {
|
|
|
18
17
|
}
|
|
19
18
|
export declare class UserFilter {
|
|
20
19
|
internalIds?: number[];
|
|
20
|
+
noresults?: boolean;
|
|
21
21
|
ids?: string[];
|
|
22
22
|
enabled?: boolean;
|
|
23
|
-
|
|
23
|
+
trainingAny?: string[];
|
|
24
|
+
trainingAll?: string[];
|
|
25
|
+
trainingNone?: string[];
|
|
24
26
|
system?: boolean;
|
|
25
27
|
hideDisabledBefore?: DateTime;
|
|
26
28
|
}
|
|
@@ -28,7 +30,7 @@ export declare class UpdateUserInput {
|
|
|
28
30
|
firstname: string;
|
|
29
31
|
lastname: string;
|
|
30
32
|
email: string;
|
|
31
|
-
|
|
33
|
+
trainings: string[];
|
|
32
34
|
}
|
|
33
35
|
export declare class UserResponse extends ValidatedResponse {
|
|
34
36
|
user?: User;
|
|
@@ -44,3 +46,8 @@ export declare class UsersResponse extends ValidatedResponse {
|
|
|
44
46
|
}
|
|
45
47
|
export declare class UserPermissions {
|
|
46
48
|
}
|
|
49
|
+
export declare class Training {
|
|
50
|
+
id: string;
|
|
51
|
+
name: string;
|
|
52
|
+
constructor(row: any);
|
|
53
|
+
}
|
package/dist/user/user.model.js
CHANGED
|
@@ -26,7 +26,6 @@ let User = class User {
|
|
|
26
26
|
this.email = row.email;
|
|
27
27
|
this.disabledAt = row.disabledAt ? DateTime.fromJSDate(row.disabledAt) : undefined;
|
|
28
28
|
this.disabled = this.disabledAt != null;
|
|
29
|
-
this.trained = !!row.trained;
|
|
30
29
|
this.system = !!row.system;
|
|
31
30
|
this.lastlogin = row.lastlogin ? DateTime.fromJSDate(row.lastlogin) : undefined;
|
|
32
31
|
this.lastlogout = row.lastlogout ? DateTime.fromJSDate(row.lastlogout) : undefined;
|
|
@@ -66,10 +65,6 @@ __decorate([
|
|
|
66
65
|
Field({ nullable: true, description: 'When the user was disabled. The UI may want to do something to hide these users.' }),
|
|
67
66
|
__metadata("design:type", DateTime)
|
|
68
67
|
], User.prototype, "disabledAt", void 0);
|
|
69
|
-
__decorate([
|
|
70
|
-
Field(),
|
|
71
|
-
__metadata("design:type", Boolean)
|
|
72
|
-
], User.prototype, "trained", void 0);
|
|
73
68
|
__decorate([
|
|
74
69
|
Field(),
|
|
75
70
|
__metadata("design:type", Boolean)
|
|
@@ -94,9 +89,17 @@ __decorate([
|
|
|
94
89
|
__metadata("design:type", Boolean)
|
|
95
90
|
], UserFilter.prototype, "enabled", void 0);
|
|
96
91
|
__decorate([
|
|
97
|
-
Field({ nullable: true, description: '
|
|
98
|
-
__metadata("design:type",
|
|
99
|
-
], UserFilter.prototype, "
|
|
92
|
+
Field(type => [ID], { nullable: true, description: 'Include users who have completed at least one of the specified trainings.' }),
|
|
93
|
+
__metadata("design:type", Array)
|
|
94
|
+
], UserFilter.prototype, "trainingAny", void 0);
|
|
95
|
+
__decorate([
|
|
96
|
+
Field(type => [ID], { nullable: true, description: 'Include users who have completed all of the specified trainings.' }),
|
|
97
|
+
__metadata("design:type", Array)
|
|
98
|
+
], UserFilter.prototype, "trainingAll", void 0);
|
|
99
|
+
__decorate([
|
|
100
|
+
Field(type => [ID], { nullable: true, description: 'Include users who have not completed any one of the specified trainings.' }),
|
|
101
|
+
__metadata("design:type", Array)
|
|
102
|
+
], UserFilter.prototype, "trainingNone", void 0);
|
|
100
103
|
__decorate([
|
|
101
104
|
Field({ nullable: true, description: 'true -> system users, false -> non-system users, null -> all users' }),
|
|
102
105
|
__metadata("design:type", Boolean)
|
|
@@ -124,9 +127,9 @@ __decorate([
|
|
|
124
127
|
__metadata("design:type", String)
|
|
125
128
|
], UpdateUserInput.prototype, "email", void 0);
|
|
126
129
|
__decorate([
|
|
127
|
-
Field({ nullable: true }),
|
|
128
|
-
__metadata("design:type",
|
|
129
|
-
], UpdateUserInput.prototype, "
|
|
130
|
+
Field(type => [ID], { nullable: true }),
|
|
131
|
+
__metadata("design:type", Array)
|
|
132
|
+
], UpdateUserInput.prototype, "trainings", void 0);
|
|
130
133
|
UpdateUserInput = __decorate([
|
|
131
134
|
InputType()
|
|
132
135
|
], UpdateUserInput);
|
|
@@ -167,4 +170,23 @@ UserPermissions = __decorate([
|
|
|
167
170
|
ObjectType()
|
|
168
171
|
], UserPermissions);
|
|
169
172
|
export { UserPermissions };
|
|
173
|
+
let Training = class Training {
|
|
174
|
+
constructor(row) {
|
|
175
|
+
this.id = String(row.id);
|
|
176
|
+
this.name = row.name;
|
|
177
|
+
}
|
|
178
|
+
};
|
|
179
|
+
__decorate([
|
|
180
|
+
Field(type => ID),
|
|
181
|
+
__metadata("design:type", String)
|
|
182
|
+
], Training.prototype, "id", void 0);
|
|
183
|
+
__decorate([
|
|
184
|
+
Field(),
|
|
185
|
+
__metadata("design:type", String)
|
|
186
|
+
], Training.prototype, "name", void 0);
|
|
187
|
+
Training = __decorate([
|
|
188
|
+
ObjectType(),
|
|
189
|
+
__metadata("design:paramtypes", [Object])
|
|
190
|
+
], Training);
|
|
191
|
+
export { Training };
|
|
170
192
|
//# sourceMappingURL=user.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../src/user/user.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,6BAA6B,CAAA;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAGnC,IAAM,IAAI,GAAV,MAAM,IAAI;IAUf,IACI,IAAI;QACN,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrE,CAAC;IAED,IACI,YAAY;QACd,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACtE,CAAC;
|
|
1
|
+
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../src/user/user.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { Context } from '@txstate-mws/graphql-server';
|
|
2
|
-
import { Group, Role, User, UserFilter, Site, UserResponse, UpdateUserInput, UsersResponse, SiteFilter } from '../internal.js';
|
|
2
|
+
import { Group, Role, User, UserFilter, Site, UserResponse, UpdateUserInput, UsersResponse, SiteFilter, Training } from '../internal.js';
|
|
3
3
|
export declare class UserResolver {
|
|
4
4
|
users(ctx: Context, filter: UserFilter): Promise<User[]>;
|
|
5
|
+
trainingsQuery(ctx: Context): Promise<Training[]>;
|
|
5
6
|
groups(ctx: Context, user: User, direct: boolean): Promise<Group[]>;
|
|
6
7
|
roles(ctx: Context, user: User, direct: boolean): Promise<Role[]>;
|
|
8
|
+
trainings(ctx: Context, user: User): Promise<Training[]>;
|
|
7
9
|
sitesOwned(ctx: Context, user: User, filter: SiteFilter): Promise<Site[]>;
|
|
8
10
|
sitesManaged(ctx: Context, user: User, filter: SiteFilter): Promise<Site[]>;
|
|
9
11
|
permissions(user: User): User;
|
|
10
|
-
createUser(ctx: Context, userId: string, firstname: string | undefined, lastname: string, email: string,
|
|
12
|
+
createUser(ctx: Context, userId: string, firstname: string | undefined, lastname: string, email: string, trainings: string[] | undefined, system: boolean | undefined, validateOnly?: boolean): Promise<UserResponse>;
|
|
13
|
+
updateTraining(ctx: Context, trainingId: string, userIds: string[]): Promise<import("@txstate-mws/graphql-server").ValidatedResponse>;
|
|
11
14
|
updateUser(ctx: Context, userId: string, args: UpdateUserInput, validateOnly?: boolean): Promise<UserResponse>;
|
|
12
15
|
disableUsers(ctx: Context, userIds: string[]): Promise<UsersResponse>;
|
|
13
16
|
enableUsers(ctx: Context, userIds: string[]): Promise<UsersResponse>;
|
|
@@ -12,17 +12,23 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Context } from '@txstate-mws/graphql-server';
|
|
14
14
|
import { Resolver, Query, Arg, Ctx, FieldResolver, Root, Mutation, ID } from 'type-graphql';
|
|
15
|
-
import { Group, GroupService, Role, RoleService, User, UserFilter, Site, UserPermissions, UserResponse, UpdateUserInput, UserService, UsersResponse, SiteFilter, SiteServiceInternal } from '../internal.js';
|
|
15
|
+
import { Group, GroupService, Role, RoleService, User, UserFilter, Site, UserPermissions, UserResponse, UpdateUserInput, UserService, UsersResponse, SiteFilter, SiteServiceInternal, Training, UserServiceInternal, getAllTrainings } from '../internal.js';
|
|
16
16
|
let UserResolver = class UserResolver {
|
|
17
17
|
async users(ctx, filter) {
|
|
18
18
|
return await ctx.svc(UserService).find(filter);
|
|
19
19
|
}
|
|
20
|
+
async trainingsQuery(ctx) {
|
|
21
|
+
return await getAllTrainings();
|
|
22
|
+
}
|
|
20
23
|
async groups(ctx, user, direct) {
|
|
21
24
|
return await ctx.svc(GroupService).findByUserId(user.id, direct);
|
|
22
25
|
}
|
|
23
26
|
async roles(ctx, user, direct) {
|
|
24
27
|
return await ctx.svc(RoleService).findByUserId(user.id, direct);
|
|
25
28
|
}
|
|
29
|
+
async trainings(ctx, user) {
|
|
30
|
+
return await ctx.svc(UserServiceInternal).getTrainings(user.internalId);
|
|
31
|
+
}
|
|
26
32
|
async sitesOwned(ctx, user, filter) {
|
|
27
33
|
return await ctx.svc(SiteServiceInternal).findByOwnerInternalId(user.internalId, { ...filter, viewForEdit: true });
|
|
28
34
|
}
|
|
@@ -32,8 +38,11 @@ let UserResolver = class UserResolver {
|
|
|
32
38
|
permissions(user) {
|
|
33
39
|
return user;
|
|
34
40
|
}
|
|
35
|
-
async createUser(ctx, userId, firstname, lastname, email,
|
|
36
|
-
return await ctx.svc(UserService).createUser(userId, lastname, email, firstname,
|
|
41
|
+
async createUser(ctx, userId, firstname, lastname, email, trainings, system, validateOnly) {
|
|
42
|
+
return await ctx.svc(UserService).createUser(userId, lastname, email, firstname, trainings, system, validateOnly);
|
|
43
|
+
}
|
|
44
|
+
async updateTraining(ctx, trainingId, userIds) {
|
|
45
|
+
return await ctx.svc(UserService).addTrainings(trainingId, userIds);
|
|
37
46
|
}
|
|
38
47
|
async updateUser(ctx, userId, args, validateOnly) {
|
|
39
48
|
return await ctx.svc(UserService).updateUser(userId, args, validateOnly);
|
|
@@ -53,6 +62,13 @@ __decorate([
|
|
|
53
62
|
__metadata("design:paramtypes", [Context, UserFilter]),
|
|
54
63
|
__metadata("design:returntype", Promise)
|
|
55
64
|
], UserResolver.prototype, "users", null);
|
|
65
|
+
__decorate([
|
|
66
|
+
Query(returns => [Training], { name: 'trainings' }),
|
|
67
|
+
__param(0, Ctx()),
|
|
68
|
+
__metadata("design:type", Function),
|
|
69
|
+
__metadata("design:paramtypes", [Context]),
|
|
70
|
+
__metadata("design:returntype", Promise)
|
|
71
|
+
], UserResolver.prototype, "trainingsQuery", null);
|
|
56
72
|
__decorate([
|
|
57
73
|
FieldResolver(returns => [Group], { description: 'Groups related to the user, either directly or through a subgroup membership.' }),
|
|
58
74
|
__param(0, Ctx()),
|
|
@@ -71,6 +87,14 @@ __decorate([
|
|
|
71
87
|
__metadata("design:paramtypes", [Context, User, Boolean]),
|
|
72
88
|
__metadata("design:returntype", Promise)
|
|
73
89
|
], UserResolver.prototype, "roles", null);
|
|
90
|
+
__decorate([
|
|
91
|
+
FieldResolver(returns => [Training], { description: 'Trainings the user has successfully completed.' }),
|
|
92
|
+
__param(0, Ctx()),
|
|
93
|
+
__param(1, Root()),
|
|
94
|
+
__metadata("design:type", Function),
|
|
95
|
+
__metadata("design:paramtypes", [Context, User]),
|
|
96
|
+
__metadata("design:returntype", Promise)
|
|
97
|
+
], UserResolver.prototype, "trainings", null);
|
|
74
98
|
__decorate([
|
|
75
99
|
FieldResolver(returns => [Site], { description: 'Sites owned by the user' }),
|
|
76
100
|
__param(0, Ctx()),
|
|
@@ -103,13 +127,22 @@ __decorate([
|
|
|
103
127
|
__param(2, Arg('firstname', type => String, { nullable: true })),
|
|
104
128
|
__param(3, Arg('lastname')),
|
|
105
129
|
__param(4, Arg('email')),
|
|
106
|
-
__param(5, Arg('
|
|
130
|
+
__param(5, Arg('trainings', type => [ID], { nullable: true })),
|
|
107
131
|
__param(6, Arg('system', type => Boolean, { nullable: true })),
|
|
108
132
|
__param(7, Arg('validateOnly', { nullable: true })),
|
|
109
133
|
__metadata("design:type", Function),
|
|
110
134
|
__metadata("design:paramtypes", [Context, String, Object, String, String, Object, Object, Boolean]),
|
|
111
135
|
__metadata("design:returntype", Promise)
|
|
112
136
|
], UserResolver.prototype, "createUser", null);
|
|
137
|
+
__decorate([
|
|
138
|
+
Mutation(returns => UserResponse),
|
|
139
|
+
__param(0, Ctx()),
|
|
140
|
+
__param(1, Arg('trainingId', type => ID)),
|
|
141
|
+
__param(2, Arg('userIds', type => [ID])),
|
|
142
|
+
__metadata("design:type", Function),
|
|
143
|
+
__metadata("design:paramtypes", [Context, String, Array]),
|
|
144
|
+
__metadata("design:returntype", Promise)
|
|
145
|
+
], UserResolver.prototype, "updateTraining", null);
|
|
113
146
|
__decorate([
|
|
114
147
|
Mutation(returns => UserResponse),
|
|
115
148
|
__param(0, Ctx()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.resolver.js","sourceRoot":"","sources":["../../src/user/user.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EACL,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAC9D,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"user.resolver.js","sourceRoot":"","sources":["../../src/user/user.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseService } from '@txstate-mws/graphql-server';
|
|
1
|
+
import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
|
|
2
2
|
import { DosGatoService, User, type UserFilter, UserResponse, UsersResponse, type UpdateUserInput } from '../internal.js';
|
|
3
3
|
export declare class UserServiceInternal extends BaseService {
|
|
4
4
|
find(filter: UserFilter): Promise<User[]>;
|
|
@@ -8,6 +8,7 @@ export declare class UserServiceInternal extends BaseService {
|
|
|
8
8
|
findGroupManagers(groupId: string, direct?: boolean): Promise<User[]>;
|
|
9
9
|
findByInternalId(id: number): Promise<User | undefined>;
|
|
10
10
|
findById(id: string): Promise<User | undefined>;
|
|
11
|
+
getTrainings(id: number): Promise<import("./user.model.js").Training[]>;
|
|
11
12
|
}
|
|
12
13
|
export declare class UserService extends DosGatoService<User, User> {
|
|
13
14
|
raw: UserServiceInternal;
|
|
@@ -18,8 +19,9 @@ export declare class UserService extends DosGatoService<User, User> {
|
|
|
18
19
|
findGroupManagers(groupId: string, direct?: boolean): Promise<User[]>;
|
|
19
20
|
findByInternalId(id: number): Promise<User | undefined>;
|
|
20
21
|
findById(id: string): Promise<User | undefined>;
|
|
21
|
-
createUser(id: string, lastname: string, email: string, firstname: string | undefined,
|
|
22
|
+
createUser(id: string, lastname: string, email: string, firstname: string | undefined, trainings: string[] | undefined, system: boolean | undefined, validateOnly?: boolean): Promise<UserResponse>;
|
|
22
23
|
updateUser(id: string, args: UpdateUserInput, validateOnly?: boolean): Promise<UserResponse>;
|
|
24
|
+
addTrainings(trainingId: string, userIds: string[]): Promise<ValidatedResponse>;
|
|
23
25
|
disableUsers(ids: string[]): Promise<UsersResponse>;
|
|
24
26
|
enableUsers(ids: string[]): Promise<UsersResponse>;
|
|
25
27
|
mayCreate(): Promise<boolean>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BaseService, MutationMessageType } from '@txstate-mws/graphql-server';
|
|
1
|
+
import { BaseService, MutationMessageType, ValidatedResponse } from '@txstate-mws/graphql-server';
|
|
2
2
|
import { ManyJoinedLoader, PrimaryKeyLoader } from 'dataloader-factory';
|
|
3
3
|
import { isNotBlank, isNotNull, someAsync, unique, isBlank } from 'txstate-utils';
|
|
4
|
-
import { DosGatoService, GroupService, User, UserResponse, getUsers, createUser, getUsersInGroup, getUsersWithRole, getUsersBySite, getUsersByInternalId, UsersResponse, updateUser, disableUsers, enableUsers, getUsersManagingGroups, SiteRuleService } from '../internal.js';
|
|
4
|
+
import { DosGatoService, GroupService, User, UserResponse, getUsers, createUser, getUsersInGroup, getUsersWithRole, getUsersBySite, getUsersByInternalId, UsersResponse, updateUser, disableUsers, enableUsers, getUsersManagingGroups, SiteRuleService, getTrainingsForUsers, addTrainings } from '../internal.js';
|
|
5
5
|
const usersByInternalIdLoader = new PrimaryKeyLoader({
|
|
6
6
|
fetch: async (ids) => {
|
|
7
7
|
return await getUsersByInternalId(ids);
|
|
@@ -35,6 +35,9 @@ const usersManagingGroupId = new ManyJoinedLoader({
|
|
|
35
35
|
fetch: async (groupIds, direct) => await getUsersManagingGroups(groupIds, direct),
|
|
36
36
|
idLoader: usersByInternalIdLoader
|
|
37
37
|
});
|
|
38
|
+
const trainingsByUserInternalIdLoader = new ManyJoinedLoader({
|
|
39
|
+
fetch: async (userInternalIds) => await getTrainingsForUsers(userInternalIds)
|
|
40
|
+
});
|
|
38
41
|
export class UserServiceInternal extends BaseService {
|
|
39
42
|
async find(filter) {
|
|
40
43
|
const users = await getUsers(filter);
|
|
@@ -94,6 +97,9 @@ export class UserServiceInternal extends BaseService {
|
|
|
94
97
|
async findById(id) {
|
|
95
98
|
return await this.loaders.get(usersByIdLoader).load(id);
|
|
96
99
|
}
|
|
100
|
+
async getTrainings(id) {
|
|
101
|
+
return await this.loaders.get(trainingsByUserInternalIdLoader).load(id);
|
|
102
|
+
}
|
|
97
103
|
}
|
|
98
104
|
export class UserService extends DosGatoService {
|
|
99
105
|
constructor() {
|
|
@@ -139,7 +145,7 @@ export class UserService extends DosGatoService {
|
|
|
139
145
|
async findById(id) {
|
|
140
146
|
return await this.removeUnauthorized(await this.raw.findById(id));
|
|
141
147
|
}
|
|
142
|
-
async createUser(id, lastname, email, firstname,
|
|
148
|
+
async createUser(id, lastname, email, firstname, trainings, system, validateOnly) {
|
|
143
149
|
if (!(await this.mayCreate()))
|
|
144
150
|
throw new Error('Current user is not permitted to create users.');
|
|
145
151
|
const response = new UserResponse({ success: true });
|
|
@@ -155,7 +161,7 @@ export class UserService extends DosGatoService {
|
|
|
155
161
|
}
|
|
156
162
|
if (validateOnly || response.hasErrors())
|
|
157
163
|
return response;
|
|
158
|
-
await createUser(id, firstname ?? '', lastname, email,
|
|
164
|
+
await createUser(id, firstname ?? '', lastname, email, trainings, !!system);
|
|
159
165
|
this.loaders.clear();
|
|
160
166
|
response.user = await this.raw.findById(id);
|
|
161
167
|
return response;
|
|
@@ -181,13 +187,19 @@ export class UserService extends DosGatoService {
|
|
|
181
187
|
if (response.hasErrors())
|
|
182
188
|
return response;
|
|
183
189
|
if (!validateOnly) {
|
|
184
|
-
await updateUser(id, args.firstname, args.lastname, args.email, args.
|
|
190
|
+
await updateUser(id, args.firstname, args.lastname, args.email, args.trainings);
|
|
185
191
|
this.loaders.clear();
|
|
186
192
|
response.success = true;
|
|
187
193
|
response.user = await this.raw.findById(id);
|
|
188
194
|
}
|
|
189
195
|
return response;
|
|
190
196
|
}
|
|
197
|
+
async addTrainings(trainingId, userIds) {
|
|
198
|
+
if (!(await this.haveGlobalPerm('manageAccess')))
|
|
199
|
+
throw new Error('Current user is not permitted to add trainings.');
|
|
200
|
+
await addTrainings(trainingId, userIds.filter(isNotBlank));
|
|
201
|
+
return new ValidatedResponse({ success: true });
|
|
202
|
+
}
|
|
191
203
|
async disableUsers(ids) {
|
|
192
204
|
const users = (await Promise.all(ids.map(async (id) => await this.raw.findById(id)))).filter(isNotNull);
|
|
193
205
|
if (await someAsync(users, async (u) => !(await this.mayDisable(u)))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/user/user.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dosgato/api",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "A CMS designed for large institutions with thousands of editors and hundreds of subsites.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"mysql2-async": "^2.0.0",
|
|
20
20
|
"nanoid": "^5.0.0",
|
|
21
21
|
"probe-image-size": "^7.2.3",
|
|
22
|
-
"txstate-utils": "^1.8.
|
|
22
|
+
"txstate-utils": "^1.8.15",
|
|
23
23
|
"type-graphql": "^1.1.1",
|
|
24
24
|
"wasmagic": "^0.0.32"
|
|
25
25
|
},
|