formatting

Author: mpfeil

packages/models/src/user/index.js

@@ -182,7 +182,7 @@ const confirmEmail = async function confirmEmail ({ token, email }) {
 
   const user = await findUserByNameOrEmail(email);
 
-  if (!user) {
+  if (!user || user.emailConfirmationToken !== token) {
     throw new ModelError('invalid email confirmation token', {
       type: 'ForbiddenError'
     });

tests/tests/004-users-test.js

@@ -438,22 +438,37 @@ describe('openSenseMap API Routes: /users', function () {
   });
 
   it('should allow to refresh jwt using the refresh token', function () {
-    return chakram.post(`${BASE_URL}/users/refresh-auth`, { 'token': refreshToken })
+    return chakram
+      .post(
+        `${BASE_URL}/users/refresh-auth`,
+        { token: refreshToken }
+      )
       .then(function (response) {
         expect(response).to.have.status(200);
-        expect(response).to.have.header('content-type', 'application/json; charset=utf-8');
+        expect(response).to.have.header(
+          'content-type',
+          'application/json; charset=utf-8'
+        );
         expect(response.body.token).to.exist;
         expect(response.body.refreshToken).to.exist;
 
         const jwt = response.body.token;
 
-        return chakram.get(`${BASE_URL}/users/me`, { headers: { 'Authorization': `Bearer ${jwt}` } });
+        return chakram.get(`${BASE_URL}/users/me`, {
+          headers: { Authorization: `Bearer ${jwt}` }
+        });
       })
       .then(function (response) {
         expect(response).to.have.status(200);
-        expect(response).to.have.header('content-type', 'application/json; charset=utf-8');
+        expect(response).to.have.header(
+          'content-type',
+          'application/json; charset=utf-8'
+        );
         expect(response).to.have.schema(getUserSchema);
-        expect(response).to.comprise.of.json({ code: 'Ok', data: { me: { email: '[email protected]' } } });
+        expect(response).to.comprise.of.json({
+          code: 'Ok',
+          data: { me: { email: '[email protected]' } }
+        });
 
         return chakram.wait();
       });