Put privacy policy version in shared settings file and implement in t…

…ests
HildoBijl · Mar 6, 2024 · 8b22ba9 · 8b22ba9
1 parent 4a0baa1
commit 8b22ba9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/api/src/graphql/resolvers/User.js b/api/src/graphql/resolvers/User.js
@@ -1,12 +1,10 @@
 const { UserInputError } = require('apollo-server-express')
 
-const { languages } = require('step-wise/settings/i18n')
+const { languages, currentPrivacyPolicyVersion } = require('step-wise/settings')
 const { ensureSkillIds } = require('step-wise/eduTools')
 
 const { getUser, getAllUsers } = require('../util/User')
 
-const CURRENT_PRIVACY_POLICY_VERSION = 2
-
 const resolvers = {
 	User: {
 		skills: async (user, { ids }) => {
@@ -19,7 +17,7 @@ const resolvers = {
 			return {
 				version: user.privacyPolicyAcceptedVersion,
 				acceptedAt: user.privacyPolicyAcceptedAt,
-				isLatestVersion: user.privacyPolicyAcceptedVersion === CURRENT_PRIVACY_POLICY_VERSION,
+				isLatestVersion: user.privacyPolicyAcceptedVersion === currentPrivacyPolicyVersion,
 			}
 		}
 	},
@@ -40,9 +38,9 @@ const resolvers = {
 			const user = await getCurrentUser()
 
 			// Only run update if we are behind.
-			if (!user.privacyPolicyAcceptedVersion || user.privacyPolicyAcceptedVersion < CURRENT_PRIVACY_POLICY_VERSION) {
+			if (!user.privacyPolicyAcceptedVersion || user.privacyPolicyAcceptedVersion < currentPrivacyPolicyVersion) {
 				await user.update({
-					privacyPolicyAcceptedVersion: CURRENT_PRIVACY_POLICY_VERSION,
+					privacyPolicyAcceptedVersion: currentPrivacyPolicyVersion,
 					privacyPolicyAcceptedAt: new Date(),
 				})
 			}

diff --git a/api/tests/server/api/User/user.test.js b/api/tests/server/api/User/user.test.js
@@ -1,3 +1,4 @@
+const { currentPrivacyPolicyVersion } = require('../../../../../shared/settings')
 const surfConextMockData = require('../../../../surfConextMockData.json')
 const { createClient } = require('../../../client')
 
@@ -81,7 +82,7 @@ describe('privacy policy consent', () => {
 		const after = new Date().getTime()
 
 		expect(errors).toBeUndefined()
-		expect(acceptLatestPrivacyPolicy.version).toEqual(1)
+		expect(acceptLatestPrivacyPolicy.version).toEqual(currentPrivacyPolicyVersion)
 		const acceptedAt = new Date(acceptLatestPrivacyPolicy.acceptedAt).getTime()
 		expect(acceptedAt).toBeGreaterThanOrEqual(before)
 		expect(acceptedAt).toBeLessThanOrEqual(after)
@@ -94,15 +95,15 @@ describe('privacy policy consent', () => {
 		expect(privacyPolicyConsent.isLatestVersion).toEqual(acceptLatestPrivacyPolicy.isLatestVersion)
 	})
 
-	it('does not overwrite the `acceptedAt` date if version didn’t advance', async () => {
+	it('does not overwrite the `acceptedAt` date if version didn\'t advance', async () => {
 		const client = await createClient(seed)
 		await client.loginSurfConext(BOB_SURFSUB)
 
 		// Accept the privacy policy.
 		const { data: { acceptLatestPrivacyPolicy: firstConsent } } = await client.graphql({ query: `mutation {acceptLatestPrivacyPolicy {version, acceptedAt, isLatestVersion}}` })
 
 		// Let time progress a little bit and try to accept it again. It should not change things.
-		await new Promise(resolve => setTimeout(resolve, 5));
+		await new Promise(resolve => setTimeout(resolve, 5))
 		const { data: { acceptLatestPrivacyPolicy: secondConsent } } = await client.graphql({ query: `mutation {acceptLatestPrivacyPolicy {version, acceptedAt, isLatestVersion}}` })
 		expect(firstConsent).toMatchObject(secondConsent)
 	})

diff --git a/shared/settings/index.js b/shared/settings/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+	...require('./numbers'),
+	...require('./i18n'),
+	...require('./users'),
+}
diff --git a/shared/settings/users.js b/shared/settings/users.js
@@ -0,0 +1 @@
+module.exports.currentPrivacyPolicyVersion = 2