isite 2024.12.2 → 2024.12.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.
- package/apps/client-side/site_files/css/effect.css +2 -1
- package/apps/client-side/site_files/css/form.css +4 -0
- package/apps/client-side/site_files/css/layout.css +6 -1
- package/apps/client-side/site_files/js/ref.js +0 -2
- package/apps/client-side/site_files/js/ref.min.js +0 -1
- package/lib/routing.js +660 -623
- package/lib/security.js +6 -3
- package/lib/session.js +4 -4
- package/lib/sessions.js +12 -11
- package/package.json +1 -1
package/lib/security.js
CHANGED
|
@@ -491,6 +491,8 @@ module.exports = function init(____0) {
|
|
|
491
491
|
$req.session.user = _user;
|
|
492
492
|
$req.session.user_id = _user.id;
|
|
493
493
|
$req.session.$save();
|
|
494
|
+
} else {
|
|
495
|
+
console.log('$req Not Exists in security.login');
|
|
494
496
|
}
|
|
495
497
|
callback(null, _user);
|
|
496
498
|
____0.call('user login', {
|
|
@@ -783,15 +785,16 @@ module.exports = function init(____0) {
|
|
|
783
785
|
}
|
|
784
786
|
}
|
|
785
787
|
|
|
788
|
+
if (user && user.$permissions && user.$permissions.some((p) => p == '*')) {
|
|
789
|
+
return ok;
|
|
790
|
+
}
|
|
791
|
+
|
|
786
792
|
if (user && user.$permissions) {
|
|
787
793
|
for (var i = 0; i < user.$permissions.length; i++) {
|
|
788
794
|
var p = user.$permissions[i];
|
|
789
795
|
if (permission == p) {
|
|
790
796
|
return ok;
|
|
791
797
|
}
|
|
792
|
-
if (p == '*') {
|
|
793
|
-
return ok;
|
|
794
|
-
}
|
|
795
798
|
}
|
|
796
799
|
}
|
|
797
800
|
|
package/lib/session.js
CHANGED
|
@@ -123,18 +123,18 @@ module.exports = function init(req, res, ____0, callback) {
|
|
|
123
123
|
|
|
124
124
|
AssignFeatures();
|
|
125
125
|
|
|
126
|
-
|
|
126
|
+
// must get user every request ...
|
|
127
|
+
if (session.user_id) {
|
|
127
128
|
____0.security.getUser(
|
|
128
129
|
{
|
|
129
130
|
id: session.user_id,
|
|
130
131
|
},
|
|
131
132
|
function (err, user) {
|
|
132
133
|
if (!err && user) {
|
|
133
|
-
|
|
134
|
-
if (session.user) {
|
|
134
|
+
if (user) {
|
|
135
135
|
req.features.push('login');
|
|
136
136
|
}
|
|
137
|
-
|
|
137
|
+
session.user = user;
|
|
138
138
|
callback(session);
|
|
139
139
|
session.$save();
|
|
140
140
|
}
|
package/lib/sessions.js
CHANGED
|
@@ -83,20 +83,22 @@ module.exports = function init(____0) {
|
|
|
83
83
|
};
|
|
84
84
|
|
|
85
85
|
____0.getSession = sessions.attach = function (req, callback) {
|
|
86
|
+
|
|
86
87
|
let session = { accessToken: req.headers['Access-Token'] || req.headers['access-token'] || req.query['access-token'] || req.cookie('access_token') };
|
|
87
88
|
|
|
88
89
|
callback = callback || function () {};
|
|
89
90
|
|
|
90
|
-
if (req.headers['connection'] == 'upgrade' && !session.accessToken) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
91
|
+
// if (req.headers['connection'] == 'upgrade' && !session.accessToken) {
|
|
92
|
+
// session.accessToken = req.host + req.ip + new Date().getTime().toString() + '_' + Math.random();
|
|
93
|
+
// session.accessToken = ____0.x0md50x(session.accessToken);
|
|
94
|
+
// session.tmp = true;
|
|
95
|
+
// session.language = ____0.options.language;
|
|
96
|
+
// session.$new = !0;
|
|
97
|
+
// return callback(session);
|
|
98
|
+
// }
|
|
97
99
|
|
|
98
100
|
if (session.accessToken) {
|
|
99
|
-
let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken
|
|
101
|
+
let index = sessions.list.findIndex((s) => s && s.accessToken && s.accessToken == session.accessToken);
|
|
100
102
|
if (index !== -1) {
|
|
101
103
|
sessions.list[index].$time = new Date().getTime();
|
|
102
104
|
sessions.list[index].requestesCount++;
|
|
@@ -104,7 +106,7 @@ module.exports = function init(____0) {
|
|
|
104
106
|
sessions.list[index].lang = sessions.list[index].language.id;
|
|
105
107
|
callback(sessions.list[index]);
|
|
106
108
|
} else {
|
|
107
|
-
if (____0.options.session.storage
|
|
109
|
+
if (____0.options.session.storage == 'mongodb') {
|
|
108
110
|
sessions.$collection.find(
|
|
109
111
|
{ accessToken: session.accessToken },
|
|
110
112
|
(err, doc) => {
|
|
@@ -114,7 +116,6 @@ module.exports = function init(____0) {
|
|
|
114
116
|
if (!doc.language || !doc.language.id) {
|
|
115
117
|
doc.language = ____0.options.language;
|
|
116
118
|
}
|
|
117
|
-
|
|
118
119
|
doc.lang = doc.language.id;
|
|
119
120
|
sessions.list.push(doc);
|
|
120
121
|
callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
|
|
@@ -142,8 +143,8 @@ module.exports = function init(____0) {
|
|
|
142
143
|
session.requestesCount = 1;
|
|
143
144
|
session.createdTime = new Date().getTime();
|
|
144
145
|
session.$time = new Date().getTime();
|
|
145
|
-
callback(session);
|
|
146
146
|
sessions.list.push(session);
|
|
147
|
+
callback(sessions.list[sessions.list.findIndex((s) => s && s.accessToken == session.accessToken)]);
|
|
147
148
|
}
|
|
148
149
|
}
|
|
149
150
|
} else {
|