@skalfa/skalfa-api-core 1.0.9 → 1.0.12
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/auth/create-access-token.d.ts +1 -1
- package/dist/auth/create-access-token.js +14 -4
- package/dist/auth/create-access-token.js.map +1 -1
- package/dist/auth/list-user-sessions.d.ts +1 -1
- package/dist/auth/revoke-access-token.d.ts +1 -1
- package/dist/commands/runner/migration.d.ts +1 -1
- package/dist/commands/runner/migration.js +21 -8
- package/dist/commands/runner/migration.js.map +1 -1
- package/dist/controller/storage.js +13 -3
- package/dist/controller/storage.js.map +1 -1
- package/dist/middleware/error-handler.d.ts +1 -1
- package/dist/middleware/error-handler.js +5 -0
- package/dist/middleware/error-handler.js.map +1 -1
- package/dist/middleware/middleware.d.ts +1 -1
- package/dist/notification/notification.js +12 -4
- package/dist/notification/notification.js.map +1 -1
- package/package.json +3 -2
- package/src/auth/create-access-token.ts +18 -4
- package/src/commands/runner/migration.ts +29 -18
- package/src/controller/storage.ts +16 -3
- package/src/middleware/error-handler.ts +11 -0
- package/src/notification/notification.ts +22 -10
|
@@ -11,16 +11,26 @@ export async function createAccessToken(userId, req, permission = true) {
|
|
|
11
11
|
if (AUTH_PERMISSION && permission) {
|
|
12
12
|
permissions = await getUserPermissions(userId);
|
|
13
13
|
}
|
|
14
|
-
const
|
|
14
|
+
const isMySql = db.client?.config?.client?.includes?.('mysql');
|
|
15
|
+
let tokenId;
|
|
16
|
+
const insertData = {
|
|
15
17
|
user_id: userId,
|
|
16
18
|
token: hash,
|
|
17
19
|
agent: agent,
|
|
18
20
|
permissions: JSON.stringify(permissions),
|
|
19
21
|
created_at: new Date(),
|
|
20
|
-
}
|
|
22
|
+
};
|
|
23
|
+
if (isMySql) {
|
|
24
|
+
const [insertId] = await db("user_access_tokens").insert(insertData);
|
|
25
|
+
tokenId = insertId;
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const [row] = await db("user_access_tokens").insert(insertData).returning(["id"]);
|
|
29
|
+
tokenId = row.id;
|
|
30
|
+
}
|
|
21
31
|
return {
|
|
22
|
-
token: `${
|
|
23
|
-
tokenId:
|
|
32
|
+
token: `${tokenId}|${plain}`,
|
|
33
|
+
tokenId: tokenId,
|
|
24
34
|
};
|
|
25
35
|
}
|
|
26
36
|
//# sourceMappingURL=create-access-token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-access-token.js","sourceRoot":"","sources":["../../src/auth/create-access-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE/D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,GAAY,EAAE,aAAsB,IAAI;IAC9F,MAAM,KAAK,GAAK,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,IAAI,GAAM,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,KAAK,GAAK,eAAe,CAAC,GAAG,CAAC,CAAA;IAEpC,IAAI,WAAW,GAAa,EAAE,CAAA;IAC9B,IAAI,eAAe,IAAI,UAAU,EAAE,CAAC;QAClC,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"create-access-token.js","sourceRoot":"","sources":["../../src/auth/create-access-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE/D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,GAAY,EAAE,aAAsB,IAAI;IAC9F,MAAM,KAAK,GAAK,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,IAAI,GAAM,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,KAAK,GAAK,eAAe,CAAC,GAAG,CAAC,CAAA;IAEpC,IAAI,WAAW,GAAa,EAAE,CAAA;IAC9B,IAAI,eAAe,IAAI,UAAU,EAAE,CAAC;QAClC,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;IAC9D,IAAI,OAAe,CAAA;IAEnB,MAAM,UAAU,GAAG;QACjB,OAAO,EAAS,MAAM;QACtB,KAAK,EAAW,IAAI;QACpB,KAAK,EAAW,KAAK;QACrB,WAAW,EAAK,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;QAC3C,UAAU,EAAM,IAAI,IAAI,EAAE;KAC3B,CAAA;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEpE,OAAO,GAAG,QAAQ,CAAA;IACpB,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEjF,OAAO,GAAG,GAAG,CAAC,EAAE,CAAA;IAClB,CAAC;IAED,OAAO;QACL,KAAK,EAAO,GAAG,OAAO,IAAI,KAAK,EAAE;QACjC,OAAO,EAAK,OAAO;KACpB,CAAA;AAEH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function listUserSessions(userId: number, currentTokenId?: number): Promise<any
|
|
1
|
+
export declare function listUserSessions(userId: number, currentTokenId?: number): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function revokeAccessToken(id: number): Promise<
|
|
1
|
+
export declare function revokeAccessToken(id: number): Promise<any>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
2
|
declare module "knex" {
|
|
3
3
|
namespace Knex {
|
|
4
|
-
interface
|
|
4
|
+
interface TableBuilder {
|
|
5
5
|
foreignIdFor(tableName: string, column?: string): Knex.ColumnBuilder;
|
|
6
6
|
softDelete(column?: string): Knex.ColumnBuilder;
|
|
7
7
|
}
|
|
@@ -1,16 +1,29 @@
|
|
|
1
1
|
import fs from "fs";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import knex from "knex";
|
|
4
3
|
import { Command } from "commander";
|
|
5
4
|
import { conversion, logger } from "@utils";
|
|
6
5
|
import { runSeeder } from "./seeder";
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
6
|
+
const knex = require("knex");
|
|
7
|
+
try {
|
|
8
|
+
knex.TableBuilder.extend("softDelete", function (column = `deleted_at`) {
|
|
9
|
+
const table = this;
|
|
10
|
+
return table.timestamp(column).index();
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
if (!e.message?.includes("Can't extend"))
|
|
15
|
+
throw e;
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
knex.TableBuilder.extend("foreignIdFor", function (tableName, column = `${conversion.strSingular(tableName)}_id`) {
|
|
19
|
+
const table = this;
|
|
20
|
+
return table.bigInteger(column).unsigned().index();
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
if (!e.message?.includes("Can't extend"))
|
|
25
|
+
throw e;
|
|
26
|
+
}
|
|
14
27
|
// =====================================>
|
|
15
28
|
// ## Command: migrate
|
|
16
29
|
// =====================================>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../src/commands/runner/migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../src/commands/runner/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,9 @@ export async function uploadFile(file, folder = "uploads", options) {
|
|
|
15
15
|
fs.writeFileSync(filePath, buffer);
|
|
16
16
|
const relativePath = `/${folder}/${fileName}`;
|
|
17
17
|
if (db && options) {
|
|
18
|
-
const
|
|
18
|
+
const isMySql = db.client?.config?.client?.includes?.('mysql');
|
|
19
|
+
let storageId;
|
|
20
|
+
const insertData = {
|
|
19
21
|
user_id: options?.owner_id ?? null,
|
|
20
22
|
disk: disk,
|
|
21
23
|
path: relativePath,
|
|
@@ -23,10 +25,18 @@ export async function uploadFile(file, folder = "uploads", options) {
|
|
|
23
25
|
filetype: file.type,
|
|
24
26
|
filesize: buffer.length,
|
|
25
27
|
created_at: new Date(),
|
|
26
|
-
}
|
|
28
|
+
};
|
|
29
|
+
if (isMySql) {
|
|
30
|
+
const [insertId] = await db("storages").insert(insertData);
|
|
31
|
+
storageId = insertId;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
const [storage] = await db("storages").insert(insertData).returning(["id"]);
|
|
35
|
+
storageId = storage.id;
|
|
36
|
+
}
|
|
27
37
|
if (options?.permissions?.length) {
|
|
28
38
|
const permissions = options.permissions.map(p => ({
|
|
29
|
-
storage_id:
|
|
39
|
+
storage_id: storageId,
|
|
30
40
|
user_id: p.user_id ?? null,
|
|
31
41
|
role_id: p.role_id ?? null,
|
|
32
42
|
created_at: new Date(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/controller/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAIxC,uCAAuC;AACvC,iBAAiB;AACjB,uCAAuC;AACvC,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAU,EACV,MAAM,GAAG,SAAS,EAClB,OAIC;IAED,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,QAAQ,CAAC;IAEvC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;IACpI,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAErD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEnC,MAAM,YAAY,GAAG,IAAI,MAAM,IAAI,QAAQ,EAAE,CAAC;IAE9C,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QAClB,MAAM,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/controller/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { logger } from '@utils';
|
|
2
2
|
import { errors } from './middleware';
|
|
3
3
|
export const ErrorHandler = (app) => app.onError(({ code, set, error, request }) => {
|
|
4
|
+
const err = error;
|
|
5
|
+
if (err.name === 'NotFoundError' || err.message === 'Record not found') {
|
|
6
|
+
set.status = 404;
|
|
7
|
+
return { message: err.message };
|
|
8
|
+
}
|
|
4
9
|
if (code === 'NOT_FOUND') {
|
|
5
10
|
set.status = errors.notfound.status;
|
|
6
11
|
return { message: errors.notfound.message };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;IACzF,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/middleware/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;IACzF,MAAM,GAAG,GAAG,KAAY,CAAA;IAExB,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,IAAI,GAAG,CAAC,OAAO,KAAK,kBAAkB,EAAE,CAAC;QACvE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAA;QAEhB,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAA;IACjC,CAAC;IAGD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAA;QAEnC,OAAO,EAAE,OAAO,EAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAA;IAC9C,CAAC;IAED,IAAI,IAAI,KAAK,uBAAuB,EAAE,CAAC;QACrC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAA;QAChC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAA;QACxB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAA;QAEzB,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAE5D,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;IACxB,CAAC;AACH,CAAC,CAAC,CAAA"}
|
|
@@ -11,15 +11,23 @@ export const notification = {
|
|
|
11
11
|
return;
|
|
12
12
|
try {
|
|
13
13
|
const notificationRecord = await db.transaction(async (trx) => {
|
|
14
|
-
const
|
|
15
|
-
|
|
14
|
+
const isMySql = trx.client?.config?.client?.includes?.('mysql');
|
|
15
|
+
const insertData = {
|
|
16
16
|
title: payload.title,
|
|
17
17
|
body: payload.body || "",
|
|
18
18
|
type: payload.type || "",
|
|
19
19
|
redirect: payload.redirect || "",
|
|
20
20
|
data: payload.data ?? {},
|
|
21
|
-
}
|
|
22
|
-
|
|
21
|
+
};
|
|
22
|
+
let n;
|
|
23
|
+
if (isMySql) {
|
|
24
|
+
const [insertId] = await trx('notifications').insert(insertData);
|
|
25
|
+
n = await trx('notifications').where('id', insertId).first();
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const [r] = await trx('notifications').insert(insertData).returning('*');
|
|
29
|
+
n = r;
|
|
30
|
+
}
|
|
23
31
|
await trx('notification_users').insert(userIds.map((uid) => ({
|
|
24
32
|
notification_id: n.id,
|
|
25
33
|
user_id: uid
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../src/notification/notification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAgBnC,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,yCAAyC;IACzC,qCAAqC;IACrC,yCAAyC;IACzC,IAAI,EAAE,KAAK,EAAE,OAA4B,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../src/notification/notification.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skalfa/skalfa-api-core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.12",
|
|
4
4
|
"description": "Core framework engine and foundational utilities for the Skalfa API backend.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
"author": "",
|
|
16
16
|
"license": "MIT",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@skalfa/skalfa-orm": "^1.0.
|
|
18
|
+
"@skalfa/skalfa-orm": "^1.0.7",
|
|
19
|
+
"knex": "^3.1.0",
|
|
19
20
|
"bcrypt": "^6.0.0",
|
|
20
21
|
"commander": "^12.1.0",
|
|
21
22
|
"dotenv": "^17.2.2",
|
|
@@ -14,16 +14,30 @@ export async function createAccessToken(userId: number, req: Request, permission
|
|
|
14
14
|
permissions = await getUserPermissions(userId)
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
const
|
|
17
|
+
const isMySql = db.client?.config?.client?.includes?.('mysql')
|
|
18
|
+
let tokenId: number
|
|
19
|
+
|
|
20
|
+
const insertData = {
|
|
18
21
|
user_id : userId,
|
|
19
22
|
token : hash,
|
|
20
23
|
agent : agent,
|
|
21
24
|
permissions : JSON.stringify(permissions),
|
|
22
25
|
created_at : new Date(),
|
|
23
|
-
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
if (isMySql) {
|
|
29
|
+
const [insertId] = await db("user_access_tokens").insert(insertData)
|
|
30
|
+
|
|
31
|
+
tokenId = insertId
|
|
32
|
+
} else {
|
|
33
|
+
const [row] = await db("user_access_tokens").insert(insertData).returning(["id"])
|
|
34
|
+
|
|
35
|
+
tokenId = row.id
|
|
36
|
+
}
|
|
24
37
|
|
|
25
38
|
return {
|
|
26
|
-
token : `${
|
|
27
|
-
tokenId :
|
|
39
|
+
token : `${tokenId}|${plain}`,
|
|
40
|
+
tokenId : tokenId,
|
|
28
41
|
}
|
|
42
|
+
|
|
29
43
|
}
|
|
@@ -1,35 +1,46 @@
|
|
|
1
1
|
import fs from "fs";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import
|
|
3
|
+
import { Knex } from "knex";
|
|
4
4
|
import { Command } from "commander";
|
|
5
5
|
import { conversion, logger } from "@utils";
|
|
6
6
|
import { runSeeder } from "./seeder";
|
|
7
7
|
|
|
8
|
+
const knex = require("knex");
|
|
9
|
+
|
|
8
10
|
declare module "knex" {
|
|
9
11
|
namespace Knex {
|
|
10
|
-
interface
|
|
12
|
+
interface TableBuilder {
|
|
11
13
|
foreignIdFor(tableName: string, column?: string): Knex.ColumnBuilder;
|
|
12
14
|
softDelete(column?: string): Knex.ColumnBuilder;
|
|
13
15
|
}
|
|
14
16
|
}
|
|
15
17
|
}
|
|
16
18
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
)
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
19
|
+
try {
|
|
20
|
+
knex.TableBuilder.extend("softDelete", function (
|
|
21
|
+
this: any,
|
|
22
|
+
column = `deleted_at`
|
|
23
|
+
) {
|
|
24
|
+
const table = this as any;
|
|
25
|
+
return table.timestamp(column).index();
|
|
26
|
+
});
|
|
27
|
+
} catch (e: any) {
|
|
28
|
+
if (!e.message?.includes("Can't extend")) throw e
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
try {
|
|
32
|
+
knex.TableBuilder.extend("foreignIdFor", function (
|
|
33
|
+
this: any,
|
|
34
|
+
tableName: string,
|
|
35
|
+
column = `${conversion.strSingular(tableName)}_id`
|
|
36
|
+
) {
|
|
37
|
+
const table = this as any;
|
|
38
|
+
return table.bigInteger(column).unsigned().index();
|
|
39
|
+
});
|
|
40
|
+
} catch (e: any) {
|
|
41
|
+
if (!e.message?.includes("Can't extend")) throw e
|
|
42
|
+
}
|
|
43
|
+
|
|
33
44
|
|
|
34
45
|
// =====================================>
|
|
35
46
|
// ## Command: migrate
|
|
@@ -31,7 +31,10 @@ export async function uploadFile(
|
|
|
31
31
|
const relativePath = `/${folder}/${fileName}`;
|
|
32
32
|
|
|
33
33
|
if (db && options) {
|
|
34
|
-
const
|
|
34
|
+
const isMySql = db.client?.config?.client?.includes?.('mysql')
|
|
35
|
+
let storageId: number
|
|
36
|
+
|
|
37
|
+
const insertData = {
|
|
35
38
|
user_id : options?.owner_id ?? null,
|
|
36
39
|
disk : disk,
|
|
37
40
|
path : relativePath,
|
|
@@ -39,11 +42,21 @@ export async function uploadFile(
|
|
|
39
42
|
filetype : file.type,
|
|
40
43
|
filesize : buffer.length,
|
|
41
44
|
created_at : new Date(),
|
|
42
|
-
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (isMySql) {
|
|
48
|
+
const [insertId] = await db("storages").insert(insertData)
|
|
49
|
+
|
|
50
|
+
storageId = insertId
|
|
51
|
+
} else {
|
|
52
|
+
const [storage] = await db("storages").insert(insertData).returning(["id"])
|
|
53
|
+
|
|
54
|
+
storageId = storage.id
|
|
55
|
+
}
|
|
43
56
|
|
|
44
57
|
if (options?.permissions?.length) {
|
|
45
58
|
const permissions = options.permissions.map(p => ({
|
|
46
|
-
storage_id :
|
|
59
|
+
storage_id : storageId,
|
|
47
60
|
user_id : p.user_id ?? null,
|
|
48
61
|
role_id : p.role_id ?? null,
|
|
49
62
|
created_at : new Date(),
|
|
@@ -3,8 +3,18 @@ import { logger } from '@utils'
|
|
|
3
3
|
import { errors } from './middleware'
|
|
4
4
|
|
|
5
5
|
export const ErrorHandler = (app: Elysia) => app.onError(({ code, set, error, request }) => {
|
|
6
|
+
const err = error as any
|
|
7
|
+
|
|
8
|
+
if (err.name === 'NotFoundError' || err.message === 'Record not found') {
|
|
9
|
+
set.status = 404
|
|
10
|
+
|
|
11
|
+
return { message: err.message }
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
|
|
6
15
|
if (code === 'NOT_FOUND') {
|
|
7
16
|
set.status = errors.notfound.status
|
|
17
|
+
|
|
8
18
|
return { message: errors.notfound.message }
|
|
9
19
|
}
|
|
10
20
|
|
|
@@ -15,6 +25,7 @@ export const ErrorHandler = (app: Elysia) => app.onError(({ code, set, error, re
|
|
|
15
25
|
const path = url.pathname
|
|
16
26
|
|
|
17
27
|
logger.error(`error: ${em}`, { error: em, reference: path })
|
|
28
|
+
|
|
18
29
|
return { message: em }
|
|
19
30
|
}
|
|
20
31
|
})
|
|
@@ -25,16 +25,28 @@ export const notification = {
|
|
|
25
25
|
if (userIds.length === 0) return;
|
|
26
26
|
|
|
27
27
|
try {
|
|
28
|
-
const notificationRecord = await db.transaction(async (trx) => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
.
|
|
28
|
+
const notificationRecord = await db.transaction(async (trx: any) => {
|
|
29
|
+
|
|
30
|
+
const isMySql = trx.client?.config?.client?.includes?.('mysql')
|
|
31
|
+
|
|
32
|
+
const insertData = {
|
|
33
|
+
title : payload.title,
|
|
34
|
+
body : payload.body || "",
|
|
35
|
+
type : payload.type || "",
|
|
36
|
+
redirect : payload.redirect || "",
|
|
37
|
+
data : payload.data ?? {},
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
let n: any
|
|
41
|
+
if (isMySql) {
|
|
42
|
+
const [insertId] = await trx('notifications').insert(insertData)
|
|
43
|
+
|
|
44
|
+
n = await trx('notifications').where('id', insertId).first()
|
|
45
|
+
} else {
|
|
46
|
+
const [r] = await trx('notifications').insert(insertData).returning('*')
|
|
47
|
+
|
|
48
|
+
n = r
|
|
49
|
+
}
|
|
38
50
|
|
|
39
51
|
await trx('notification_users').insert(
|
|
40
52
|
userIds.map((uid) => ({
|