@proteinjs/user-server 1.0.9 → 1.0.11
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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.0.10](https://github.com/proteinjs/user/compare/@proteinjs/user-server@1.0.9...@proteinjs/user-server@1.0.10) (2024-05-09)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* do not name a column the same name as a table ([1442a9f](https://github.com/proteinjs/user/commit/1442a9f665f88feafa8ccb83631ef2fb7d741f20))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## 1.0.1 (2024-04-19)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @proteinjs/user-server
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbSessionStore.d.ts","sourceRoot":"","sources":["../../../src/authentication/DbSessionStore.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKxC,qBAAa,cAAe,SAAQ,KAAK;IACrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;;IAO9D,GAAG,cAAe,MAAM,cAAc,GAAG,YAAY,QAAQ,WAAW,GAAC,IAAI,KAAK,IAAI,UAUrF;IAED,GAAG,cAAe,MAAM,WAAW,QAAQ,WAAW,iBAAgB,GAAG,KAAK,IAAI,uBAE9E;IAED,KAAK,cAAe,MAAM,WAAW,QAAQ,WAAW,iBAAgB,GAAG,KAAK,IAAI,uBAEnF;IAED;;;OAGG;IACN,OAAO,cAAe,MAAM,iBAAgB,GAAG,KAAK,IAAI,uBAOvD;YAEgB,cAAc;
|
|
1
|
+
{"version":3,"file":"DbSessionStore.d.ts","sourceRoot":"","sources":["../../../src/authentication/DbSessionStore.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKxC,qBAAa,cAAe,SAAQ,KAAK;IACrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAuB;;IAO9D,GAAG,cAAe,MAAM,cAAc,GAAG,YAAY,QAAQ,WAAW,GAAC,IAAI,KAAK,IAAI,UAUrF;IAED,GAAG,cAAe,MAAM,WAAW,QAAQ,WAAW,iBAAgB,GAAG,KAAK,IAAI,uBAE9E;IAED,KAAK,cAAe,MAAM,WAAW,QAAQ,WAAW,iBAAgB,GAAG,KAAK,IAAI,uBAEnF;IAED;;;OAGG;IACN,OAAO,cAAe,MAAM,iBAAgB,GAAG,KAAK,IAAI,uBAOvD;YAEgB,cAAc;YAqCd,KAAK;CAWtB"}
|
|
@@ -108,7 +108,7 @@ var DbSessionStore = /** @class */ (function (_super) {
|
|
|
108
108
|
DbSessionStore.prototype.insertOrUpdate = function (sessionId, session, cb) {
|
|
109
109
|
var _a, _b, _c;
|
|
110
110
|
return __awaiter(this, void 0, void 0, function () {
|
|
111
|
-
var sessionRecord, error_1;
|
|
111
|
+
var sessionRecord, error_1, error_2;
|
|
112
112
|
return __generator(this, function (_d) {
|
|
113
113
|
switch (_d.label) {
|
|
114
114
|
case 0:
|
|
@@ -121,31 +121,39 @@ var DbSessionStore = /** @class */ (function (_super) {
|
|
|
121
121
|
return [4 /*yield*/, (0, db_1.getSystemDb)().get(user_1.tables.Session, { sessionId: sessionId })];
|
|
122
122
|
case 1:
|
|
123
123
|
sessionRecord = _d.sent();
|
|
124
|
-
if (!sessionRecord) return [3 /*break*/,
|
|
124
|
+
if (!sessionRecord) return [3 /*break*/, 6];
|
|
125
|
+
_d.label = 2;
|
|
126
|
+
case 2:
|
|
127
|
+
_d.trys.push([2, 4, , 5]);
|
|
125
128
|
sessionRecord.session = JSON.stringify(session);
|
|
126
129
|
sessionRecord.expires = session.cookie.expires;
|
|
127
130
|
sessionRecord.userEmail = (_b = session.passport) === null || _b === void 0 ? void 0 : _b.user;
|
|
128
131
|
return [4 /*yield*/, (0, db_1.getSystemDb)().update(user_1.tables.Session, sessionRecord, { sessionId: sessionId })];
|
|
129
|
-
case 2:
|
|
130
|
-
_d.sent();
|
|
131
|
-
return [3 /*break*/, 6];
|
|
132
132
|
case 3:
|
|
133
|
-
_d.
|
|
133
|
+
_d.sent();
|
|
134
|
+
return [3 /*break*/, 5];
|
|
135
|
+
case 4:
|
|
136
|
+
error_1 = _d.sent();
|
|
137
|
+
console.error('Failed to update session', error_1);
|
|
138
|
+
return [3 /*break*/, 5];
|
|
139
|
+
case 5: return [3 /*break*/, 9];
|
|
140
|
+
case 6:
|
|
141
|
+
_d.trys.push([6, 8, , 9]);
|
|
134
142
|
return [4 /*yield*/, (0, db_1.getSystemDb)().insert(user_1.tables.Session, {
|
|
135
143
|
sessionId: sessionId,
|
|
136
144
|
session: JSON.stringify(session),
|
|
137
145
|
expires: session.cookie.expires,
|
|
138
146
|
userEmail: (_c = session.passport) === null || _c === void 0 ? void 0 : _c.user
|
|
139
147
|
})];
|
|
140
|
-
case
|
|
148
|
+
case 7:
|
|
141
149
|
_d.sent();
|
|
142
|
-
return [3 /*break*/,
|
|
143
|
-
case
|
|
144
|
-
|
|
150
|
+
return [3 /*break*/, 9];
|
|
151
|
+
case 8:
|
|
152
|
+
error_2 = _d.sent();
|
|
145
153
|
// race condition on insert
|
|
146
|
-
console.error('Failed to create session',
|
|
147
|
-
return [3 /*break*/,
|
|
148
|
-
case
|
|
154
|
+
console.error('Failed to create session', error_2);
|
|
155
|
+
return [3 /*break*/, 9];
|
|
156
|
+
case 9:
|
|
149
157
|
if (cb)
|
|
150
158
|
cb();
|
|
151
159
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbSessionStore.js","sourceRoot":"","sources":["../../../src/authentication/DbSessionStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAwC;AACxC,oCAAiE;AACjE,wCAAyC;AACzC,mDAAkD;AAElD;IAAoC,kCAAK;IAGxC;QAAA,YACO,iBAAO,SAEb;QAED,SAAG,GAAG,UAAC,SAAiB,EAAE,EAA4D;YACrF,CAAC;;;;gCACwB,qBAAM,IAAA,gBAAW,GAAE,CAAC,GAAG,CAAC,aAAM,CAAC,OAAO,EAAE,EAAE,SAAS,WAAA,EAAE,CAAC,EAAA;;4BAA/D,MAAM,GAAG,SAAsD;4BACrE,IAAI,CAAC,MAAM,EAAE;gCACT,EAAE,CAAC,IAAI,CAAC,CAAC;gCACT,sBAAO;6BACV;4BAED,sBAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAC;;;iBAC/C,CAAC,EAAE,CAAC;QACZ,CAAC,CAAA;QAED,SAAG,GAAG,UAAC,SAAiB,EAAE,OAA4B,EAAE,EAA0B;YAC3E,KAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAChD,CAAC,CAAA;QAED,WAAK,GAAG,UAAC,SAAiB,EAAE,OAA4B,EAAE,EAA0B;YACtF,KAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAA;QAED;;;WAGG;QACN,aAAO,GAAG,UAAC,SAAiB,EAAE,EAA0B;YACjD,8BAA8B;YACpC,CAAC;;;gCACS,qBAAM,IAAA,+BAAc,EAAC,SAAS,CAAC,EAAA;;4BAA/B,SAA+B,CAAC;4BAChC,IAAI,EAAE;gCACF,EAAE,EAAE,CAAC;;;;iBACZ,CAAC,EAAE,CAAC;QACZ,CAAC,CAAA;QAlCM,WAAW,CAAC,KAAI,CAAC,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;;IAC5D,CAAC;IAmCgB,uCAAc,GAA5B,UAA6B,SAAiB,EAAE,OAA4B,EAAE,EAA0B;;;;;;;wBACpG,sCAAsC;wBACtC,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAE,IAAI,CAAA,EAAE;4BACzB,IAAI,EAAE;gCACF,EAAE,EAAE,CAAC;4BAET,sBAAO;yBACV;wBAEqB,qBAAM,IAAA,gBAAW,GAAE,CAAC,GAAG,CAAC,aAAM,CAAC,OAAO,EAAE,EAAE,SAAS,WAAA,EAAE,CAAC,EAAA;;wBAAtE,aAAa,GAAG,SAAsD;6BACxE,aAAa,EAAb,wBAAa
|
|
1
|
+
{"version":3,"file":"DbSessionStore.js","sourceRoot":"","sources":["../../../src/authentication/DbSessionStore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,42 +1,42 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
2
|
+
"name": "@proteinjs/user-server",
|
|
3
|
+
"version": "1.0.11",
|
|
4
|
+
"description": "User server components",
|
|
5
|
+
"publishConfig": {
|
|
6
|
+
"access": "public"
|
|
7
|
+
},
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "git+https://github.com/proteinjs/user.git"
|
|
11
|
+
},
|
|
12
|
+
"bugs": {
|
|
13
|
+
"url": "https://github.com/proteinjs/user/issues"
|
|
14
|
+
},
|
|
15
|
+
"homepage": "https://github.com/proteinjs/user#readme",
|
|
16
|
+
"author": "Brent Bahry",
|
|
17
|
+
"license": "MIT",
|
|
18
|
+
"scripts": {
|
|
19
|
+
"clean": "rm -rf dist/ generated/ node_modules/",
|
|
20
|
+
"build": "reflection-build && tsc",
|
|
21
|
+
"watch": "reflection-watch"
|
|
22
|
+
},
|
|
23
|
+
"dependencies": {
|
|
24
|
+
"@proteinjs/db": "1.0.15",
|
|
25
|
+
"@proteinjs/reflection": "1.1.1",
|
|
26
|
+
"@proteinjs/server-api": "1.1.1",
|
|
27
|
+
"@proteinjs/user": "^1.0.12",
|
|
28
|
+
"@proteinjs/util": "1.1.0",
|
|
29
|
+
"crypto-js": "4.0.0",
|
|
30
|
+
"express-session": "1.17.1",
|
|
31
|
+
"moment": "2.29.4"
|
|
32
|
+
},
|
|
33
|
+
"devDependencies": {
|
|
34
|
+
"@proteinjs/reflection-build": "1.0.16",
|
|
35
|
+
"@types/crypto-js": "4.0.1",
|
|
36
|
+
"@types/express-session": "1.17.0",
|
|
37
|
+
"@types/node": "14.0.13",
|
|
38
|
+
"typescript": "5.2.2"
|
|
39
|
+
},
|
|
40
|
+
"main": "./dist/generated/index.js",
|
|
41
|
+
"types": "./dist/generated/index.d.ts"
|
|
42
42
|
}
|
|
@@ -55,10 +55,14 @@ export class DbSessionStore extends Store {
|
|
|
55
55
|
|
|
56
56
|
const sessionRecord = await getSystemDb().get(tables.Session, { sessionId });
|
|
57
57
|
if (sessionRecord) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
try {
|
|
59
|
+
sessionRecord.session = JSON.stringify(session);
|
|
60
|
+
sessionRecord.expires = (<Date>session.cookie.expires);
|
|
61
|
+
sessionRecord.userEmail = session.passport?.user;
|
|
62
|
+
await getSystemDb().update(tables.Session, sessionRecord, { sessionId });
|
|
63
|
+
} catch (error) {
|
|
64
|
+
console.error('Failed to update session', error);
|
|
65
|
+
}
|
|
62
66
|
} else {
|
|
63
67
|
try {
|
|
64
68
|
await getSystemDb().insert(tables.Session, {
|