agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 14:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13662 from overleaf/bg-managed-users-fix-subscription-validator

Browse Source 
fix subscription validator for managed users

GitOrigin-RevId: 765c1c11850090f57327fc8b4255d41a16514472
This commit is contained in:
Brian Gough
2023-07-17 11:01:27 +00:00
committed by Copybot
parent c1ec3044d7
commit f80100fba1
4 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/test/unit/src/Authorization/PermissionsManagerTests.js
+19 -13
View File
@@ -277,8 +277,8 @@ describe('PermissionsManager', function () {
'policy',
{},
{
validator: async user => {
return user.prop === 'allowed'
validator: async ({ user, subscription }) => {
return user.prop === 'allowed' && subscription.prop === 'managed'
},
}
)
@@ -286,10 +286,12 @@ describe('PermissionsManager', function () {
policy: true,
}
const user = { prop: 'allowed' }
const subscription = { prop: 'managed' }
const result =
await this.PermissionsManager.promises.getUserValidationStatus(
user,
groupPolicy
groupPolicy,
subscription
)
expect(result).to.deep.equal(new Map([['policy', true]]))
})
@@ -299,8 +301,8 @@ describe('PermissionsManager', function () {
'policy',
{},
{
validator: async user => {
return user.prop === 'allowed'
validator: async ({ user, subscription }) => {
return user.prop === 'allowed' && subscription.prop === 'managed'
},
}
)
@@ -308,10 +310,12 @@ describe('PermissionsManager', function () {
policy: true,
}
const user = { prop: 'not allowed' }
const subscription = { prop: 'managed' }
const result =
await this.PermissionsManager.promises.getUserValidationStatus(
user,
groupPolicy
groupPolicy,
subscription
)
expect(result).to.deep.equal(new Map([['policy', false]]))
})
@@ -320,8 +324,8 @@ describe('PermissionsManager', function () {
'policy1',
{},
{
validator: async user => {
return user.prop === 'allowed'
validator: async ({ user, subscription }) => {
return user.prop === 'allowed' && subscription.prop === 'managed'
},
}
)
@@ -329,8 +333,8 @@ describe('PermissionsManager', function () {
'policy2',
{},
{
validator: async user => {
return user.prop === 'other'
validator: async ({ user, subscription }) => {
return user.prop === 'other' && subscription.prop === 'managed'
},
}
)
@@ -338,8 +342,8 @@ describe('PermissionsManager', function () {
'policy3',
{},
{
validator: async user => {
return user.prop === 'allowed'
validator: async ({ user, subscription }) => {
return user.prop === 'allowed' && subscription.prop === 'managed'
},
}
)
@@ -350,10 +354,12 @@ describe('PermissionsManager', function () {
policy3: false, // this policy is not enforced
}
const user = { prop: 'allowed' }
const subscription = { prop: 'managed' }
const result =
await this.PermissionsManager.promises.getUserValidationStatus(
user,
groupPolicy
groupPolicy,
subscription
)
expect(result).to.deep.equal(
new Map([