Skip to content

Commit 36058ec

Browse files
msimersonmsimerson
committed
test updates
1 parent 6f4fc1c commit 36058ec

File tree

14 files changed

+118
-191
lines changed

14 files changed

+118
-191
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@
44

55
### [3.0.0-alpha.6] - 2025-04-08
66

7-
7+
- dep(eslint): upgraded to v9
8+
- dep(\*): bump versions to latest
9+
- feat(conf.d/http): added tls
10+
- feat(session): added JWT for session auth
11+
- feat(zone): removed location
12+
- feat(routes/zone_record): added, fixes #17
13+
- change(routes/users): result is always array
14+
- change(routes/ns): GET id is optional, result is always array
15+
- change(routes/zone): GET id is optional, result is always array
816

917
### [3.0.0-alpha.5] - 2024-03-06
1018

‎lib/config.test.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,21 @@ const httpCfg = {
6868
port: 3000,
6969
cookie: {
7070
clearInvalid: true,
71-
isHttpOnly: true,
71+
isHttpOnly: false,
7272
isSameSite: 'Strict',
7373
isSecure: false,
7474
name: 'sid-nictool',
7575
password: '^NicTool.Is,The#Best_Dns-Manager$',
7676
path: '/',
7777
ttl: 3600000,
7878
},
79+
jwt: {
80+
key: 'af1b926a5e21f535c4f5b6c42941c4cf',
81+
},
82+
tls: {
83+
cert: null,
84+
key: null,
85+
},
7986
keepAlive: false,
8087
group: 'NicTool',
8188
}

‎lib/test/zone.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
"expire": 3,
1111
"minimum": 4,
1212
"ttl": 3600,
13-
"location": "",
1413
"last_publish": null
1514
}

‎routes/group.test.js‎

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ after(async () => {
2323
})
2424

