@steedos/auth 2.2.38 → 2.2.41
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/spaceUserSession.js
CHANGED
|
@@ -50,7 +50,7 @@ async function getObjectDataByIds(objectName, ids, fields) {
|
|
|
50
50
|
if (fields && fields.length > 0) {
|
|
51
51
|
query['fields'] = fields;
|
|
52
52
|
}
|
|
53
|
-
return await (0, objectql_1.getSteedosSchema)().getObject(objectName).
|
|
53
|
+
return await (0, objectql_1.getSteedosSchema)().getObject(objectName).directFind(query);
|
|
54
54
|
}
|
|
55
55
|
async function getUserPermissionShares(spaceUser) {
|
|
56
56
|
let userFilters = [`(users eq '${spaceUser.user}')`];
|
|
@@ -83,11 +83,11 @@ async function getSpaceUserSession(spaceId, userId) {
|
|
|
83
83
|
let expiredAt = new Date().getTime() + sessionCacheInMinutes * 60 * 1000;
|
|
84
84
|
let su = null;
|
|
85
85
|
let suFields = ['_id', 'space', 'company_id', 'company_ids', 'organization', 'organizations', 'organizations_parents', 'user'];
|
|
86
|
-
let spaceUser = await (0, objectql_1.getSteedosSchema)().getObject('space_users').find({ filters: `(space eq '${spaceId}') and (user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
87
86
|
// 如果spaceid和user不匹配，则取用户的第一个工作区
|
|
88
|
-
let spaceUsers = await (0, objectql_1.getSteedosSchema)().getObject('space_users').
|
|
89
|
-
|
|
90
|
-
|
|
87
|
+
let spaceUsers = await (0, objectql_1.getSteedosSchema)().getObject('space_users').directFind({ filters: `(user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
88
|
+
const findSpaceUser = _.find(spaceUsers, (spaceUser) => { return spaceUser.space === spaceId; });
|
|
89
|
+
if (findSpaceUser) {
|
|
90
|
+
su = findSpaceUser;
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
93
|
su = spaceUsers[0];
|
|
@@ -99,12 +99,12 @@ async function getSpaceUserSession(spaceId, userId) {
|
|
|
99
99
|
let profile = await getSpaceUserProfile(userId, userSpaceId);
|
|
100
100
|
spaceSession = { roles: roles, profile: profile, expiredAt: expiredAt };
|
|
101
101
|
spaceSession.spaceId = userSpaceId;
|
|
102
|
-
spaceSession.
|
|
103
|
-
spaceSession.
|
|
104
|
-
spaceSession.company = (await getObjectDataByIds('company', [su.company_id], ['name', 'organization']))[0];
|
|
102
|
+
spaceSession.spaces = await getObjectDataByIds('spaces', userSpaceIds, ['name', 'admins']);
|
|
103
|
+
spaceSession.space = _.find(spaceSession.spaces, (record) => { return record._id === userSpaceId; });
|
|
105
104
|
spaceSession.companies = await getObjectDataByIds('company', su.company_ids, ['name', 'organization']);
|
|
106
|
-
spaceSession.
|
|
105
|
+
spaceSession.company = _.find(spaceSession.companies, (record) => { return record._id === su.company_id; });
|
|
107
106
|
spaceSession.organizations = await getObjectDataByIds('organizations', su.organizations, ['name', 'fullname', 'company_id']);
|
|
107
|
+
spaceSession.organization = _.find(spaceSession.organizations, (record) => { return record._id === su.organization; });
|
|
108
108
|
if (spaceSession.space && spaceSession.space.admins) {
|
|
109
109
|
spaceSession.is_space_admin = spaceSession.space.admins.indexOf(userId) > -1;
|
|
110
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"spaceUserSession.js","sourceRoot":"","sources":["../src/spaceUserSession.ts"],"names":[],"mappings":";;;AAAA,gDAAyF;AACzF,mCAAmC;AACnC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAChC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAElE,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,OAAe;IAC9D,IAAI,OAAO,GAAG,cAAc,OAAO,oBAAoB,MAAM,IAAI,CAAC;IAClE,IAAI,SAAS,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAClH,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;KAC9B;AACL,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,OAAe;IACvD,IAAI,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,KAAK,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClG,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACxC,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;KACrB;IAED,IAAI,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,OAAO,EAAE;QACT,KAAK,GAAG,CAAC,OAAO,CAAC,CAAA;KACpB;IAED,IAAI,OAAO,GAAG,cAAc,OAAO,qBAAqB,MAAM,IAAI,CAAC;IACnE,IAAI,eAAe,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9H,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACxB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;YACtC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACtB;IACL,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,UAAkB,EAAE,GAAa,EAAE,MAAiB;IAClF,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,OAAO,EAAE,CAAA;KACZ;IAED,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,EAAE;QACjC,IAAI,CAAC,EAAE,EAAE;YACL,OAAO,EAAE,CAAA;SACZ;QACD,OAAO,YAAY,EAAE,IAAI,CAAA;IAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,EAAE,CAAA;KACZ;IAED,IAAI,KAAK,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IACjC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7B,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;KAC5B;IAED,OAAO,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;AAC3E,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,SAAS;IAC5C,IAAI,WAAW,GAAG,CAAC,cAAc,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC;IACrD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,EAAE;QAC9C,WAAW,CAAC,IAAI,CAAC,sBAAsB,KAAK,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAA;IACF,IAAI,OAAO,GAAG,KAAK,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,SAAS,CAAC,KAAK,IAAI,CAAA;IACjF,OAAO,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;AAC9H,CAAC;AAED,SAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM;IACpD,IAAI,gBAAgB,GAAG,IAAA,oBAAS,EAAC,kBAAkB,EAAE,GAAG,OAAO,IAAI,MAAM,EAAE,CAAC,CAAA;IAC5E,IAAI,CAAC,gBAAgB,EAAE;QACnB,OAAO,IAAI,CAAC;KACf;IACD,IAAI,IAAA,iBAAS,EAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;QACvC,IAAA,uBAAY,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;KACf;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAVD,4DAUC;AAED,SAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB;IACpE,gBAAgB,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,MAAM,EAAE,CAAA;IAC7C,IAAA,oBAAS,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;AACpD,CAAC;AAHD,wDAGC;AAGM,KAAK,UAAU,mBAAmB,CAAC,OAAO,EAAE,MAAM;IACrD,IAAI,YAAY,GAAQ,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,YAAY,EAAE;QACf,IAAI,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,qBAAqB,GAAG,EAAE,GAAG,IAAI,CAAC;QACzE,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,IAAI,QAAQ,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC;QAE/H,gCAAgC;QAChC,IAAI,UAAU,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,aAAa,MAAM,gCAAgC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClK,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,SAAS,EAAC,EAAE,GAAE,OAAO,SAAS,CAAC,KAAK,KAAK,OAAO,CAAA,CAAC,CAAC,CAAC,CAAA;QAC7F,IAAG,aAAa,EAAC;YACb,EAAE,GAAG,aAAa,CAAC;SACtB;aAAI;YACD,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;SACtB;QAED,IAAI,EAAE,EAAE;YACJ,IAAI,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC;YAC3B,IAAI,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAChD,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YACpD,IAAI,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC7D,YAAY,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,CAAC;YACvE,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC;YACnC,YAAY,CAAC,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC3F,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,MAAM,EAAC,EAAE,GAAE,OAAO,MAAM,CAAC,GAAG,KAAK,WAAW,CAAA,CAAC,CAAC,CAAC,CAAC;YAElG,YAAY,CAAC,SAAS,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;YACvG,YAAY,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAC,EAAE,GAAE,OAAO,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,UAAU,CAAA,CAAC,CAAC,CAAC,CAAC;YAEzG,YAAY,CAAC,aAAa,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;YAC7H,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,MAAM,EAAC,EAAE,GAAE,OAAO,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,YAAY,CAAA,CAAC,CAAC,CAAC,CAAC;YAEpH,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjD,YAAY,CAAC,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aAChF;YACD,IAAI,YAAY,CAAC,OAAO,EAAE;gBACtB,YAAY,CAAC,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;aACtD;YACD,IAAI,YAAY,CAAC,SAAS,EAAE;gBACxB,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,OAAY,IAAI,OAAO,OAAO,CAAC,GAAG,CAAA,CAAC,CAAC,CAAC,CAAC;aACzG;YACD,YAAY,CAAC,iBAAiB,GAAG,MAAM,uBAAuB,CAAC,EAAE,CAAC,CAAC;YACnE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YACtD,OAAO,YAAY,CAAC;SACvB;aAAM;YACH,YAAY,GAAG,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SAC7D;KACJ;IACD,OAAO,YAAY,CAAC;AACxB,CAAC;AAjDD,kDAiDC;AAEM,KAAK,UAAU,gCAAgC,CAAC,OAAO,EAAE,MAAM;IAClE,IAAI,YAAY,GAAQ,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClE,IAAI,YAAY,EAAE;QACd,YAAY,CAAC,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,4EAOC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/auth",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.41",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"watch": "tsc --watch",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@steedos/objectql": "2.2.
|
|
17
|
+
"@steedos/objectql": "2.2.41",
|
|
18
18
|
"cookies": "^0.7.3",
|
|
19
19
|
"express": "^4.16.4",
|
|
20
20
|
"jsonwebtoken": "^8.5.1",
|
|
@@ -32,5 +32,5 @@
|
|
|
32
32
|
"ts-node": "^8.0.3",
|
|
33
33
|
"typescript": "3.5.3"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "ded6a9013bea822bc4cf81c98e60a3d829bed858"
|
|
36
36
|
}
|
package/src/spaceUserSession.ts
CHANGED
|
@@ -58,7 +58,7 @@ async function getObjectDataByIds(objectName: string, ids: string[], fields?: st
|
|
|
58
58
|
query['fields'] = fields;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
return await getSteedosSchema().getObject(objectName).
|
|
61
|
+
return await getSteedosSchema().getObject(objectName).directFind(query)
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
async function getUserPermissionShares(spaceUser) {
|
|
@@ -94,12 +94,13 @@ export async function getSpaceUserSession(spaceId, userId) {
|
|
|
94
94
|
let expiredAt = new Date().getTime() + sessionCacheInMinutes * 60 * 1000;
|
|
95
95
|
let su = null;
|
|
96
96
|
let suFields = ['_id', 'space', 'company_id', 'company_ids', 'organization', 'organizations', 'organizations_parents', 'user'];
|
|
97
|
-
|
|
97
|
+
|
|
98
98
|
// 如果spaceid和user不匹配，则取用户的第一个工作区
|
|
99
|
-
let spaceUsers = await getSteedosSchema().getObject('space_users').
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
let spaceUsers = await getSteedosSchema().getObject('space_users').directFind({ filters: `(user eq '${userId}') and (user_accepted eq true)`, fields: suFields });
|
|
100
|
+
const findSpaceUser = _.find(spaceUsers, (spaceUser)=>{ return spaceUser.space === spaceId })
|
|
101
|
+
if(findSpaceUser){
|
|
102
|
+
su = findSpaceUser;
|
|
103
|
+
}else{
|
|
103
104
|
su = spaceUsers[0];
|
|
104
105
|
}
|
|
105
106
|
|
|
@@ -110,12 +111,15 @@ export async function getSpaceUserSession(spaceId, userId) {
|
|
|
110
111
|
let profile = await getSpaceUserProfile(userId, userSpaceId);
|
|
111
112
|
spaceSession = { roles: roles, profile: profile,expiredAt: expiredAt };
|
|
112
113
|
spaceSession.spaceId = userSpaceId;
|
|
113
|
-
spaceSession.
|
|
114
|
-
spaceSession.
|
|
115
|
-
|
|
114
|
+
spaceSession.spaces = await getObjectDataByIds('spaces', userSpaceIds, ['name', 'admins']);
|
|
115
|
+
spaceSession.space = _.find(spaceSession.spaces, (record)=>{ return record._id === userSpaceId });
|
|
116
|
+
|
|
116
117
|
spaceSession.companies = await getObjectDataByIds('company', su.company_ids, ['name', 'organization']);
|
|
117
|
-
spaceSession.
|
|
118
|
+
spaceSession.company = _.find(spaceSession.companies, (record)=>{ return record._id === su.company_id });
|
|
119
|
+
|
|
118
120
|
spaceSession.organizations = await getObjectDataByIds('organizations', su.organizations, ['name', 'fullname', 'company_id']);
|
|
121
|
+
spaceSession.organization = _.find(spaceSession.organizations, (record)=>{ return record._id === su.organization });
|
|
122
|
+
|
|
119
123
|
if (spaceSession.space && spaceSession.space.admins) {
|
|
120
124
|
spaceSession.is_space_admin = spaceSession.space.admins.indexOf(userId) > -1;
|
|
121
125
|
}
|