@resolveio/server-lib 4.4.0 → 4.4.2-newrole

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.
Files changed (4) hide show
  1. package/collections/file.collection.js +5 -0
  2. package/collections/user.collection.js +44 -32
  3. package/fixtures/init.js +1 -1
  4. package/package.json +5 -5
package/collections/file.collection.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  var mongoose_1 = require("mongoose");
4
4
  var simpl_schema_1 = require("simpl-schema");
5
5
  var index_1 = require("../index");
6
+ var schema_report_builder_1 = require("../util/schema-report-builder");
6
7
  var schema = {
7
8
  _id: {
8
9
  type: String,
@@ -71,3 +72,7 @@ exports.SupportFileVersions = null;
71
72
  if (index_1.ResolveIOServer.getSupportDB()) {
72
73
  exports.SupportFileVersions = index_1.ResolveIOServer.getSupportDB().model(exports.Files['versionCollection'], VersionSchema);
73
74
  }
75
+ //------------- Report Builder Schema
76
+ var rbLookups = [];
77
+ var rbSchema = Object.assign(schema, schema_report_builder_1.buildRbLookups(rbLookups, DefaultSchema, []));
78
+ exports.Files['rbSchema'] = schema_report_builder_1.buildRbSchema(rbSchema);
package/collections/user.collection.js CHANGED
@@ -4,6 +4,7 @@ var mongoose_1 = require("mongoose");
4
4
  var passportLocalMongoose = require("passport-local-mongoose");
5
5
  var simpl_schema_1 = require("simpl-schema");
6
6
  var index_1 = require("../index");
7
+ var schema_report_builder_1 = require("../util/schema-report-builder");
7
8
  var schema = {
8
9
  _id: {
9
10
  type: String,
@@ -21,13 +22,6 @@ var schema = {
21
22
  type: Date,
22
23
  optional: true
23
24
  },
24
- readonly: {
25
- type: Boolean,
26
- optional: true
27
- },
28
- active: {
29
- type: Boolean
30
- },
31
25
  attempts: {
32
26
  type: Number,
33
27
  optional: true
@@ -64,53 +58,67 @@ var schema = {
64
58
  type: String
65
59
  },
66
60
  roles: {
61
+ type: Object
62
+ },
63
+ 'roles.super_admin': {
64
+ type: Boolean
65
+ },
66
+ 'roles.approvals': {
67
67
  type: Array
68
68
  },
69
- 'roles.$': {
69
+ 'roles.approvals.$': {
70
+ type: Object
71
+ },
72
+ 'roles.approvals.$.name': {
70
73
  type: String
71
74
  },
72
- phonenumber: {
73
- type: String,
74
- optional: true
75
+ 'roles.approvals.$.type': {
76
+ type: String
75
77
  },
76
- other: {
77
- type: Object,
78
- blackbox: true,
79
- optional: true
78
+ 'roles.approvals.$.accounting_code': {
79
+ type: String
80
80
  },
81
- assets: {
82
- type: Array,
83
- optional: true
81
+ 'roles.groups': {
82
+ type: Array
84
83
  },
85
- 'assets.$': {
84
+ 'roles.groups.$': {
86
85
  type: Object
87
86
  },
88
- 'assets.$.type': {
87
+ 'roles.groups.$.name': {
89
88
  type: String
90
89
  },
91
- 'assets.$.id_asset': {
92
- type: String
90
+ 'roles.groups.$.views': {
91
+ type: Array
93
92
  },
94
- 'assets.$.asset_number': {
93
+ 'roles.groups.$.views.$': {
95
94
  type: String
96
95
  },
97
- 'assets.$.ownership': {
98
- type: String
96
+ 'roles.groups.$.yard': {
97
+ type: String,
98
+ optional: true
99
+ },
100
+ 'roles.notifications': {
101
+ type: Array
99
102
  },
100
- 'assets.$.ownership_driver': {
103
+ 'roles.notifications.$': {
101
104
  type: String
102
105
  },
103
- 'assets.$.date_start': {
104
- type: Date
106
+ 'roles.miscs': {
107
+ type: Array
105
108
  },
106
- 'assets.$.date_end': {
107
- type: Date,
108
- optional: true
109
+ 'roles.miscs.$': {
110
+ type: String
109
111
  },
110
- id_function: {
112
+ active: Boolean,
113
+ phonenumber: {
111
114
  type: String,
112
115
  optional: true
113
116
  },
117
+ other: {
118
+ type: Object,
119
+ optional: true,
120
+ blackbox: true
121
+ },
114
122
  customers: {
115
123
  type: Array,
116
124
  optional: true,
@@ -181,3 +189,7 @@ var VersionSchema = new mongoose_1.Schema(schema, {
181
189
  });
182
190
  exports.Users['versionCollection'] = 'users.versions';
183
191
  exports.UserVersions = index_1.ResolveIOServer.getMainDB().model(exports.Users['versionCollection'], VersionSchema);
192
+ //------------- Report Builder Schema
193
+ var rbLookups = [];
194
+ var rbSchema = Object.assign(schema, schema_report_builder_1.buildRbLookups(rbLookups, DefaultSchema, []));
195
+ exports.Users['rbSchema'] = schema_report_builder_1.buildRbSchema(rbSchema);
package/fixtures/init.js CHANGED
@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
38
  var app_version_collection_1 = require("../collections/app-version.collection");
39
39
  var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
40
- var active_subscription_collection_1 = require("../collections/active-subscription.collection");
41
40
  var mongoose_1 = require("mongoose");
41
+ var active_subscription_collection_1 = require("../collections/active-subscription.collection");
42
42
  function loadServerInit() {
43
43
  return __awaiter(this, void 0, void 0, function () {
44
44
  var appVersion;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "4.4.0",
3
+ "version": "4.4.2-newrole",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {
@@ -20,7 +20,7 @@
20
20
  "forever": "0.15.3",
21
21
  "handlebars": "4.1.2",
22
22
  "imap": "0.8.19",
23
- "json2csv": "^4.5.2",
23
+ "json2csv": "4.5.2",
24
24
  "jsonwebtoken": "8.5.1",
25
25
  "moment": "2.24.0",
26
26
  "moment-timezone": "0.5.25",
@@ -44,7 +44,7 @@
44
44
  },
45
45
  "devDependencies": {
46
46
  "@types/aws-sdk": "2.7.0",
47
- "@types/core-js": "^2.5.2",
47
+ "@types/core-js": "2.5.2",
48
48
  "@types/express": "4.17.0",
49
49
  "@types/handlebars": "4.1.0",
50
50
  "@types/imap": "0.8.29",
@@ -62,11 +62,11 @@
62
62
  "gulp-nodemon": "2.4.2",
63
63
  "gulp-rename": "1.4.0",
64
64
  "gulp-shell": "0.7.1",
65
- "gulp-sourcemaps": "^2.6.5",
65
+ "gulp-sourcemaps": "2.6.5",
66
66
  "gulp-typescript": "5.0.1",
67
67
  "gulp-uglify": "3.0.2",
68
68
  "gulp-zip": "5.0.0",
69
- "merge2": "^1.2.3",
69
+ "merge2": "1.2.3",
70
70
  "mkdirs": "0.0.2",
71
71
  "typescript": "3.4.5"
72
72
  }