forked from FarmMaps/FarmMapsApiClient
		
	appsettings is now shared through the 'Secrets' project.
secrets are now expected inside a appsettings.secrets.json inside the 'Secrets' project.
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -2,3 +2,4 @@
 | 
				
			|||||||
.vs/
 | 
					.vs/
 | 
				
			||||||
bin/
 | 
					bin/
 | 
				
			||||||
obj/
 | 
					obj/
 | 
				
			||||||
 | 
					appsettings.secrets.json
 | 
				
			||||||
@@ -9,10 +9,4 @@
 | 
				
			|||||||
    <ProjectReference Include="..\FarmmapsApi\FarmmapsApi.csproj" />
 | 
					    <ProjectReference Include="..\FarmmapsApi\FarmmapsApi.csproj" />
 | 
				
			||||||
  </ItemGroup>
 | 
					  </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <ItemGroup>
 | 
					 | 
				
			||||||
    <None Update="appsettings.json">
 | 
					 | 
				
			||||||
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
    </None>
 | 
					 | 
				
			||||||
  </ItemGroup>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</Project>
 | 
					</Project>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{
 | 
					 | 
				
			||||||
  "Authority": "https://accounts.test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "Endpoint": "https://test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "BasePath": "api/v1",
 | 
					 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": [ "api" ]
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -18,4 +18,8 @@
 | 
				
			|||||||
        <PackageReference Include="Winista.MimeDetect" Version="1.0.1" />
 | 
					        <PackageReference Include="Winista.MimeDetect" Version="1.0.1" />
 | 
				
			||||||
    </ItemGroup>
 | 
					    </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <ItemGroup>
 | 
				
			||||||
 | 
					      <ProjectReference Include="..\Secrets\Secrets.csproj" />
 | 
				
			||||||
 | 
					    </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</Project>
 | 
					</Project>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,6 +20,7 @@ namespace FarmmapsApi
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            IConfiguration config = new ConfigurationBuilder()
 | 
					            IConfiguration config = new ConfigurationBuilder()
 | 
				
			||||||
                .AddJsonFile("appsettings.json", false, true)
 | 
					                .AddJsonFile("appsettings.json", false, true)
 | 
				
			||||||
 | 
					                .AddJsonFile("appsettings.secrets.json", false, true)
 | 
				
			||||||
                .Build();
 | 
					                .Build();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            var configuration = config.Get<Configuration>();
 | 
					            var configuration = config.Get<Configuration>();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmMapsBlight", "FarmMapsB
 | 
				
			|||||||
EndProject
 | 
					EndProject
 | 
				
			||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsZonering", "FarmmapsZonering\FarmmapsZonering.csproj", "{91A58C4A-4A80-4079-B43D-9B851206194F}"
 | 
					Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FarmmapsZonering", "FarmmapsZonering\FarmmapsZonering.csproj", "{91A58C4A-4A80-4079-B43D-9B851206194F}"
 | 
				
			||||||
EndProject
 | 
					EndProject
 | 
				
			||||||
 | 
					Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Secrets", "Secrets\Secrets.csproj", "{C4EE5ECA-253A-4B71-9F67-D231AC4517D6}"
 | 
				
			||||||
 | 
					EndProject
 | 
				
			||||||
Global
 | 
					Global
 | 
				
			||||||
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 | 
						GlobalSection(SolutionConfigurationPlatforms) = preSolution
 | 
				
			||||||
		Debug|Any CPU = Debug|Any CPU
 | 
							Debug|Any CPU = Debug|Any CPU
 | 
				
			||||||
@@ -57,6 +59,10 @@ Global
 | 
				
			|||||||
		{91A58C4A-4A80-4079-B43D-9B851206194F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 | 
							{91A58C4A-4A80-4079-B43D-9B851206194F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 | 
				
			||||||
		{91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 | 
							{91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 | 
				
			||||||
		{91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.Build.0 = Release|Any CPU
 | 
							{91A58C4A-4A80-4079-B43D-9B851206194F}.Release|Any CPU.Build.0 = Release|Any CPU
 | 
				
			||||||
 | 
							{C4EE5ECA-253A-4B71-9F67-D231AC4517D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 | 
				
			||||||
 | 
							{C4EE5ECA-253A-4B71-9F67-D231AC4517D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 | 
				
			||||||
 | 
							{C4EE5ECA-253A-4B71-9F67-D231AC4517D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 | 
				
			||||||
 | 
							{C4EE5ECA-253A-4B71-9F67-D231AC4517D6}.Release|Any CPU.Build.0 = Release|Any CPU
 | 
				
			||||||
	EndGlobalSection
 | 
						EndGlobalSection
 | 
				
			||||||
	GlobalSection(SolutionProperties) = preSolution
 | 
						GlobalSection(SolutionProperties) = preSolution
 | 
				
			||||||
		HideSolutionNode = FALSE
 | 
							HideSolutionNode = FALSE
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,9 +6,6 @@
 | 
				
			|||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <None Update="appsettings.json">
 | 
					 | 
				
			||||||
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
    </None>
 | 
					 | 
				
			||||||
    <None Update="Data\**\*">
 | 
					    <None Update="Data\**\*">
 | 
				
			||||||
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
    </None>
 | 
					    </None>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,9 +6,6 @@
 | 
				
			|||||||
    </PropertyGroup>
 | 
					    </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ItemGroup>
 | 
					    <ItemGroup>
 | 
				
			||||||
        <None Update="appsettings.json">
 | 
					 | 
				
			||||||
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
        </None>
 | 
					 | 
				
			||||||
        <None Update="Data\**\*">
 | 
					        <None Update="Data\**\*">
 | 
				
			||||||
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
        </None>
 | 
					        </None>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{
 | 
					 | 
				
			||||||
  "Authority": "https://accounts.test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "Endpoint": "https://test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "BasePath": "api/v1",
 | 
					 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": [ "api" ]
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -6,9 +6,6 @@
 | 
				
			|||||||
    </PropertyGroup>
 | 
					    </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ItemGroup>
 | 
					    <ItemGroup>
 | 
				
			||||||
      <None Update="appsettings.json">
 | 
					 | 
				
			||||||
        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
      </None>
 | 
					 | 
				
			||||||
      <None Update="Data\**\*">
 | 
					      <None Update="Data\**\*">
 | 
				
			||||||
        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
      </None>
 | 
					      </None>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{
 | 
					 | 
				
			||||||
  "Authority": "https://accounts.test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "Endpoint": "https://test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "BasePath": "api/v1",
 | 
					 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": [ "api" ]
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -6,9 +6,6 @@
 | 
				
			|||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
		<None Update="appsettings.json">
 | 
					 | 
				
			||||||
			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
		</None>
 | 
					 | 
				
			||||||
		<None Update="Data\**\*">
 | 
							<None Update="Data\**\*">
 | 
				
			||||||
			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
								<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
		</None>
 | 
							</None>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{
 | 
					 | 
				
			||||||
  "Authority": "https://accounts.test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "Endpoint": "https://test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "BasePath": "api/v1",
 | 
					 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": [ "api" ]
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -6,15 +6,9 @@
 | 
				
			|||||||
    </PropertyGroup>
 | 
					    </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ItemGroup>
 | 
					    <ItemGroup>
 | 
				
			||||||
        <None Update="appsettings.json">
 | 
					 | 
				
			||||||
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
        </None>
 | 
					 | 
				
			||||||
        <None Update="Data\**\*">
 | 
					        <None Update="Data\**\*">
 | 
				
			||||||
            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
        </None>
 | 
					        </None>
 | 
				
			||||||
        <None Update="appsettings.json">
 | 
					 | 
				
			||||||
          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
					 | 
				
			||||||
        </None>
 | 
					 | 
				
			||||||
    </ItemGroup>
 | 
					    </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ItemGroup>
 | 
					    <ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +0,0 @@
 | 
				
			|||||||
{
 | 
					 | 
				
			||||||
  "Authority": "https://accounts.test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "Endpoint": "https://test.farmmaps.eu/",
 | 
					 | 
				
			||||||
  "BasePath": "api/v1",
 | 
					 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": [ "api" ]
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
							
								
								
									
										18
									
								
								Secrets/Secrets.csproj
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								Secrets/Secrets.csproj
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					<Project Sdk="Microsoft.NET.Sdk">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <PropertyGroup>
 | 
				
			||||||
 | 
					        <TargetFramework>netstandard1.0</TargetFramework>
 | 
				
			||||||
 | 
					    </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <ItemGroup>
 | 
				
			||||||
 | 
					      <None Remove="appsettings.json" />
 | 
				
			||||||
 | 
					      <Content Include="appsettings.json">
 | 
				
			||||||
 | 
					        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
 | 
					      </Content>
 | 
				
			||||||
 | 
					      <None Remove="appsettings.secrets.json" />
 | 
				
			||||||
 | 
					      <Content Include="appsettings.secrets.json">
 | 
				
			||||||
 | 
					        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 | 
				
			||||||
 | 
					      </Content>
 | 
				
			||||||
 | 
					    </ItemGroup>    
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</Project>
 | 
				
			||||||
@@ -4,7 +4,5 @@
 | 
				
			|||||||
  "BasePath": "api/v1",
 | 
					  "BasePath": "api/v1",
 | 
				
			||||||
  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
					  "DiscoveryEndpointUrl": "https://accounts.test.farmmaps.eu/.well-known/openid-configuration",
 | 
				
			||||||
  "RedirectUri": "http://example.nl/api",
 | 
					  "RedirectUri": "http://example.nl/api",
 | 
				
			||||||
  "ClientId": "",
 | 
					 | 
				
			||||||
  "ClientSecret": "",
 | 
					 | 
				
			||||||
  "Scopes": ["api"]
 | 
					  "Scopes": ["api"]
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user