@resolveio/server-lib 3.0.2-newrole → 3.0.3

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 (5) hide show
  1. package/collections/user.collection.js +34 -45
  2. package/fixtures/init.js +1 -1
  3. package/models/user.model.d.ts +5 -22
  4. package/package.json +1 -1
  5. package/server-app.js +1 -3
package/collections/user.collection.js CHANGED
@@ -21,6 +21,13 @@ var schema = {
21
21
  type: Date,
22
22
  optional: true
23
23
  },
24
+ readonly: {
25
+ type: Boolean,
26
+ optional: true
27
+ },
28
+ active: {
29
+ type: Boolean
30
+ },
24
31
  attempts: {
25
32
  type: Number,
26
33
  optional: true
@@ -57,78 +64,60 @@ var schema = {
57
64
  type: String
58
65
  },
59
66
  roles: {
60
- type: Object
61
- },
62
- 'roles.super_admin': {
63
- type: Boolean
64
- },
65
- 'roles.approvals': {
66
67
  type: Array
67
68
  },
68
- 'roles.approvals.$': {
69
- type: Object
70
- },
71
- 'roles.approvals.$.name': {
69
+ 'roles.$': {
72
70
  type: String
73
71
  },
74
- 'roles.approvals.$.type': {
75
- type: String
72
+ phonenumber: {
73
+ type: String,
74
+ optional: true
76
75
  },
77
- 'roles.approvals.$.accounting_code': {
78
- type: String
76
+ other: {
77
+ type: Object,
78
+ blackbox: true,
79
+ optional: true
79
80
  },
80
- 'roles.groups': {
81
- type: Array
81
+ assets: {
82
+ type: Array,
83
+ optional: true
82
84
  },
83
- 'roles.groups.$': {
85
+ 'assets.$': {
84
86
  type: Object
85
87
  },
86
- 'roles.groups.$.name': {
88
+ 'assets.$.type': {
87
89
  type: String
88
90
  },
89
- 'roles.groups.$.views': {
90
- type: Array
91
- },
92
- 'roles.groups.$.views.$': {
91
+ 'assets.$.id_asset': {
93
92
  type: String
94
93
  },
95
- 'roles.groups.$.yard': {
96
- type: String,
97
- optional: true
98
- },
99
- 'roles.notifications': {
100
- type: Array
101
- },
102
- 'roles.notifications.$': {
94
+ 'assets.$.asset_number': {
103
95
  type: String
104
96
  },
105
- 'roles.miscs': {
106
- type: Array
97
+ 'assets.$.ownership': {
98
+ type: String
107
99
  },
108
- 'roles.miscs.$': {
100
+ 'assets.$.ownership_driver': {
109
101
  type: String
110
102
  },
111
- active: Boolean,
112
- id_customer: {
113
- type: String,
114
- optional: true
103
+ 'assets.$.date_start': {
104
+ type: Date
115
105
  },
116
- customer: {
117
- type: String,
106
+ 'assets.$.date_end': {
107
+ type: Date,
118
108
  optional: true
119
109
  },
120
- customer_type: {
110
+ id_function: {
121
111
  type: String,
122
112
  optional: true
123
113
  },
124
- phonenumber: {
114
+ customer: {
125
115
  type: String,
126
- optional: true
116
+ optional: true,
127
117
  },
128
- other: {
129
- type: Object,
118
+ id_customer: {
119
+ type: String,
130
120
  optional: true,
131
- blackbox: true
132
121
  }
133
122
  };
134
123
  var DefaultSchema = new mongoose_1.Schema(schema, {
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 mongoose_1 = require("mongoose");
41
40
  var active_subscription_collection_1 = require("../collections/active-subscription.collection");
41
+ var mongoose_1 = require("mongoose");
42
42
  function loadServerInit() {
43
43
  return __awaiter(this, void 0, void 0, function () {
44
44
  var appVersion;
package/models/user.model.d.ts CHANGED
@@ -1,31 +1,14 @@
1
1
  import { CollectionDocument } from './collection-document.model';
2
2
  export interface UserModel extends CollectionDocument {
3
+ attempts: number;
4
+ last: Date;
5
+ services?: any;
3
6
  fullname: string;
4
- roles: UserRoleModel;
5
7
  username?: string;
6
8
  email?: string;
9
+ roles?: string[];
7
10
  active?: boolean;
8
- services?: any;
9
- id_customer?: string;
10
- customer?: string;
11
- customer_type?: string;
11
+ readonly?: boolean;
12
12
  phonenumber?: string;
13
13
  other?: object;
14
14
  }
15
- export interface UserRoleModel {
16
- super_admin: boolean;
17
- approvals: UserRoleApprovalModel[];
18
- groups: UserRoleGroupModel[];
19
- notifications: string[];
20
- miscs: string[];
21
- }
22
- export interface UserRoleApprovalModel {
23
- accounting_code: string;
24
- type: string;
25
- name: string;
26
- }
27
- export interface UserRoleGroupModel {
28
- name: string;
29
- views: string[];
30
- yard?: string;
31
- }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "3.0.2-newrole",
3
+ "version": "3.0.3",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {
package/server-app.js CHANGED
@@ -406,7 +406,6 @@ var ResolveIOMainServer = /** @class */ (function () {
406
406
  query = { $and: [
407
407
  { id_user: ws['id_user'] },
408
408
  { message_id: messageId },
409
- { data: JSON.stringify(data) },
410
409
  { date: messageDate }
411
410
  ] };
412
411
  if (method !== 'updateDocumentOffline' && method !== 'updateDocumentPropsOffline') {
@@ -440,7 +439,6 @@ var ResolveIOMainServer = /** @class */ (function () {
440
439
  id_user: ws['id_user'],
441
440
  message_id: messageId,
442
441
  method: method,
443
- data: JSON.stringify(data),
444
442
  date: messageDate
445
443
  })];
446
444
  case 2:
@@ -529,7 +527,7 @@ var ResolveIOMainServer = /** @class */ (function () {
529
527
  { id_user: ws['id_user'] },
530
528
  { message_id: messageId },
531
529
  { method: method },
532
- { data: JSON.stringify(data) }
530
+ { date: messageDate }
533
531
  ] }).exec(function (err, res) {
534
532
  if (res) {
535
533
  var serverRes = {