@nymphjs/tilmeld-client 1.0.0-beta.77 → 1.0.0-beta.78
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 +7 -0
- package/lib/index.test.js +42 -23
- package/lib/index.test.js.map +1 -1
- package/package.json +8 -8
- package/src/index.test.ts +40 -24
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
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.0-beta.78](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.77...v1.0.0-beta.78) (2024-09-27)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- another flaky test ([0825249](https://github.com/sciactive/nymphjs/commit/082524955a3aea87d38bae3710f710d4b12d499c))
|
|
11
|
+
- hopefully fix flaky test ([bc746f0](https://github.com/sciactive/nymphjs/commit/bc746f077243502fa749be3bc5b1baf2bab511e5))
|
|
12
|
+
|
|
6
13
|
# [1.0.0-beta.77](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.76...v1.0.0-beta.77) (2024-09-26)
|
|
7
14
|
|
|
8
15
|
**Note:** Version bump only for package @nymphjs/tilmeld-client
|
package/lib/index.test.js
CHANGED
|
@@ -12,12 +12,19 @@ const server_1 = __importDefault(require("@nymphjs/server"));
|
|
|
12
12
|
const index_1 = require("./index");
|
|
13
13
|
describe('Tilmeld Client', () => {
|
|
14
14
|
let server = undefined;
|
|
15
|
-
afterEach(() => {
|
|
16
|
-
|
|
17
|
-
server
|
|
18
|
-
|
|
15
|
+
afterEach(async () => {
|
|
16
|
+
await new Promise((resolve) => {
|
|
17
|
+
if (server) {
|
|
18
|
+
server.close(() => resolve()); // avoid jest open handle error
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
resolve();
|
|
22
|
+
}
|
|
23
|
+
});
|
|
19
24
|
});
|
|
20
|
-
function createNymphTilmeldServer(config, clientConfig) {
|
|
25
|
+
async function createNymphTilmeldServer(config, clientConfig) {
|
|
26
|
+
// Wait for next event loop.
|
|
27
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
21
28
|
const sqliteConfig = {
|
|
22
29
|
filename: ':memory:',
|
|
23
30
|
};
|
|
@@ -58,10 +65,16 @@ describe('Tilmeld Client', () => {
|
|
|
58
65
|
admin.email = 'root@localhost';
|
|
59
66
|
admin.nameFirst = 'Admin';
|
|
60
67
|
admin.nameLast = 'User';
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
68
|
+
try {
|
|
69
|
+
const result = await admin.$register({
|
|
70
|
+
password: 'supersecretadminpassword',
|
|
71
|
+
});
|
|
72
|
+
return { result, admin };
|
|
73
|
+
}
|
|
74
|
+
catch (e) {
|
|
75
|
+
console.error('Error creating admin:', e);
|
|
76
|
+
throw e;
|
|
77
|
+
}
|
|
65
78
|
}
|
|
66
79
|
async function createUser(User) {
|
|
67
80
|
const user = User.factorySync();
|
|
@@ -69,19 +82,25 @@ describe('Tilmeld Client', () => {
|
|
|
69
82
|
user.email = 'user@localhost';
|
|
70
83
|
user.nameFirst = 'Some';
|
|
71
84
|
user.nameLast = 'User';
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
85
|
+
try {
|
|
86
|
+
const result = await user.$register({
|
|
87
|
+
password: 'supersecretuserpassword',
|
|
88
|
+
});
|
|
89
|
+
return { result, user };
|
|
90
|
+
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
console.error('Error creating user:', e);
|
|
93
|
+
throw e;
|
|
94
|
+
}
|
|
76
95
|
}
|
|
77
96
|
it('get client config', async () => {
|
|
78
|
-
const { User } = createNymphTilmeldServer();
|
|
97
|
+
const { User } = await createNymphTilmeldServer();
|
|
79
98
|
const result = await User.getClientConfig();
|
|
80
99
|
expect(result).not.toBeNull();
|
|
81
100
|
expect(result.verifyEmail).toBeFalsy();
|
|
82
101
|
});
|
|
83
102
|
it('produce errors when register data is incorrect', async () => {
|
|
84
|
-
const { User } = createNymphTilmeldServer();
|
|
103
|
+
const { User } = await createNymphTilmeldServer();
|
|
85
104
|
try {
|
|
86
105
|
const admin = User.factorySync();
|
|
87
106
|
let result = await admin.$register({
|
|
@@ -114,12 +133,12 @@ describe('Tilmeld Client', () => {
|
|
|
114
133
|
expect(admin.guid).toBeNull();
|
|
115
134
|
}
|
|
116
135
|
catch (e) {
|
|
117
|
-
console.error('Error
|
|
136
|
+
console.error('Error running test: ', e);
|
|
118
137
|
throw e;
|
|
119
138
|
}
|
|
120
139
|
});
|
|
121
140
|
it('create admin user', async () => {
|
|
122
|
-
const { User } = createNymphTilmeldServer();
|
|
141
|
+
const { User } = await createNymphTilmeldServer();
|
|
123
142
|
try {
|
|
124
143
|
const { result, admin } = await createAdmin(User);
|
|
125
144
|
expect(result.result).toBeTruthy();
|
|
@@ -131,12 +150,12 @@ describe('Tilmeld Client', () => {
|
|
|
131
150
|
expect(permission).toBeTruthy();
|
|
132
151
|
}
|
|
133
152
|
catch (e) {
|
|
134
|
-
console.error('Error
|
|
153
|
+
console.error('Error running test: ', e);
|
|
135
154
|
throw e;
|
|
136
155
|
}
|
|
137
156
|
});
|
|
138
157
|
it('logout', async () => {
|
|
139
|
-
const { User } = createNymphTilmeldServer();
|
|
158
|
+
const { User } = await createNymphTilmeldServer();
|
|
140
159
|
try {
|
|
141
160
|
const { admin } = await createAdmin(User);
|
|
142
161
|
const user1 = await User.current();
|
|
@@ -151,7 +170,7 @@ describe('Tilmeld Client', () => {
|
|
|
151
170
|
}
|
|
152
171
|
});
|
|
153
172
|
it('second user', async () => {
|
|
154
|
-
const { User } = createNymphTilmeldServer();
|
|
173
|
+
const { User } = await createNymphTilmeldServer();
|
|
155
174
|
try {
|
|
156
175
|
const { admin } = await createAdmin(User);
|
|
157
176
|
expect((await admin.$logout()).result).toBeTruthy();
|
|
@@ -170,7 +189,7 @@ describe('Tilmeld Client', () => {
|
|
|
170
189
|
}
|
|
171
190
|
});
|
|
172
191
|
it("doesn't issue renewed token when not needed", async () => {
|
|
173
|
-
const { User, nymph } = createNymphTilmeldServer({
|
|
192
|
+
const { User, nymph } = await createNymphTilmeldServer({
|
|
174
193
|
jwtExpire: 5,
|
|
175
194
|
jwtRenew: 0,
|
|
176
195
|
});
|
|
@@ -195,7 +214,7 @@ describe('Tilmeld Client', () => {
|
|
|
195
214
|
}
|
|
196
215
|
});
|
|
197
216
|
it('issues renewed token when needed', async () => {
|
|
198
|
-
const { User, nymph } = createNymphTilmeldServer({
|
|
217
|
+
const { User, nymph } = await createNymphTilmeldServer({
|
|
199
218
|
jwtExpire: 5,
|
|
200
219
|
jwtRenew: 5,
|
|
201
220
|
});
|
|
@@ -215,7 +234,7 @@ describe('Tilmeld Client', () => {
|
|
|
215
234
|
}
|
|
216
235
|
});
|
|
217
236
|
it("doesn't issue renewed token when requested", async () => {
|
|
218
|
-
const { User, nymph } = createNymphTilmeldServer({
|
|
237
|
+
const { User, nymph } = await createNymphTilmeldServer({
|
|
219
238
|
jwtExpire: 5,
|
|
220
239
|
jwtRenew: 5,
|
|
221
240
|
}, { renewTokens: false });
|
package/lib/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":";;;;;AACA,sDAA8B;AAC9B,6EAAoD;AACpD,0CAAsD;AACtD,sDAA6C;AAE7C,8CAK0B;AAC1B,6DAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/tilmeld-client",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.78",
|
|
4
4
|
"description": "Nymph.js - Tilmeld Client",
|
|
5
5
|
"browser": "dist/index.js",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
},
|
|
37
37
|
"license": "Apache-2.0",
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@nymphjs/client-node": "^1.0.0-beta.
|
|
40
|
-
"@nymphjs/driver-sqlite3": "^1.0.0-beta.
|
|
41
|
-
"@nymphjs/nymph": "^1.0.0-beta.
|
|
42
|
-
"@nymphjs/server": "^1.0.0-beta.
|
|
43
|
-
"@nymphjs/tilmeld": "^1.0.0-beta.
|
|
39
|
+
"@nymphjs/client-node": "^1.0.0-beta.78",
|
|
40
|
+
"@nymphjs/driver-sqlite3": "^1.0.0-beta.78",
|
|
41
|
+
"@nymphjs/nymph": "^1.0.0-beta.78",
|
|
42
|
+
"@nymphjs/server": "^1.0.0-beta.78",
|
|
43
|
+
"@nymphjs/tilmeld": "^1.0.0-beta.78",
|
|
44
44
|
"@tsconfig/recommended": "^1.0.3",
|
|
45
45
|
"@types/jest": "^29.5.12",
|
|
46
46
|
"jest": "^29.7.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"webpack-cli": "^5.1.4"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@nymphjs/client": "^1.0.0-beta.
|
|
54
|
+
"@nymphjs/client": "^1.0.0-beta.78"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "064d1f6e384c6a4f57e33ca54b7d93c872ce9236"
|
|
57
57
|
}
|
package/src/index.test.ts
CHANGED
|
@@ -14,7 +14,6 @@ import createServer from '@nymphjs/server';
|
|
|
14
14
|
|
|
15
15
|
import {
|
|
16
16
|
User as UserClass,
|
|
17
|
-
UserData,
|
|
18
17
|
Group as GroupClass,
|
|
19
18
|
CurrentUserData,
|
|
20
19
|
} from './index';
|
|
@@ -22,16 +21,23 @@ import {
|
|
|
22
21
|
describe('Tilmeld Client', () => {
|
|
23
22
|
let server: Server | undefined = undefined;
|
|
24
23
|
|
|
25
|
-
afterEach(() => {
|
|
26
|
-
|
|
27
|
-
server
|
|
28
|
-
|
|
24
|
+
afterEach(async () => {
|
|
25
|
+
await new Promise<void>((resolve) => {
|
|
26
|
+
if (server) {
|
|
27
|
+
server.close(() => resolve()); // avoid jest open handle error
|
|
28
|
+
} else {
|
|
29
|
+
resolve();
|
|
30
|
+
}
|
|
31
|
+
});
|
|
29
32
|
});
|
|
30
33
|
|
|
31
|
-
function createNymphTilmeldServer(
|
|
34
|
+
async function createNymphTilmeldServer(
|
|
32
35
|
config?: Partial<TilmeldConfig>,
|
|
33
36
|
clientConfig?: Partial<NymphOptions>,
|
|
34
37
|
) {
|
|
38
|
+
// Wait for next event loop.
|
|
39
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
40
|
+
|
|
35
41
|
const sqliteConfig = {
|
|
36
42
|
filename: ':memory:',
|
|
37
43
|
};
|
|
@@ -82,11 +88,16 @@ describe('Tilmeld Client', () => {
|
|
|
82
88
|
admin.nameFirst = 'Admin';
|
|
83
89
|
admin.nameLast = 'User';
|
|
84
90
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
91
|
+
try {
|
|
92
|
+
const result = await admin.$register({
|
|
93
|
+
password: 'supersecretadminpassword',
|
|
94
|
+
});
|
|
88
95
|
|
|
89
|
-
|
|
96
|
+
return { result, admin };
|
|
97
|
+
} catch (e: any) {
|
|
98
|
+
console.error('Error creating admin:', e);
|
|
99
|
+
throw e;
|
|
100
|
+
}
|
|
90
101
|
}
|
|
91
102
|
|
|
92
103
|
async function createUser(User: typeof UserClass) {
|
|
@@ -96,15 +107,20 @@ describe('Tilmeld Client', () => {
|
|
|
96
107
|
user.nameFirst = 'Some';
|
|
97
108
|
user.nameLast = 'User';
|
|
98
109
|
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
110
|
+
try {
|
|
111
|
+
const result = await user.$register({
|
|
112
|
+
password: 'supersecretuserpassword',
|
|
113
|
+
});
|
|
102
114
|
|
|
103
|
-
|
|
115
|
+
return { result, user };
|
|
116
|
+
} catch (e: any) {
|
|
117
|
+
console.error('Error creating user:', e);
|
|
118
|
+
throw e;
|
|
119
|
+
}
|
|
104
120
|
}
|
|
105
121
|
|
|
106
122
|
it('get client config', async () => {
|
|
107
|
-
const { User } = createNymphTilmeldServer();
|
|
123
|
+
const { User } = await createNymphTilmeldServer();
|
|
108
124
|
|
|
109
125
|
const result = await User.getClientConfig();
|
|
110
126
|
|
|
@@ -113,7 +129,7 @@ describe('Tilmeld Client', () => {
|
|
|
113
129
|
});
|
|
114
130
|
|
|
115
131
|
it('produce errors when register data is incorrect', async () => {
|
|
116
|
-
const { User } = createNymphTilmeldServer();
|
|
132
|
+
const { User } = await createNymphTilmeldServer();
|
|
117
133
|
|
|
118
134
|
try {
|
|
119
135
|
const admin = User.factorySync() as UserClass & CurrentUserData;
|
|
@@ -153,13 +169,13 @@ describe('Tilmeld Client', () => {
|
|
|
153
169
|
|
|
154
170
|
expect(admin.guid).toBeNull();
|
|
155
171
|
} catch (e: any) {
|
|
156
|
-
console.error('Error
|
|
172
|
+
console.error('Error running test: ', e);
|
|
157
173
|
throw e;
|
|
158
174
|
}
|
|
159
175
|
});
|
|
160
176
|
|
|
161
177
|
it('create admin user', async () => {
|
|
162
|
-
const { User } = createNymphTilmeldServer();
|
|
178
|
+
const { User } = await createNymphTilmeldServer();
|
|
163
179
|
|
|
164
180
|
try {
|
|
165
181
|
const { result, admin } = await createAdmin(User);
|
|
@@ -175,13 +191,13 @@ describe('Tilmeld Client', () => {
|
|
|
175
191
|
|
|
176
192
|
expect(permission).toBeTruthy();
|
|
177
193
|
} catch (e: any) {
|
|
178
|
-
console.error('Error
|
|
194
|
+
console.error('Error running test: ', e);
|
|
179
195
|
throw e;
|
|
180
196
|
}
|
|
181
197
|
});
|
|
182
198
|
|
|
183
199
|
it('logout', async () => {
|
|
184
|
-
const { User } = createNymphTilmeldServer();
|
|
200
|
+
const { User } = await createNymphTilmeldServer();
|
|
185
201
|
|
|
186
202
|
try {
|
|
187
203
|
const { admin } = await createAdmin(User);
|
|
@@ -202,7 +218,7 @@ describe('Tilmeld Client', () => {
|
|
|
202
218
|
});
|
|
203
219
|
|
|
204
220
|
it('second user', async () => {
|
|
205
|
-
const { User } = createNymphTilmeldServer();
|
|
221
|
+
const { User } = await createNymphTilmeldServer();
|
|
206
222
|
|
|
207
223
|
try {
|
|
208
224
|
const { admin } = await createAdmin(User);
|
|
@@ -227,7 +243,7 @@ describe('Tilmeld Client', () => {
|
|
|
227
243
|
});
|
|
228
244
|
|
|
229
245
|
it("doesn't issue renewed token when not needed", async () => {
|
|
230
|
-
const { User, nymph } = createNymphTilmeldServer({
|
|
246
|
+
const { User, nymph } = await createNymphTilmeldServer({
|
|
231
247
|
jwtExpire: 5,
|
|
232
248
|
jwtRenew: 0,
|
|
233
249
|
});
|
|
@@ -257,7 +273,7 @@ describe('Tilmeld Client', () => {
|
|
|
257
273
|
});
|
|
258
274
|
|
|
259
275
|
it('issues renewed token when needed', async () => {
|
|
260
|
-
const { User, nymph } = createNymphTilmeldServer({
|
|
276
|
+
const { User, nymph } = await createNymphTilmeldServer({
|
|
261
277
|
jwtExpire: 5,
|
|
262
278
|
jwtRenew: 5,
|
|
263
279
|
});
|
|
@@ -283,7 +299,7 @@ describe('Tilmeld Client', () => {
|
|
|
283
299
|
});
|
|
284
300
|
|
|
285
301
|
it("doesn't issue renewed token when requested", async () => {
|
|
286
|
-
const { User, nymph } = createNymphTilmeldServer(
|
|
302
|
+
const { User, nymph } = await createNymphTilmeldServer(
|
|
287
303
|
{
|
|
288
304
|
jwtExpire: 5,
|
|
289
305
|
jwtRenew: 5,
|