nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-22 12:04:27 -05:00
Code

fixes for preview deployment

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-18 14:08:58 -04:00
parent c7496d2be2
commit cdfa936f6b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Api/Startup.cs
View File

@ -278,8 +278,9 @@ namespace Bit.Api
app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
{ {
AllowedScopes = new string[] { "api" }, AllowedScopes = new string[] { "api" },
Authority = env.IsProduction() ? "https://api.bitwarden.com" : "http://localhost:4000", Authority = env.IsProduction() ? "https://api.bitwarden.com" : env.IsEnvironment("Preview") ?
RequireHttpsMetadata = env.IsProduction(), "https://bitwardenpreviewapi-j9dv6m.azurewebsites.net" : "http://localhost:4000",
RequireHttpsMetadata = !env.IsDevelopment(),
ApiName = "api", ApiName = "api",
NameClaimType = ClaimTypes.Email, NameClaimType = ClaimTypes.Email,
// Version "2" until we retire the old jwt scheme and replace it with this one. // Version "2" until we retire the old jwt scheme and replace it with this one.

5
src/Api/settings.Preview.json Normal file
View File

@ -0,0 +1,5 @@
{
"globalSettings": {
"baseVaultUri": "https://previewvault.bitwarden.com/#"
}
}

2
src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaultsAdmin.sql
View File

@ -22,7 +22,7 @@ BEGIN
[Target].[SubvaultId] = [Source].[Id] [Target].[SubvaultId] = [Source].[Id]
AND [Target].[CipherId] = @CipherId AND [Target].[CipherId] = @CipherId
WHEN NOT MATCHED BY TARGET WHEN NOT MATCHED BY TARGET
AND [Source].[Id] IN (SELECT [SubvaultId] FROM [AvailableSubvaultsCTE]) THEN AND [Source].[Id] IN (SELECT [Id] FROM [AvailableSubvaultsCTE]) THEN
INSERT VALUES INSERT VALUES
( (
[Source].[Id], [Source].[Id],