Merge pull request #26 from easymorph/development/5.8.1

5.8.1

Author: strongtigerman

src/Client/AdSeamlessIdPAuthenticator.cs

@@ -0,0 +1,76 @@
+using Morph.Server.Sdk.Dto;
+using Morph.Server.Sdk.Helper;
+using Morph.Server.Sdk.Model;
+using Morph.Server.Sdk.Model.InternalModels;
+using System;
+using System.Collections.Specialized;
+using System.Net.Http;
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Morph.Server.Sdk.Client
+{
+    internal static class AdSeamlessIdPAuthenticator
+    {
+        public static async Task<ApiSession> OpenSession(OpenSessionAuthenticatorContext context, string idPId, bool keepSignedId, CancellationToken cancellationToken)
+        {
+            if (context is null)
+            {
+                throw new ArgumentNullException(nameof(context));
+            }
+
+            if (string.IsNullOrEmpty(idPId))
+            {
+                throw new ArgumentException($"'{nameof(idPId)}' cannot be null or empty.", nameof(idPId));
+            }
+
+
+            // handler will be disposed automatically
+            using (HttpClientHandler aHandler = new HttpClientHandler()
+            {
+                ClientCertificateOptions = ClientCertificateOption.Automatic,
+                // required for automatic NTML/Negotiate challenge
+                UseDefaultCredentials = true,
+                ServerCertificateCustomValidationCallback = context.MorphServerApiClient.Config.ServerCertificateCustomValidationCallback
+            })
+            {
+                // build a new low level client based on specified handler
+                using (var ntmlRestApiClient = context.BuildApiClient(aHandler))
+                {
+                    var serverNonceApiResult = await context.LowLevelApiClient.AuthGenerateNonce(cancellationToken);
+                    serverNonceApiResult.ThrowIfFailed();
+                    var nonce = serverNonceApiResult.Data.Nonce;
+
+                    var token = await internalAuthExternalWindowAsync(ntmlRestApiClient, nonce, idPId, keepSignedId, cancellationToken);
+
+                    return ApiSessionFactory.CreatePersitableApiSession(token);
+                }
+            }
+        }
+        static async Task<string> internalAuthExternalWindowAsync(IRestClient apiClient, string serverNonce, string idPId, bool keepSignedIn, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrWhiteSpace(idPId))
+            {
+                throw new ArgumentException($"'{nameof(idPId)}' cannot be null or whitespace.", nameof(idPId));
+            }
+
+            var url = UrlHelper.JoinUrl("auth", "external", "windows", idPId);
+            var requestDto = new AdSeamlessIdPSigninRequestDto
+            {
+                RequestToken = serverNonce
+            };
+
+            var ulrParameters = new NameValueCollection
+            {
+                {"keepSignedIn", keepSignedIn.ToString() }
+            };
+            var apiResult = await apiClient.PostAsync<AdSeamlessIdPSigninRequestDto, LoginResponseDto>(url, requestDto, ulrParameters, new HeadersCollection(), cancellationToken);
+            apiResult.ThrowIfFailed();
+            return apiResult.Data.Token;
+
+        }
+    }
+}
+
+

src/Client/AppWideLegacyApiSessionRefresher.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading;
+
+namespace Morph.Server.Sdk.Client
+{
+    /// <summary>
+    ///     Provides one-per-AppDomain session refresher to be used as sensible default/fallback refresher
+    /// </summary>
+    internal static class AppWideLegacyApiSessionRefresher
+    {
+        private static readonly Lazy<LegacyApiSessionRefresher> Provider = new Lazy<LegacyApiSessionRefresher>(
+            () => new LegacyApiSessionRefresher(),
+            LazyThreadSafetyMode.ExecutionAndPublication);
+
+        public static LegacyApiSessionRefresher Instance => Provider.Value;
+    }
+}

src/Client/AppWideSessionRefresher.cs

@@ -14,11 +14,18 @@ public class DataTransferUtility : IDataTransferUtility
         private int BufferSize { get; set; }  = 81920;
         private readonly IMorphServerApiClient _morphServerApiClient;
         private readonly ApiSession _apiSession;
+        private readonly string _spaceName;
 
