nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

Allow MP policy check when registering via SSO (#1779)

Browse Source 
* add endpoint to policies for invited users

* convert serialization to use built in dotnet tool
This commit is contained in:
Jake Fink
2021-12-21 12:10:01 -05:00
committed by GitHub
parent f51bdfe2e3
commit 8cbf1906ae
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Models/Request/PolicyRequestModel.cs
View File

@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text.Json;
using Bit.Core.Enums;
using Bit.Core.Models.Table;
using Newtonsoft.Json;
namespace Bit.Api.Models.Request
{
@ -27,7 +27,7 @@ namespace Bit.Api.Models.Request
public Policy ToPolicy(Policy existingPolicy)
{
existingPolicy.Enabled = Enabled.GetValueOrDefault();
existingPolicy.Data = Data != null ? JsonConvert.SerializeObject(Data) : null;
existingPolicy.Data = Data != null ? JsonSerializer.Serialize(Data) : null;
return existingPolicy;
}
}