@bluedot-innovation/models 8.2.6 → 8.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/__tests__/account/account.data.json +5 -0
- package/__tests__/user/user.data.js +2 -1
- package/__tests__/user/user.spec.js +13 -0
- package/models/Account.js +24 -0
- package/models/User.js +1 -0
- package/package.json +1 -1
- package/schemas/AccountFeatures.js +3 -1
- package/schemas/CanvasSsoFeature.js +11 -0
- package/utils/DbInitialiser/indexInitialiser.js +22 -0
package/CHANGELOG.md
CHANGED
|
@@ -53,6 +53,19 @@ describe('User', () => {
|
|
|
53
53
|
done()
|
|
54
54
|
})
|
|
55
55
|
})
|
|
56
|
+
|
|
57
|
+
it('should set identityProvider to internal if not present', (done) => {
|
|
58
|
+
user = JSON.parse(JSON.stringify(user))
|
|
59
|
+
delete user.identityProvider
|
|
60
|
+
|
|
61
|
+
const User = new UserModel(user)
|
|
62
|
+
assert(User.identityProvider === "internal")
|
|
63
|
+
User.validate((err, res) => {
|
|
64
|
+
assert.notExists(res)
|
|
65
|
+
assert(err === null, 'err equals null')
|
|
66
|
+
done()
|
|
67
|
+
})
|
|
68
|
+
})
|
|
56
69
|
})
|
|
57
70
|
|
|
58
71
|
describe('Invalid User', () => {
|
package/models/Account.js
CHANGED
|
@@ -38,6 +38,30 @@ let AccountSchema = new mongoose.Schema({
|
|
|
38
38
|
|
|
39
39
|
AccountSchema.plugin(patcher)
|
|
40
40
|
|
|
41
|
+
/*
|
|
42
|
+
These indices are only used during testing to validate behaviour that relies on the indices.
|
|
43
|
+
The real indices are created by the script in utils/DbInitializer
|
|
44
|
+
*/
|
|
45
|
+
AccountSchema.index(
|
|
46
|
+
{
|
|
47
|
+
"features.canvasSso.identityProvider": 1
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
unique: true,
|
|
51
|
+
partialFilterExpression: { "features.canvasSso.identityProvider": { $exists:true, $type:"string" } },
|
|
52
|
+
name: "canvasSsoIdentityProviderUnique"
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
AccountSchema.index(
|
|
56
|
+
{
|
|
57
|
+
"features.canvasSso.domain": 1
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
unique: true,
|
|
61
|
+
partialFilterExpression: { "features.canvasSso.domain": { $exists:true, $type:"string" } },
|
|
62
|
+
name: "canvasSsoDomainUnique"
|
|
63
|
+
})
|
|
64
|
+
|
|
41
65
|
// optional mongoose
|
|
42
66
|
let model = (mongooseInstance) => {
|
|
43
67
|
let Account
|
package/models/User.js
CHANGED
package/package.json
CHANGED
|
@@ -4,6 +4,7 @@ let AccountBasicFeatureSchema = require('./AccountBasicFeature')
|
|
|
4
4
|
let AccountScreensSchema = require('./AccountScreens')
|
|
5
5
|
let AccountCemdPersistenceSchema = require('./AccountCemdPersistence')
|
|
6
6
|
let HelloSsoSchema = require('./HelloSso')
|
|
7
|
+
const CanvasSsoSchema = require('./CanvasSsoFeature')
|
|
7
8
|
|
|
8
9
|
let AccountFeaturesSchema = new mongoose.Schema({
|
|
9
10
|
tempo: AccountTempoSchema,
|
|
@@ -14,7 +15,8 @@ let AccountFeaturesSchema = new mongoose.Schema({
|
|
|
14
15
|
hideStores: AccountBasicFeatureSchema,
|
|
15
16
|
automaticDestinationCreation: AccountBasicFeatureSchema,
|
|
16
17
|
nowReadyConfiguration: AccountBasicFeatureSchema,
|
|
17
|
-
helloSso: HelloSsoSchema
|
|
18
|
+
helloSso: HelloSsoSchema,
|
|
19
|
+
canvasSso: CanvasSsoSchema
|
|
18
20
|
}, {
|
|
19
21
|
_id: false
|
|
20
22
|
})
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
let mongoose = require('mongoose')
|
|
2
|
+
|
|
3
|
+
let CanvasSsoSchema = new mongoose.Schema({
|
|
4
|
+
enabled: {type: Boolean, default: true},
|
|
5
|
+
identityProvider: {type: String, required: true},
|
|
6
|
+
domain: {type: String, required: true}
|
|
7
|
+
}, {
|
|
8
|
+
_id: false
|
|
9
|
+
})
|
|
10
|
+
|
|
11
|
+
module.exports = CanvasSsoSchema
|
|
@@ -68,6 +68,28 @@ const indexes = {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
+
],
|
|
72
|
+
account: [
|
|
73
|
+
{
|
|
74
|
+
fields: {
|
|
75
|
+
"features.canvasSso.identityProvider": 1
|
|
76
|
+
},
|
|
77
|
+
options: {
|
|
78
|
+
unique: true,
|
|
79
|
+
partialFilterExpression: { "features.canvasSso.identityProvider": { $exists:true, $type:"string" } },
|
|
80
|
+
name: "canvasSsoIdentityProviderUnique"
|
|
81
|
+
}
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
fields: {
|
|
85
|
+
"features.canvasSso.domain": 1
|
|
86
|
+
},
|
|
87
|
+
options: {
|
|
88
|
+
unique: true,
|
|
89
|
+
partialFilterExpression: { "features.canvasSso.domain": { $exists:true, $type:"string" } },
|
|
90
|
+
name: "canvasSsoDomainUnique"
|
|
91
|
+
}
|
|
92
|
+
}
|
|
71
93
|
]
|
|
72
94
|
}
|
|
73
95
|
|