@steedos/objectql 2.1.84 → 2.1.87
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/lib/util/convert.js +1 -0
- package/lib/util/convert.js.map +1 -1
- package/package.json +8 -12
- package/src/util/convert.ts +1 -0
- package/server.js +0 -48
- package/src/server.js +0 -40
package/lib/util/convert.js
CHANGED
|
@@ -25,6 +25,7 @@ function objectToJson(objectConfig) {
|
|
|
25
25
|
var _todo = action === null || action === void 0 ? void 0 : action.todo;
|
|
26
26
|
if (_todo && _.isFunction(_todo)) {
|
|
27
27
|
action.todo = _todo.toString();
|
|
28
|
+
action._todo = _todo.toString();
|
|
28
29
|
}
|
|
29
30
|
var _visible = action === null || action === void 0 ? void 0 : action.visible;
|
|
30
31
|
if (_visible && _.isFunction(_visible)) {
|
package/lib/util/convert.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/util/convert.ts"],"names":[],"mappings":";;;AAAA,0BAA4B;AAE5B,SAAS,OAAO,CAAC,MAAM;IACnB,IAAI;QACA,OAAO,IAAI,CAAC,MAAM,CAAC,CAAA;KACtB;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;KAC5B;AACL,CAAC;AAAA,CAAC;AAEF,SAAgB,YAAY,CAAC,cAAc;IACvC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,UAAC,KAAK,EAAE,GAAG;QACxC,IAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QAC1C,IAAI,aAAa,IAAI,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC5C,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,WAAI,aAAa,MAAG,CAAC,CAAC;SACtD;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAPD,oCAOC;AAED,SAAgB,YAAY,CAAC,YAAY;IACrC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,UAAC,MAAM,EAAE,GAAG;QACxC,IAAM,KAAK,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA;QAC1B,IAAI,KAAK,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/util/convert.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.1.
|
|
4
|
+
"version": "2.1.87",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@salesforce/kit": "^1.0.4",
|
|
19
19
|
"@salesforce/ts-types": "^1.1.1",
|
|
20
|
-
"@steedos/filters": "2.1.
|
|
21
|
-
"@steedos/formula": "2.1.
|
|
22
|
-
"@steedos/metadata-core": "2.1.
|
|
20
|
+
"@steedos/filters": "2.1.87",
|
|
21
|
+
"@steedos/formula": "2.1.87",
|
|
22
|
+
"@steedos/metadata-core": "2.1.87",
|
|
23
23
|
"@steedos/odata-v4-typeorm": "^1.20.1",
|
|
24
|
-
"@steedos/schemas": "2.1.
|
|
25
|
-
"@steedos/standard-objects": "2.1.
|
|
24
|
+
"@steedos/schemas": "2.1.87",
|
|
25
|
+
"@steedos/standard-objects": "2.1.87",
|
|
26
26
|
"app-root-path": "^2.2.1",
|
|
27
27
|
"body-parser": "^1.18.1",
|
|
28
28
|
"bunyan-sfdx-no-dtrace": "^1.8.2",
|
|
@@ -31,12 +31,8 @@
|
|
|
31
31
|
"cookies": "^0.6.1",
|
|
32
32
|
"eval": "^0.1.4",
|
|
33
33
|
"express": "^4.15.4",
|
|
34
|
-
"express-graphql": "^0.7.1",
|
|
35
34
|
"fibers": "^4.0.3",
|
|
36
35
|
"globby": "^9.1.0",
|
|
37
|
-
"graphql": "^14.1.1",
|
|
38
|
-
"graphql-iso-date": "^3.6.1",
|
|
39
|
-
"graphql-type-json": "^0.2.2",
|
|
40
36
|
"jsen": "^0.6.6",
|
|
41
37
|
"lodash": "^4.17.15",
|
|
42
38
|
"mingo": "^4.2.0",
|
|
@@ -53,7 +49,7 @@
|
|
|
53
49
|
"devDependencies": {
|
|
54
50
|
"@salesforce/dev-config": "^1.4.4",
|
|
55
51
|
"@salesforce/dev-scripts": "0.3.12",
|
|
56
|
-
"@steedos/meteor-bundle-runner": "2.1.
|
|
52
|
+
"@steedos/meteor-bundle-runner": "2.1.87",
|
|
57
53
|
"@types/chai": "^4.1.7",
|
|
58
54
|
"@types/chai-as-promised": "7.1.0",
|
|
59
55
|
"@types/express": "^4.16.1",
|
|
@@ -77,5 +73,5 @@
|
|
|
77
73
|
"publishConfig": {
|
|
78
74
|
"access": "public"
|
|
79
75
|
},
|
|
80
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "c57f4669ce0f9c2b57d108e963b1715bf2ba7ab3"
|
|
81
77
|
}
|
package/src/util/convert.ts
CHANGED
|
@@ -22,6 +22,7 @@ export function objectToJson(objectConfig) {
|
|
|
22
22
|
const _todo = action?.todo
|
|
23
23
|
if (_todo && _.isFunction(_todo)) {
|
|
24
24
|
action.todo = _todo.toString()
|
|
25
|
+
action._todo = _todo.toString()
|
|
25
26
|
}
|
|
26
27
|
const _visible = action?.visible
|
|
27
28
|
if (_visible && _.isFunction(_visible)) {
|
package/server.js
DELETED
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
var objectql = require("@steedos/objectql")
|
|
2
|
-
var _ = require('underscore');
|
|
3
|
-
const graphqlHTTP = require('express-graphql');
|
|
4
|
-
const Cookies = require('cookies');
|
|
5
|
-
const steedosAuth = require("@steedos/auth");
|
|
6
|
-
|
|
7
|
-
// const schemaConfig = require(process.cwd() + '/steedos.config.js')
|
|
8
|
-
|
|
9
|
-
let steedosSchema = objectql.getSteedosSchema();
|
|
10
|
-
steedosSchema.addDataSource('default', {
|
|
11
|
-
driver: 'mongo',
|
|
12
|
-
url: 'mongodb://127.0.0.1/qhd-beta',
|
|
13
|
-
objectFiles: [__dirname + "/../standard-objects"]
|
|
14
|
-
})
|
|
15
|
-
|
|
16
|
-
let express = require('express');
|
|
17
|
-
let app = express();
|
|
18
|
-
router = express.Router();
|
|
19
|
-
|
|
20
|
-
router.use('/:dataSourceName/:spaceId', async function (req, res, next) {
|
|
21
|
-
var authToken, user, cookies;
|
|
22
|
-
cookies = new Cookies(req, res);
|
|
23
|
-
authToken = req.headers['x-auth-token'] || cookies.get("X-Auth-Token");
|
|
24
|
-
let spaceId = req.params.spaceId;
|
|
25
|
-
user = null;
|
|
26
|
-
if (authToken) {
|
|
27
|
-
user = await steedosAuth.getSession(authToken, spaceId);
|
|
28
|
-
}
|
|
29
|
-
if (user) {
|
|
30
|
-
// 因为没有spaceId,无法获取roles，暂不启用权限校验
|
|
31
|
-
req.userSession = user;
|
|
32
|
-
return next();
|
|
33
|
-
} else {
|
|
34
|
-
return res.status(401).send({
|
|
35
|
-
errors: [
|
|
36
|
-
{
|
|
37
|
-
'message': 'You must be logged in to do this.'
|
|
38
|
-
}
|
|
39
|
-
]
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
})
|
|
43
|
-
|
|
44
|
-
app.use('/graphql', router);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
app.listen(process.env.PORT || 5000)
|
|
48
|
-
console.log('app listenning porst 5000!');
|
package/src/server.js
DELETED
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
var server = require('@steedos/meteor-bundle-runner');
|
|
2
|
-
server.Fiber(function () {
|
|
3
|
-
server.Profile.run("Server startup", async function () {
|
|
4
|
-
server.loadServerBundles();
|
|
5
|
-
server.callStartupHooks();
|
|
6
|
-
try {
|
|
7
|
-
|
|
8
|
-
objectql = require("@steedos/objectql")
|
|
9
|
-
newObjects = {}
|
|
10
|
-
objectsRolesPermission = {}
|
|
11
|
-
_.each(Creator.Objects, function (obj, key) {
|
|
12
|
-
if (/^[_a-zA-Z][_a-zA-Z0-9]*$/.test(key)) {
|
|
13
|
-
newObjects[key] = obj
|
|
14
|
-
}
|
|
15
|
-
objectsRolesPermission[key] = obj.permission_set
|
|
16
|
-
})
|
|
17
|
-
|
|
18
|
-
steedosSchema = new objectql.SteedosSchema({
|
|
19
|
-
datasources: {
|
|
20
|
-
default: {
|
|
21
|
-
driver: 'meteor-mongo',
|
|
22
|
-
objects: newObjects,
|
|
23
|
-
objectsRolesPermission: objectsRolesPermission
|
|
24
|
-
}
|
|
25
|
-
},
|
|
26
|
-
getRoles: function (userId) {
|
|
27
|
-
console.log('userId: ', userId)
|
|
28
|
-
return ['admin']
|
|
29
|
-
}
|
|
30
|
-
})
|
|
31
|
-
|
|
32
|
-
} catch (error) {
|
|
33
|
-
console.log(error)
|
|
34
|
-
}
|
|
35
|
-
server.Fiber(function () {
|
|
36
|
-
server.runMain();
|
|
37
|
-
}).run()
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
}).run();
|