2525
describe('group routes', () => {
26-
let sessionCookie
26+
let auth = { headers: { } }
2727

2828
it('POST /session establishes a session', async () => {
2929
const res = await server.inject({
@@ -34,19 +34,17 @@ describe('group routes', () => {
3434
password: userCase.password,
3535
},
3636
})
37-
assert.ok(res.headers['set-cookie'][0])
38-
sessionCookie = res.headers['set-cookie'][0].split(';')[0]
37+
assert.ok(res.result.group.id)
38+
// auth.headers = { Cookie: res.headers['set-cookie'][0].split(';')[0] }
39+
auth.headers = { Authorization: `Bearer ${res.result.session.token}` }
3940
})
4041

4142
it(`GET /group/${groupCase.id}`, async () => {
4243
const res = await server.inject({
4344
method: 'GET',
4445
url: `/group/${groupCase.id}`,
45-
headers: {
46-
Cookie: sessionCookie,
47-
},
46+
headers: auth.headers,
4847
})
49-
// console.log(res.result)
5048
assert.ok([200, 204].includes(res.statusCode))
5149
})
5250

@@ -55,75 +53,57 @@ describe('group routes', () => {
5553
testCase.id = case2Id // make it unique
5654
testCase.name = `example2.com`
5755
delete testCase.deleted
58-
// console.log(testCase)
5956

6057
const res = await server.inject({
6158
method: 'POST',
6259
url: '/group',
63-
headers: {
64-
Cookie: sessionCookie,
65-
},
60+
headers: auth.headers,
6661
payload: testCase,
6762
})
68-
// console.log(res.result)
6963
assert.equal(res.statusCode, 201)
7064
})
7165

7266
it(`GET /group/${case2Id}`, async () => {
7367
const res = await server.inject({
7468
method: 'GET',
7569
url: `/group/${case2Id}`,
76-
headers: {
77-
Cookie: sessionCookie,
78-
},
70+
headers: auth.headers,
7971
})
80-
// console.log(res.result)
8172
assert.ok([200, 204].includes(res.statusCode))
8273
})
8374

8475
it(`DELETE /group/${case2Id}`, async () => {
8576
const res = await server.inject({
8677
method: 'DELETE',
8778
url: `/group/${case2Id}`,
88-
headers: {
89-
Cookie: sessionCookie,
90-
},
79+
headers: auth.headers,
9180
})
92-
// console.log(res.result)
9381
assert.equal(res.statusCode, 200)
9482
})
9583

9684
it(`GET /group/${case2Id}`, async () => {
9785
const res = await server.inject({
9886
method: 'GET',
9987
url: `/group/${case2Id}`,
100-
headers: {
101-
Cookie: sessionCookie,
102-
},
88+
headers: auth.headers,
10389
})
104-
// console.log(res.result)
10590
assert.equal(res.statusCode, 204)
10691
})
10792

10893
it(`GET /group/${case2Id} (deleted)`, async () => {
10994
const res = await server.inject({
11095
method: 'GET',
11196
url: `/group/${case2Id}?deleted=true`,
112-
headers: {
113-
Cookie: sessionCookie,
114-
},
97+
headers: auth.headers,
11598
})
116-
// console.log(res.result)
11799
assert.ok([200, 204].includes(res.statusCode))
118100
})
119101

120102
it('DELETE /session', async () => {
121103
const res = await server.inject({
122104
method: 'DELETE',
123105
url: '/session',
124-
headers: {
125-
Cookie: sessionCookie,
126-
},
106+
headers: auth.headers,
127107
})
128108
assert.equal(res.statusCode, 200)
129109
})

‎routes/nameserver.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function NameserverRoutes(server) {
5959

6060
return h
6161
.response({
62-
nameserver: nameservers[0],
62+
nameserver: nameservers,
6363
meta: {
6464
api: meta.api,
6565
msg: `the nameserver was created`,
@@ -106,7 +106,7 @@ function NameserverRoutes(server) {
106106

107107
return h
108108
.response({
109-
nameserver: nameservers[0],
109+
nameserver: nameservers,
110110
meta: {
111111
api: meta.api,
112112
msg: `I deleted that nameserver`,

‎routes/nameserver.test.js‎

Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ after(async () => {
2727
})
2828

2929
describe('nameserver routes', () => {
30-
let sessionCookie
30+
let auth = { headers: { } }
3131

3232
it('POST /session establishes a session', async () => {
3333
const res = await server.inject({
@@ -38,21 +38,19 @@ describe('nameserver routes', () => {
3838
password: userCase.password,
3939
},
4040
})
41-
assert.ok(res.headers['set-cookie'][0])
42-
sessionCookie = res.headers['set-cookie'][0].split(';')[0]
41+
assert.ok(res.result.session.token)
42+
auth.headers = { Authorization: `Bearer ${res.result.session.token}` }
4343
})
4444

4545
it(`GET /nameserver/${nsCase.id}`, async () => {
4646
const res = await server.inject({
4747
method: 'GET',
4848
url: `/nameserver/${nsCase.id}`,
49-
headers: {
50-
Cookie: sessionCookie,
51-
},
49+
headers: auth.headers,
5250
})
5351
// console.log(res.result)
5452
assert.equal(res.statusCode, 200)
55-
assert.equal(res.result.nameserver.name, nsCase.name)
53+
assert.equal(res.result.nameserver[0].name, nsCase.name)
5654
})
5755

5856
it(`POST /nameserver (${case2Id})`, async () => {
@@ -64,75 +62,56 @@ describe('nameserver routes', () => {
6462
const res = await server.inject({
6563
method: 'POST',
6664
url: '/nameserver',
67-
headers: {
68-
Cookie: sessionCookie,
69-
},
65+
headers: auth.headers,
7066
payload: testCase,
7167
})
72-
// console.log(res.result)
7368
assert.equal(res.statusCode, 201)
74-
assert.ok(res.result.nameserver.gid)
69+
assert.ok(res.result.nameserver[0].gid)
7570
})
7671

7772
it(`GET /nameserver/${case2Id}`, async () => {
7873
const res = await server.inject({
7974
method: 'GET',
8075
url: `/nameserver/${case2Id}`,
81-
headers: {
82-
Cookie: sessionCookie,
83-
},
76+
headers: auth.headers,
8477
})
85-
// console.log(res.result)
8678
assert.equal(res.statusCode, 200)
87-
assert.ok(res.result.nameserver.gid)
79+
assert.ok(res.result.nameserver[0].gid)
8880
})
8981

9082
it(`DELETE /nameserver/${case2Id}`, async () => {
9183
const res = await server.inject({
9284
method: 'DELETE',
9385
url: `/nameserver/${case2Id}`,
94-
headers: {
95-
Cookie: sessionCookie,
96-
},
86+
headers: auth.headers,
9787
})
98-
// console.log(res.result)
9988
assert.equal(res.statusCode, 200)
10089
})
10190

10291
it(`DELETE /nameserver/${case2Id}`, async () => {
10392
const res = await server.inject({
10493
method: 'DELETE',
10594
url: `/nameserver/${case2Id}`,
106-
headers: {
107-
Cookie: sessionCookie,
108-
},
95+
headers: auth.headers,
10996
})
110-
// console.log(res.result)
11197
assert.equal(res.statusCode, 404)
11298
})
11399

114100
it(`GET /nameserver/${case2Id}`, async () => {
115101
const res = await server.inject({
116102
method: 'GET',
117103
url: `/nameserver/${case2Id}`,
118-
headers: {
119-
Cookie: sessionCookie,
120-
},
104+
headers: auth.headers,
121105
})
122-
// console.log(res.result)
123-
// assert.equal(res.statusCode, 200)
124-
assert.equal(res.result.nameserver, undefined)
106+
assert.deepEqual(res.result.nameserver, [])
125107
})
126108

127109
it(`GET /nameserver/${case2Id} (deleted)`, async () => {
128110
const res = await server.inject({
129111
method: 'GET',
130112
url: `/nameserver/${case2Id}?deleted=true`,
131-
headers: {
132-
Cookie: sessionCookie,
133-
},
113+
headers: auth.headers,
134114
})
135-
// console.log(res.result)
136115
assert.equal(res.statusCode, 200)
137116
assert.ok(res.result.nameserver)
138117
})
@@ -141,9 +120,7 @@ describe('nameserver routes', () => {
141120
const res = await server.inject({
142121
method: 'DELETE',
143122
url: '/session',
144-
headers: {
145-
Cookie: sessionCookie,
146-
},
123+
headers: auth.headers,
147124
})
148125
assert.equal(res.statusCode, 200)
149126
})

0 commit comments

Comments
 (0)