@steedos/auth 2.7.2-beta.1 → 2.7.2-beta.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/lib/session.js +8 -4
- package/lib/session.js.map +1 -1
- package/package.json +4 -4
package/lib/session.js
CHANGED
|
@@ -157,7 +157,7 @@ function getLoginDevice(userAgent) {
|
|
|
157
157
|
exports.getLoginDevice = getLoginDevice;
|
|
158
158
|
function auth(request, response) {
|
|
159
159
|
return __awaiter(this, void 0, void 0, function () {
|
|
160
|
-
var cookies, authToken, spaceToken, authorization, spaceId, spaceAuthToken, userAgent, loginDevice, user;
|
|
160
|
+
var cookies, authToken, spaceToken, authorization, spaceId, spaceAuthToken, splitSpaceId, splitAuthtoken, userAgent, loginDevice, user;
|
|
161
161
|
return __generator(this, function (_a) {
|
|
162
162
|
switch (_a.label) {
|
|
163
163
|
case 0:
|
|
@@ -174,10 +174,14 @@ function auth(request, response) {
|
|
|
174
174
|
authToken = spaceAuthToken;
|
|
175
175
|
}
|
|
176
176
|
else {
|
|
177
|
-
|
|
178
|
-
|
|
177
|
+
splitSpaceId = spaceAuthToken.split(",")[0];
|
|
178
|
+
splitAuthtoken = spaceAuthToken.split(",")[1];
|
|
179
|
+
if (!spaceId && splitSpaceId) {
|
|
180
|
+
spaceId = splitSpaceId;
|
|
181
|
+
}
|
|
182
|
+
if (splitAuthtoken) {
|
|
183
|
+
authToken = splitAuthtoken;
|
|
179
184
|
}
|
|
180
|
-
authToken = spaceAuthToken.split(",")[1];
|
|
181
185
|
}
|
|
182
186
|
}
|
|
183
187
|
if (spaceToken) {
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/auth",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.7.2-beta.
|
|
4
|
+
"version": "2.7.2-beta.3",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"watch": "tsc --watch",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@steedos/cachers": "2.7.2-beta.
|
|
17
|
-
"@steedos/objectql": "2.7.2-beta.
|
|
16
|
+
"@steedos/cachers": "2.7.2-beta.3",
|
|
17
|
+
"@steedos/objectql": "2.7.2-beta.3",
|
|
18
18
|
"bcryptjs": "^2.4.3",
|
|
19
19
|
"cookies": "^0.8.0",
|
|
20
20
|
"express": "^4.16.4",
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"typescript": "4.6.3"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "ad8d13c8fac6abc75e77ddb5c90ff046916f46a2"
|
|
30
30
|
}
|