-        public DataTransferUtility(IMorphServerApiClient morphServerApiClient, ApiSession apiSession)
+        public DataTransferUtility(IMorphServerApiClient morphServerApiClient, ApiSession apiSession, string spaceName)
         {
+            if (string.IsNullOrWhiteSpace(spaceName))
+            {
+                throw new ArgumentException($"'{nameof(spaceName)}' cannot be null or whitespace.", nameof(spaceName));
+            }
+
             this._morphServerApiClient = morphServerApiClient ?? throw new ArgumentNullException(nameof(morphServerApiClient));
             this._apiSession = apiSession ?? throw new ArgumentNullException(nameof(apiSession));
+            this._spaceName = spaceName;
         }
 
         public async Task SpaceUploadFileAsync(string localFilePath, string serverFolder, CancellationToken cancellationToken, bool overwriteExistingFile = false)
@@ -39,7 +46,7 @@ public async Task SpaceUploadFileAsync(string localFilePath, string serverFolder
                     OverwriteExistingFile = overwriteExistingFile,
                     ServerFolder = serverFolder
                 };
-                await _morphServerApiClient.SpaceUploadDataStreamAsync(_apiSession, request, cancellationToken);
+                await _morphServerApiClient.SpaceUploadDataStreamAsync(_apiSession, _spaceName, request, cancellationToken);
                 return;
             }
         }
@@ -73,7 +80,7 @@ public async Task SpaceDownloadFileIntoFileAsync(string remoteFilePath, string t
             {
                 using (Stream tempFileStream = File.Open(tempFile, FileMode.Create))
                 {
-                    using (var serverStreamingData = await _morphServerApiClient.SpaceOpenStreamingDataAsync(_apiSession, remoteFilePath, cancellationToken))
+                    using (var serverStreamingData = await _morphServerApiClient.SpaceOpenStreamingDataAsync(_apiSession, _spaceName, remoteFilePath, cancellationToken))
                     {
                         await serverStreamingData.Stream.CopyToAsync(tempFileStream, BufferSize, cancellationToken);
                     }
@@ -116,7 +123,7 @@ public async Task SpaceDownloadFileIntoFolderAsync(string remoteFilePath, string
                 using (Stream tempFileStream = File.Open(tempFile, FileMode.Create))
                 {
 
-                    using (var serverStreamingData = await _morphServerApiClient.SpaceOpenStreamingDataAsync(_apiSession, remoteFilePath, cancellationToken))
+                    using (var serverStreamingData = await _morphServerApiClient.SpaceOpenStreamingDataAsync(_apiSession, _spaceName, remoteFilePath, cancellationToken))
                     {
                         destFileName = Path.Combine(targetLocalFolder, serverStreamingData.FileName);
 
@@ -166,7 +173,7 @@ public async Task SpaceUploadFileAsync(string localFilePath, string serverFolder
                     OverwriteExistingFile = overwriteExistingFile,
                     ServerFolder = serverFolder
                 };
-                await _morphServerApiClient.SpaceUploadDataStreamAsync(_apiSession, request, cancellationToken);
+                await _morphServerApiClient.SpaceUploadDataStreamAsync(_apiSession, _spaceName, request, cancellationToken);
                 return;
             }
         }

src/Client/DataTransferUtility.cs

@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Morph.Server.Sdk.Model;
@@ -15,7 +16,7 @@ namespace Morph.Server.Sdk.Client
     /// <summary>
     /// Service that provides seamless API token refresh
     /// </summary>
-    public interface IApiSessionRefresher
+    public interface ILegacyApiSessionRefresher
     {
         /// <summary>
         /// Re-authenticates current session (if any) and seamlessly updates existing <see cref="ApiSession"/> instances that were associated
@@ -28,11 +29,11 @@ public interface IApiSessionRefresher
 
         /// <summary>
         /// Save <see cref="authenticator"/> for <see cref="session"/>. T
-        /// his is required for <see cref="ApiSession"/> object tracking and for <see cref="RefreshSessionAsync"/> to work.
+        /// his is required for <see cref="LegacyApiSession"/> object tracking and for <see cref="RefreshSessionAsync"/> to work.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="authenticator"></param>
-        void AssociateAuthenticator(ApiSession session, Authenticator authenticator);
+        void AssociateAuthenticator(LegacyApiSession session, Authenticator authenticator);
 
         /// <summary>
         /// Returns true if <see cref="response"/> indicates that the session has expired