nickslowinski/vaultwarden-test
1
0
Fork 0
geforkt von mirrored/vaultwarden
Code Pull-Requests Aktivität

Allow TOTP generation in organizations (Fixes #50)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Daniel García 2018-07-01 15:49:16 +02:00
Ursprung ea600ab2b8
Commit a1ffa4c28d
2 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Diff-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/db/models/cipher.rs
Datei anzeigen

@ -97,7 +97,7 @@ impl Cipher {
"Favorite": self.favorite, "Favorite": self.favorite,
"OrganizationId": self.organization_uuid, "OrganizationId": self.organization_uuid,
"Attachments": attachments_json, "Attachments": attachments_json,
"OrganizationUseTotp": false, "OrganizationUseTotp": true,
"CollectionIds": self.get_collections(user_uuid, &conn), "CollectionIds": self.get_collections(user_uuid, &conn),
"Name": self.name, "Name": self.name,

12
src/db/models/organization.rs
Datei anzeigen

@ -66,11 +66,11 @@ impl Organization {
"Seats": 10, "Seats": 10,
"MaxCollections": 10, "MaxCollections": 10,
"Use2fa": false, "Use2fa": true,
"UseDirectory": false, "UseDirectory": false,
"UseEvents": false, "UseEvents": false,
"UseGroups": false, "UseGroups": false,
"UseTotp": false, "UseTotp": true,
"BusinessName": null, "BusinessName": null,
"BusinessAddress1": null, "BusinessAddress1": null,
@ -80,8 +80,8 @@ impl Organization {
"BusinessTaxNumber": null, "BusinessTaxNumber": null,
"BillingEmail": self.billing_email, "BillingEmail": self.billing_email,
"Plan": "Free", "Plan": "TeamsAnnually",
"PlanType": 0, // Free plan "PlanType": 5, // TeamsAnnually plan
"Object": "organization", "Object": "organization",
}) })
@ -153,11 +153,11 @@ impl UserOrganization {
"Seats": 10, "Seats": 10,
"MaxCollections": 10, "MaxCollections": 10,
"Use2fa": false, "Use2fa": true,
"UseDirectory": false, "UseDirectory": false,
"UseEvents": false, "UseEvents": false,
"UseGroups": false, "UseGroups": false,
"UseTotp": false, "UseTotp": true,
"MaxStorageGb": 10, // The value doesn't matter, we don't check server-side "MaxStorageGb": 10, // The value doesn't matter, we don't check server-side