nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-27 14:24:56 -05:00
Code

update libs

Browse Source
This commit is contained in:
Kyle Spearrin 2018-02-21 22:31:33 -05:00
parent 0b17f3823a
commit 87497a5608
14 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Api.csproj
View File

@ -14,14 +14,14 @@
<ItemGroup>
<PackageReference Include="jsreport.AspNetCore" Version="1.0.1" />
<PackageReference Include="jsreport.Binary" Version="1.9.2" />
<PackageReference Include="jsreport.Local" Version="1.1.0" />
<PackageReference Include="jsreport.Local" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.1.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.3.0" />
</ItemGroup>
<ItemGroup>

4
src/Api/Models/InvoiceModel.cs
View File

@ -59,9 +59,9 @@ namespace Bit.Api.Models
{
Description = item.Description;
}
else if(!string.IsNullOrWhiteSpace(item.Plan?.Name) && item.Quantity.GetValueOrDefault() > 0)
else if(!string.IsNullOrWhiteSpace(item.Plan?.Nickname) && item.Quantity.GetValueOrDefault() > 0)
{
Description = $"{item.Quantity} x {item.Plan.Name}";
Description = $"{item.Quantity} x {item.Plan.Nickname}";
}
else
{

2
src/Billing/Billing.csproj
View File

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

24
src/Core/Core.csproj
View File

@ -52,26 +52,26 @@
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.7.0" />
<PackageReference Include="IdentityServer4" Version="2.0.4" />
<PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" />
<PackageReference Include="IdentityServer4" Version="2.1.2" />
<PackageReference Include="Dapper" Version="1.50.4" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="WindowsAzure.Storage" Version="8.6.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" />
<PackageReference Include="Braintree" Version="3.10.0" />
<PackageReference Include="Braintree" Version="3.12.0" />
<PackageReference Include="CommonMark.NET" Version="0.15.1" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.4" />
<PackageReference Include="RazorLight" Version="2.0.0-alpha3" />
<PackageReference Include="Sendgrid" Version="9.9.0" />
<PackageReference Include="Stripe.net" Version="11.8.2" />
<PackageReference Include="U2F.Core" Version="1.0.3" />
<PackageReference Include="Otp.NET" Version="1.1.0" />
<PackageReference Include="Stripe.net" Version="13.0.1" />
<PackageReference Include="U2F.Core" Version="1.0.4" />
<PackageReference Include="Otp.NET" Version="1.2.0" />
<PackageReference Include="YubicoDotNetClient" Version="1.2.0" />
</ItemGroup>
@ -80,7 +80,7 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
</ItemGroup>
</Project>

2
src/Core/IdentityServer/StaticClients.cs
View File

@ -32,7 +32,7 @@ namespace Bit.Core.IdentityServer
RefreshTokenExpiration = TokenExpiration.Sliding;
RefreshTokenUsage = TokenUsage.ReUse;
SlidingRefreshTokenLifetime = 86400 * refreshTokenSlidingDays;
AbsoluteRefreshTokenLifetime = int.MaxValue; // forever
AbsoluteRefreshTokenLifetime = 0; // forever
UpdateAccessTokenClaimsOnRefresh = true;
AccessTokenLifetime = 3600 * accessTokenLifetimeHours;
AllowOfflineAccess = true;

2
src/Core/Models/Business/BillingInfo.cs
View File

@ -163,7 +163,7 @@ namespace Bit.Core.Models.Business
{
if(item.Plan != null)
{
Name = item.Plan.Name;
Name = item.Plan.Nickname;
Amount = item.Plan.Amount / 100M;
Interval = item.Plan.Interval;
}

4
src/Events/Events.csproj
View File

@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

4
src/EventsProcessor/EventsProcessor.csproj
View File

@ -5,8 +5,8 @@
<RootNamespace>Bit.EventsProcessor</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs" Version="2.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="8.6.0" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="2.1.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />

2
src/Icons/Icons.csproj
View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

2
src/Scim/Scim.csproj
View File

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

4
util/Function/Function.csproj
View File

@ -4,8 +4,8 @@
<RootNamespace>Bit.Function</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.6" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />

2
util/Mail/Mail.csproj
View File

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

2
util/Server/Server.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
</ItemGroup>
<ItemGroup>

4
util/Setup/Setup.csproj
View File

@ -21,8 +21,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="dbup" Version="3.3.5" />
</ItemGroup>