diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 3cf2528b..687b161a 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Dänemark/SafeSeaNetTest/App.config b/nsw/Dänemark/SafeSeaNetTest/App.config index d740e886..45437954 100644 --- a/nsw/Dänemark/SafeSeaNetTest/App.config +++ b/nsw/Dänemark/SafeSeaNetTest/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/nsw/Dänemark/SafeSeaNetTest/Program.cs b/nsw/Dänemark/SafeSeaNetTest/Program.cs index 6daef7b7..099acf95 100644 --- a/nsw/Dänemark/SafeSeaNetTest/Program.cs +++ b/nsw/Dänemark/SafeSeaNetTest/Program.cs @@ -13,11 +13,12 @@ namespace SafeSeaNetTest class Program { - private static string baseUri = "https://nswtest.safeseanet.dk/api/v1/search?query=contentType: ship&take=5"; + private static string baseUri = "https://nswtestapi.safeseanet.dk/api/v1/"; + private static string searchUri = "search?query=contentType: ship&take=5"; static void Main(string[] args) { - Login(); + Login2(); Console.Read(); @@ -68,5 +69,52 @@ namespace SafeSeaNetTest } + private static async void Login2() + { + NetworkCredential credential = new NetworkCredential("bsm-schick", "Melder2016"); + CredentialCache cc = new CredentialCache(); + cc.Add(new Uri(baseUri), "NTLM", credential); + + HttpClientHandler handler = new HttpClientHandler(); + handler.AllowAutoRedirect = true; + handler.Credentials = cc; + string querystring = Path.Combine(baseUri, searchUri); + + //var encoded = Convert.ToBase64String(Encoding.ASCII.GetBytes("bsm-schick:Melder2016")); + handler.PreAuthenticate = true; + + Uri uri = new Uri(querystring); + HttpRequestMessage hrm = new HttpRequestMessage(HttpMethod.Get, uri); + + + HttpClient httpClient = new HttpClient(handler); + httpClient.DefaultRequestHeaders.Add("accept", "application/json"); + //httpClient.DefaultRequestHeaders.Add("Content-Type", "application/json"); + + + //httpClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", encoded); + Console.WriteLine("Query: " + querystring); + HttpResponseMessage responseMessage = await httpClient.GetAsync(querystring); + + if(responseMessage.StatusCode == HttpStatusCode.Unauthorized) + { + // do NTLM auth + // hrm.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("NTLM") + + } + + string jsonMessage; + using (Stream responseStream = await responseMessage.Content.ReadAsStreamAsync()) + { + jsonMessage = new StreamReader(responseStream).ReadToEnd(); + } + + Console.WriteLine(jsonMessage); + + + + } + + } } diff --git a/nsw/Dänemark/SafeSeaNetTest/SafeSeaNetTest.csproj b/nsw/Dänemark/SafeSeaNetTest/SafeSeaNetTest.csproj index 17528cfa..dfd4a9d5 100644 --- a/nsw/Dänemark/SafeSeaNetTest/SafeSeaNetTest.csproj +++ b/nsw/Dänemark/SafeSeaNetTest/SafeSeaNetTest.csproj @@ -9,9 +9,10 @@ Properties SafeSeaNetTest SafeSeaNetTest - v4.5.2 + v4.6.1 512 true + AnyCPU @@ -50,6 +51,9 @@ + + +