Revoke public interface change.

Azure · Apr 17, 2020 · 0eaa4af · 0eaa4af
1 parent 4410b72
commit 0eaa4af
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/src/Microsoft.Azure.SignalR.Management/IServiceManager.cs b/src/Microsoft.Azure.SignalR.Management/IServiceManager.cs
@@ -24,15 +24,15 @@ public interface IServiceManager
         /// <returns>The task object representing the asynchronous operation.</returns>
         Task<IServiceHubContext> CreateHubContextAsync(string hubName, ILoggerFactory loggerFactory = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a client access token for SignalR hub connections to connect to Azure SignalR Service.
-        /// </summary>
-        /// <param name="hubName">The hub name.</param>
-        /// <param name="userId">The user ID.</param>
-        /// <param name="claims">The claim list to be put into access token.</param>
-        /// <param name="lifeTime">The lifetime of the token. The default value is one hour.</param>
+        /// <summary>
+        /// Creates a client access token for SignalR hub connections to connect to Azure SignalR Service.
+        /// </summary>
+        /// <param name="hubName">The hub name.</param>
+        /// <param name="userId">The user ID.</param>
+        /// <param name="claims">The claim list to be put into access token.</param>
+        /// <param name="lifeTime">The lifetime of the token. The default value is one hour.</param>
         /// <returns>Client access token to Azure SignalR Service.</returns>
-        Task<string> GenerateClientAccessToken(string hubName, string userId = null, IList<Claim> claims = null, TimeSpan? lifeTime = null);
+        string GenerateClientAccessToken(string hubName, string userId = null, IList<Claim> claims = null, TimeSpan? lifeTime = null);
 
         /// <summary>
         /// Creates an client endpoint for SignalR hub connections to connect to Azure SignalR Service

diff --git a/src/Microsoft.Azure.SignalR.Management/ServiceManager.cs b/src/Microsoft.Azure.SignalR.Management/ServiceManager.cs
@@ -132,7 +132,7 @@ public async Task<IServiceHubContext> CreateHubContextAsync(string hubName, ILog
             }
         }
 
-        public Task<string> GenerateClientAccessToken(string hubName, string userId = null, IList<Claim> claims = null, TimeSpan? lifeTime = null)
+        public string GenerateClientAccessToken(string hubName, string userId = null, IList<Claim> claims = null, TimeSpan? lifeTime = null)
         {
             var claimsWithUserId = new List<Claim>();
             if (userId != null)
@@ -143,7 +143,10 @@ public Task<string> GenerateClientAccessToken(string hubName, string userId = nu
             {
                 claimsWithUserId.AddRange(claims);
             }
-            return _endpointProvider.GenerateClientAccessTokenAsync(hubName, claimsWithUserId, lifeTime);
+
+            var task = _endpointProvider.GenerateClientAccessTokenAsync(hubName, claimsWithUserId, lifeTime);
+            task.Wait();
+            return task.Result;
         }
 
         public string GetClientEndpoint(string hubName) => _endpointProvider.GetClientEndpoint(hubName, null, null);

diff --git a/test/Microsoft.Azure.SignalR.E2ETests/Management/ServiceHubContextE2EFacts.cs b/test/Microsoft.Azure.SignalR.E2ETests/Management/ServiceHubContextE2EFacts.cs
@@ -331,16 +331,8 @@ private static string[] GetTestStringList(string prefix, int count)
                 var serviceHubContext = await serviceManager.CreateHubContextAsync(HubName, loggerFactory);
 
                 var clientEndpoint = serviceManager.GetClientEndpoint(HubName);
-                var tasks = from userName in _userNames
+                var tokens = from userName in _userNames
                                          select serviceManager.GenerateClientAccessToken(HubName, userName);
-
-                await Task.WhenAll(tasks);
-
-                var tokens = new List<string>();
-                foreach (var task in tasks)
-                {
-                    tokens.Add(task.Result);
-                }
                 return (clientEndpoint, tokens, serviceHubContext);
             }
         }

diff --git a/test/Microsoft.Azure.SignalR.Management.Tests/ServiceManagerFacts.cs b/test/Microsoft.Azure.SignalR.Management.Tests/ServiceManagerFacts.cs
@@ -45,10 +45,10 @@ from appName in _appNames
 
         [Theory]
         [MemberData(nameof(TestGenerateAccessTokenData))]
-        internal async Task GenerateClientAccessTokenTest(string userId, Claim[] claims, string appName)
+        internal void GenerateClientAccessTokenTest(string userId, Claim[] claims, string appName)
         {
             var manager = new ServiceManager(new ServiceManagerOptions() { ConnectionString = _testConnectionString, ApplicationName = appName }, null);
-            var tokenString = await manager.GenerateClientAccessToken(HubName, userId, claims, _tokenLifeTime);
+            var tokenString =  manager.GenerateClientAccessToken(HubName, userId, claims, _tokenLifeTime);
             var token = JwtTokenHelper.JwtHandler.ReadJwtToken(tokenString);
 
             string expectedToken = JwtTokenHelper.GenerateExpectedAccessToken(token, GetExpectedClientEndpoint(appName), AccessKey, claims);