diff options
author | Josh Morel <morel.josh@hotmail.com> | 2018-11-21 02:48:29 -0500 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-11-21 08:48:29 +0100 |
commit | fc2ec87a8c4dcfbb91a1a62cf4c07a2a8e6a50fe (patch) | |
tree | a2cea5e299c5f1a731da99277949ea2f0bb35659 /server/tests | |
parent | 04b8c3fba614efc3827f583096c78b08cb668470 (diff) | |
download | PeerTube-fc2ec87a8c4dcfbb91a1a62cf4c07a2a8e6a50fe.tar.gz PeerTube-fc2ec87a8c4dcfbb91a1a62cf4c07a2a8e6a50fe.tar.zst PeerTube-fc2ec87a8c4dcfbb91a1a62cf4c07a2a8e6a50fe.zip |
enable email verification by admin (#1348)
* enable email verification by admin
* rename/label to set email as verified
to be more explicit that admin is not sending
another email to confirm
* add update user emailVerified check-params test
* make user.model emailVerified property required
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/api/check-params/users.ts | 9 | ||||
-rw-r--r-- | server/tests/api/users/users.ts | 2 | ||||
-rw-r--r-- | server/tests/utils/users/users.ts | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index ec46609a4..273be1679 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -428,6 +428,14 @@ describe('Test users API validators', function () { | |||
428 | await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) | 428 | await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) |
429 | }) | 429 | }) |
430 | 430 | ||
431 | it('Should fail with an invalid emailVerified attribute', async function () { | ||
432 | const fields = { | ||
433 | emailVerified: 'yes' | ||
434 | } | ||
435 | |||
436 | await makePutBodyRequest({ url: server.url, path: path + userId, token: server.accessToken, fields }) | ||
437 | }) | ||
438 | |||
431 | it('Should fail with an invalid videoQuota attribute', async function () { | 439 | it('Should fail with an invalid videoQuota attribute', async function () { |
432 | const fields = { | 440 | const fields = { |
433 | videoQuota: -90 | 441 | videoQuota: -90 |
@@ -463,6 +471,7 @@ describe('Test users API validators', function () { | |||
463 | it('Should succeed with the correct params', async function () { | 471 | it('Should succeed with the correct params', async function () { |
464 | const fields = { | 472 | const fields = { |
465 | email: 'email@example.com', | 473 | email: 'email@example.com', |
474 | emailVerified: true, | ||
466 | videoQuota: 42, | 475 | videoQuota: 42, |
467 | role: UserRole.MODERATOR | 476 | role: UserRole.MODERATOR |
468 | } | 477 | } |
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index 513bca8a0..e7bb845b9 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts | |||
@@ -478,6 +478,7 @@ describe('Test users', function () { | |||
478 | userId, | 478 | userId, |
479 | accessToken, | 479 | accessToken, |
480 | email: 'updated2@example.com', | 480 | email: 'updated2@example.com', |
481 | emailVerified: true, | ||
481 | videoQuota: 42, | 482 | videoQuota: 42, |
482 | role: UserRole.MODERATOR | 483 | role: UserRole.MODERATOR |
483 | }) | 484 | }) |
@@ -487,6 +488,7 @@ describe('Test users', function () { | |||
487 | 488 | ||
488 | expect(user.username).to.equal('user_1') | 489 | expect(user.username).to.equal('user_1') |
489 | expect(user.email).to.equal('updated2@example.com') | 490 | expect(user.email).to.equal('updated2@example.com') |
491 | expect(user.emailVerified).to.be.true | ||
490 | expect(user.nsfwPolicy).to.equal('do_not_list') | 492 | expect(user.nsfwPolicy).to.equal('do_not_list') |
491 | expect(user.videoQuota).to.equal(42) | 493 | expect(user.videoQuota).to.equal(42) |
492 | expect(user.roleLabel).to.equal('Moderator') | 494 | expect(user.roleLabel).to.equal('Moderator') |
diff --git a/server/tests/utils/users/users.ts b/server/tests/utils/users/users.ts index 2c21a9ecf..f12992315 100644 --- a/server/tests/utils/users/users.ts +++ b/server/tests/utils/users/users.ts | |||
@@ -206,6 +206,7 @@ function updateUser (options: { | |||
206 | userId: number, | 206 | userId: number, |
207 | accessToken: string, | 207 | accessToken: string, |
208 | email?: string, | 208 | email?: string, |
209 | emailVerified?: boolean, | ||
209 | videoQuota?: number, | 210 | videoQuota?: number, |
210 | videoQuotaDaily?: number, | 211 | videoQuotaDaily?: number, |
211 | role?: UserRole | 212 | role?: UserRole |
@@ -214,6 +215,7 @@ function updateUser (options: { | |||
214 | 215 | ||
215 | const toSend = {} | 216 | const toSend = {} |
216 | if (options.email !== undefined && options.email !== null) toSend['email'] = options.email | 217 | if (options.email !== undefined && options.email !== null) toSend['email'] = options.email |
218 | if (options.emailVerified !== undefined && options.emailVerified !== null) toSend['emailVerified'] = options.emailVerified | ||
217 | if (options.videoQuota !== undefined && options.videoQuota !== null) toSend['videoQuota'] = options.videoQuota | 219 | if (options.videoQuota !== undefined && options.videoQuota !== null) toSend['videoQuota'] = options.videoQuota |
218 | if (options.videoQuotaDaily !== undefined && options.videoQuotaDaily !== null) toSend['videoQuotaDaily'] = options.videoQuotaDaily | 220 | if (options.videoQuotaDaily !== undefined && options.videoQuotaDaily !== null) toSend['videoQuotaDaily'] = options.videoQuotaDaily |
219 | if (options.role !== undefined && options.role !== null) toSend['role'] = options.role | 221 | if (options.role !== undefined && options.role !== null) toSend['role'] = options.role |