aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/api/server/email.ts2
-rw-r--r--server/tests/api/users/users-verification.ts59
2 files changed, 57 insertions, 4 deletions
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 5929a3adb..7b7acfd12 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -250,7 +250,7 @@ describe('Test emails', function () {
250 }) 250 })
251 251
252 it('Should not verify the email with an invalid verification string', async function () { 252 it('Should not verify the email with an invalid verification string', async function () {
253 await verifyEmail(server.url, userId, verificationString + 'b', 403) 253 await verifyEmail(server.url, userId, verificationString + 'b', false, 403)
254 }) 254 })
255 255
256 it('Should verify the email', async function () { 256 it('Should verify the email', async function () {
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index 3b37a26cf..b8fa1430b 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -3,18 +3,29 @@
3import * as chai from 'chai' 3import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { 5import {
6 registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers, 6 cleanupTests,
7 userLogin, login, flushAndRunServer, ServerInfo, verifyEmail, updateCustomSubConfig, wait, cleanupTests 7 flushAndRunServer,
8 getMyUserInformation,
9 getUserInformation,
10 login,
11 registerUser,
12 ServerInfo,
13 updateCustomSubConfig,
14 updateMyUser,
15 userLogin,
16 verifyEmail
8} from '../../../../shared/extra-utils' 17} from '../../../../shared/extra-utils'
9import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login' 18import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
10import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email' 19import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
11import { waitJobs } from '../../../../shared/extra-utils/server/jobs' 20import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
21import { User } from '../../../../shared/models/users'
12 22
13const expect = chai.expect 23const expect = chai.expect
14 24
15describe('Test users account verification', function () { 25describe('Test users account verification', function () {
16 let server: ServerInfo 26 let server: ServerInfo
17 let userId: number 27 let userId: number
28 let userAccessToken: string
18 let verificationString: string 29 let verificationString: string
19 let expectedEmailsLength = 0 30 let expectedEmailsLength = 0
20 const user1 = { 31 const user1 = {
@@ -83,11 +94,53 @@ describe('Test users account verification', function () {
83 94
84 it('Should verify the user via email and allow login', async function () { 95 it('Should verify the user via email and allow login', async function () {
85 await verifyEmail(server.url, userId, verificationString) 96 await verifyEmail(server.url, userId, verificationString)
86 await login(server.url, server.client, user1) 97
98 const res = await login(server.url, server.client, user1)
99 userAccessToken = res.body.access_token
100
87 const resUserVerified = await getUserInformation(server.url, server.accessToken, userId) 101 const resUserVerified = await getUserInformation(server.url, server.accessToken, userId)
88 expect(resUserVerified.body.emailVerified).to.be.true 102 expect(resUserVerified.body.emailVerified).to.be.true
89 }) 103 })
90 104
105 it('Should be able to change the user email', async function () {
106 let updateVerificationString: string
107
108 {
109 await updateMyUser({
110 url: server.url,
111 accessToken: userAccessToken,
112 email: 'updated@example.com'
113 })
114
115 await waitJobs(server)
116 expectedEmailsLength++
117 expect(emails).to.have.lengthOf(expectedEmailsLength)
118
119 const email = emails[expectedEmailsLength - 1]
120
121 const verificationStringMatches = /verificationString=([a-z0-9]+)/.exec(email['text'])
122 updateVerificationString = verificationStringMatches[1]
123 }
124
125 {
126 const res = await getMyUserInformation(server.url, userAccessToken)
127 const me: User = res.body
128
129 expect(me.email).to.equal('user_1@example.com')
130 expect(me.pendingEmail).to.equal('updated@example.com')
131 }
132
133 {
134 await verifyEmail(server.url, userId, updateVerificationString, true)
135
136 const res = await getMyUserInformation(server.url, userAccessToken)
137 const me: User = res.body
138
139 expect(me.email).to.equal('updated@example.com')
140 expect(me.pendingEmail).to.be.null
141 }
142 })
143
91 it('Should register user not requiring email verification if setting not enabled', async function () { 144 it('Should register user not requiring email verification if setting not enabled', async function () {
92 this.timeout(5000) 145 this.timeout(5000)
93 await updateCustomSubConfig(server.url, server.accessToken, { 146 await updateCustomSubConfig(server.url, server.accessToken, {