Skip to content

Limit Functionality to Non-Email Verified Users #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsdeschenes merged 11 commits into from
Jun 16, 2021
Merged

Limit Functionality to Non-Email Verified Users #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1f3c6bc
add verifiedRequired function to context
nsdeschenes Jun 11, 2021
575a37a
update affiliation mutations to use new check
nsdeschenes Jun 11, 2021
d68cc41
update related tests
nsdeschenes Jun 11, 2021
79aafa8
clean up modified files
nsdeschenes Jun 11, 2021
40717c2
update findMyDmarcSummaries query to check for user verification
nsdeschenes Jun 11, 2021
03aa628
clean up files
nsdeschenes Jun 11, 2021
c809915
update domain mutations for users to be email validated
nsdeschenes Jun 14, 2021
675be71
update domain queries to check users are email validated
nsdeschenes Jun 14, 2021
00a45d3
update subscriptions context and server to check for user email valid…
nsdeschenes Jun 14, 2021
d1ec473
update organization mutations to check users email validation
nsdeschenes Jun 14, 2021
f3021f2
update org query user email validation check
nsdeschenes Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api-js/src/__tests__/on-connect.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ describe('given the customOnConnect function', () => {
verifyToken,
userRequired: mockedUserRequired,
loadUserByKey: jest.fn(),
verifiedRequired: jest.fn(),
})(connectionParams, webSocket)

expect(onConnect.language).toEqual('en')
Expand Down Expand Up @@ -76,6 +77,7 @@ describe('given the customOnConnect function', () => {
verifyToken,
userRequired: mockedUserRequired,
loadUserByKey: jest.fn(),
verifiedRequired: jest.fn(),
})(connectionParams, webSocket)

expect(onConnect.language).toEqual('fr')
Expand Down Expand Up @@ -107,6 +109,7 @@ describe('given the customOnConnect function', () => {
verifyToken,
userRequired: mockedUserRequired,
loadUserByKey: jest.fn(),
verifiedRequired: jest.fn(),
})(connectionParams, webSocket)

expect(onConnect.authorization).toEqual(token)
Expand Down
39 changes: 35 additions & 4 deletions api-js/src/affiliation/mutations/__tests__/invite-user-to-org.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { toGlobalId } from 'graphql-relay'

import englishMessages from '../../../locale/en/messages'
import frenchMessages from '../../../locale/fr/messages'
import { checkPermission, userRequired } from '../../../auth'
import { checkPermission, userRequired, verifiedRequired } from '../../../auth'
import { databaseOptions } from '../../../../database-options'
import { createMutationSchema } from '../../../mutation'
import { createQuerySchema } from '../../../query'
Expand Down Expand Up @@ -48,18 +48,16 @@ describe('invite user to org', () => {
}))
tokenize = jest.fn().mockReturnValue('token')
})

beforeEach(async () => {
user = await collections.users.save({
userName: 'test.account@istio.actually.exists',
emailValidated: true,
})
consoleOutput.length = 0
})

afterEach(async () => {
await truncate()
})

afterAll(async () => {
await drop()
})
Expand Down Expand Up @@ -172,6 +170,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -267,6 +266,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -362,6 +362,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -452,6 +453,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -546,6 +548,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -641,6 +644,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -753,6 +757,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -848,6 +853,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -939,6 +945,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -1034,6 +1041,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'en' }),
Expand Down Expand Up @@ -1130,6 +1138,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1205,6 +1214,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1307,6 +1317,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1415,6 +1426,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1523,6 +1535,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1645,6 +1658,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1724,6 +1738,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1855,6 +1870,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -1949,6 +1965,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2043,6 +2060,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2133,6 +2151,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2224,6 +2243,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2315,6 +2335,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2423,6 +2444,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2517,6 +2539,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2607,6 +2630,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2698,6 +2722,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2790,6 +2815,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2865,6 +2891,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -2972,6 +2999,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -3079,6 +3107,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -3200,6 +3229,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down Expand Up @@ -3275,6 +3305,7 @@ describe('invite user to org', () => {
userKey: user._key,
loadUserByKey: loadUserByKey({ query }),
}),
verifiedRequired: verifiedRequired({ i18n }),
},
loaders: {
loadOrgByKey: loadOrgByKey({ query, language: 'fr' }),
Expand Down
Loading