Rename SessionManager to UserSessionManager as there is now an AppSessionManager (breaking change).

jforsell · jforsell · commit 5c5f0d8e221a · 2016-08-18T12:22:12.000+01:00
diff --git a/src/SymphonyOSS.RestApiClient/Authentication/UserSessionManager.cs b/src/SymphonyOSS.RestApiClient/Authentication/UserSessionManager.cs
@@ -25,7 +25,7 @@ namespace SymphonyOSS.RestApiClient.Authentication
     /// Contains the session and key manager tokens needed for authentication, and
     /// the logic for generating these tokens using the authentication endpoints.
     /// </summary>
-    public class SessionManager : ISessionManager
+    public class UserSessionManager : ISessionManager
     {
         private readonly IAuthenticationApi _sessionAuthApi;
 
@@ -35,7 +35,7 @@ public class SessionManager : ISessionManager
 
         private string _keyManagerToken;
 
-        public SessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2 certificate)
+        public UserSessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2 certificate)
         {
             Certificate = certificate;
             var sessionAuthApiFactory = new AuthenticatorApiFactory(sessionAuthUrl);
@@ -44,7 +44,7 @@ public SessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2
             _keyAuthApi = keyAuthApiFactory.CreateAuthenticationApi(certificate);
         }
 
-        public SessionManager(IAuthenticationApi sessionAuthApi, IAuthenticationApi keyAuthApi, X509Certificate2 certificate)
+        public UserSessionManager(IAuthenticationApi sessionAuthApi, IAuthenticationApi keyAuthApi, X509Certificate2 certificate)
         {
             Certificate = certificate;
             _sessionAuthApi = sessionAuthApi;
diff --git a/src/SymphonyOSS.RestApiClient/Factories/PodApiFactory.cs b/src/SymphonyOSS.RestApiClient/Factories/PodApiFactory.cs
@@ -83,7 +83,7 @@ public PresenceApi CreatePresenceApi(ISessionManager sessionManager, IApiExecuto
         /// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
         /// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
         /// <returns>The SecurityApi instance.</returns>
-        public SecurityApi CreateSecurityApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
+        public SecurityApi CreateSecurityApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
         {
             return Create<SecurityApi>(sessionManager, apiExecutor);
         }
diff --git a/src/SymphonyOSS.RestApiClient/SymphonyOSS.RestApiClient.csproj b/src/SymphonyOSS.RestApiClient/SymphonyOSS.RestApiClient.csproj
@@ -69,7 +69,7 @@
     <Compile Include="Authentication\AppSessionManager.cs" />
     <Compile Include="Authentication\ISessionManager.cs" />
     <Compile Include="Authentication\IAuthTokens.cs" />
-    <Compile Include="Authentication\SessionManager.cs" />
+    <Compile Include="Authentication\UserSessionManager.cs" />
     <Compile Include="Factories\AgentApiFactory.cs" />
     <Compile Include="Factories\ApiFactoryUtils.cs" />
     <Compile Include="Factories\AuthenticatorApiFactory.cs" />
diff --git a/test/SymphonyOSS.RestApiClient.Tests/AgentApiFactoryTest.cs b/test/SymphonyOSS.RestApiClient.Tests/AgentApiFactoryTest.cs
@@ -25,43 +25,43 @@ namespace SymphonyOSS.RestApiClient.Tests
 
     public class AgentApiFactoryTest
     {
-        private readonly SessionManager _sessionManager;
+        private readonly UserSessionManager _userSessionManager;
 
         public AgentApiFactoryTest()
         {
             var certificateMock = new Mock<X509Certificate2>();
-            _sessionManager = new SessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);
+            _userSessionManager = new UserSessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);
         }
 
         [Fact]
         public void EnsureConstructs_an_AttachmentsApi_instance()
         {
             var agentApiFactory = new AgentApiFactory("https://agent");
-            var result = agentApiFactory.CreateAttachmentsApi(_sessionManager);
+            var result = agentApiFactory.CreateAttachmentsApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_DatafeedApi_instance()
         {
             var agentApiFactory = new AgentApiFactory("https://agent");
-            var result = agentApiFactory.CreateDatafeedApi(_sessionManager);
+            var result = agentApiFactory.CreateDatafeedApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_MessagesApi_instance()
         {
             var agentApiFactory = new AgentApiFactory("https://agent");
-            var result = agentApiFactory.CreateMessagesApi(_sessionManager);
+            var result = agentApiFactory.CreateMessagesApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_UtilApi_instance()
         {
             var agentApiFactory = new AgentApiFactory("https://agent");
-            var result = agentApiFactory.CreateUtilApi(_sessionManager);
+            var result = agentApiFactory.CreateUtilApi(_userSessionManager);
             Assert.NotNull(result);
         }
     }
diff --git a/test/SymphonyOSS.RestApiClient.Tests/PodApiFactoryTest.cs b/test/SymphonyOSS.RestApiClient.Tests/PodApiFactoryTest.cs
@@ -26,75 +26,75 @@ namespace SymphonyOSS.RestApiClient.Tests
 
     public class PodApiFactoryTest
     {
-        private readonly SessionManager _sessionManager;
+        private readonly UserSessionManager _userSessionManager;
 
         public PodApiFactoryTest()
         {
             var certificateMock = new Mock<X509Certificate2>();
-            _sessionManager = new SessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);
+            _userSessionManager = new UserSessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);
         }
 
         [Fact]
         public void EnsureConstructs_a_MessageSuppressionApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateMessageSuppressionApi(_sessionManager);
+            var result = podApiFactory.CreateMessageSuppressionApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_PresenceApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreatePresenceApi(_sessionManager);
+            var result = podApiFactory.CreatePresenceApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_SessionApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateSessionApi(_sessionManager);
+            var result = podApiFactory.CreateSessionApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_StreamsApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateStreamsApi(_sessionManager);
+            var result = podApiFactory.CreateStreamsApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_SystemApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateSystemApi(_sessionManager);
+            var result = podApiFactory.CreateSystemApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_UserApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateUserApi(_sessionManager);
+            var result = podApiFactory.CreateUserApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_UsersApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateUsersApi(_sessionManager);
+            var result = podApiFactory.CreateUsersApi(_userSessionManager);
             Assert.NotNull(result);
         }
 
         [Fact]
         public void EnsureConstructs_a_RoomMembershipApi_instance()
         {
             var podApiFactory = new PodApiFactory("https://pod");
-            var result = podApiFactory.CreateRoomMembershipApi(_sessionManager);
+            var result = podApiFactory.CreateRoomMembershipApi(_userSessionManager);
             Assert.NotNull(result);
         }
     }
diff --git a/test/SymphonyOSS.RestApiClient.Tests/SymphonyOSS.RestApiClient.Tests.csproj b/test/SymphonyOSS.RestApiClient.Tests/SymphonyOSS.RestApiClient.Tests.csproj
@@ -104,7 +104,7 @@
     <Compile Include="RetryStrategyApiExecutorTest.cs" />
     <Compile Include="PodApiFactoryTest.cs" />
     <Compile Include="SessionApiTest.cs" />
-    <Compile Include="SessionManagerTest.cs" />
+    <Compile Include="UserSessionManagerTest.cs" />
     <Compile Include="StreamsApiTest.cs" />
     <Compile Include="SystemApiTest.cs" />
     <Compile Include="UserApiTest.cs" />
diff --git a/test/SymphonyOSS.RestApiClient.Tests/UserSessionManagerTest.cs b/test/SymphonyOSS.RestApiClient.Tests/UserSessionManagerTest.cs
@@ -24,15 +24,15 @@ namespace SymphonyOSS.RestApiClient.Tests
     using System.Security.Cryptography.X509Certificates;
     using Xunit;
 
-    public class SessionManagerTest
+    public class UserSessionManagerTest
     {
         private readonly X509Certificate2 _certificate;
 
         private readonly Mock<IAuthenticationApi> _sessionAuthApiMock;
 
         private readonly Mock<IAuthenticationApi> _keyAuthApiMock;
 
-        public SessionManagerTest()
+        public UserSessionManagerTest()
         {
             _certificate = new Mock<X509Certificate2>().Object;
             _sessionAuthApiMock = new Mock<IAuthenticationApi>();
@@ -44,9 +44,9 @@ public void EnsureTokens_are_returned_without_explicitly_calling_GenerateTokens(
         {
             _sessionAuthApiMock.Setup(obj => obj.V1AuthenticatePost()).Returns(new Token("sessionToken", "s1"));
             _keyAuthApiMock.Setup(obj => obj.V1AuthenticatePost()).Returns(new Token("keyManagerToken", "km1"));
-            var sessionManager = new SessionManager(_sessionAuthApiMock.Object, _keyAuthApiMock.Object, _certificate);
-            var sessionToken = sessionManager.SessionToken;
-            var keyManagerToken = sessionManager.KeyManagerToken;
+            var userSessionManager = new UserSessionManager(_sessionAuthApiMock.Object, _keyAuthApiMock.Object, _certificate);
+            var sessionToken = userSessionManager.SessionToken;
+            var keyManagerToken = userSessionManager.KeyManagerToken;
             Assert.Equal("s1", sessionToken);
             Assert.Equal("km1", keyManagerToken);
         }
@@ -66,16 +66,16 @@ public void EnsureGenerateTokens_regenerate_tokens_every_call()
                 ++keyManagerTokenCounter;
                 return new Token("keyManagerToken", "km" + keyManagerTokenCounter.ToString());
             });
-            var sessionManager = new SessionManager(_sessionAuthApiMock.Object, _keyAuthApiMock.Object, _certificate);
-            Assert.Equal("s1", sessionManager.SessionToken);
-            Assert.Equal("km101", sessionManager.KeyManagerToken);
-            Assert.Equal("s1", sessionManager.SessionToken);
-            Assert.Equal("km101", sessionManager.KeyManagerToken);
+            var userSessionManager = new UserSessionManager(_sessionAuthApiMock.Object, _keyAuthApiMock.Object, _certificate);
+            Assert.Equal("s1", userSessionManager.SessionToken);
+            Assert.Equal("km101", userSessionManager.KeyManagerToken);
+            Assert.Equal("s1", userSessionManager.SessionToken);
+            Assert.Equal("km101", userSessionManager.KeyManagerToken);
 
-            sessionManager.GenerateTokens();
-            Assert.Equal("s2", sessionManager.SessionToken);
-            Assert.Equal("km102", sessionManager.KeyManagerToken);
-            Assert.Equal("km102", sessionManager.KeyManagerToken);
+            userSessionManager.GenerateTokens();
+            Assert.Equal("s2", userSessionManager.SessionToken);
+            Assert.Equal("km102", userSessionManager.KeyManagerToken);
+            Assert.Equal("km102", userSessionManager.KeyManagerToken);
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace SymphonyOSS.RestApiClient.Authentication`
`25`	`25`	`/// Contains the session and key manager tokens needed for authentication, and`
`26`	`26`	`/// the logic for generating these tokens using the authentication endpoints.`
`27`	`27`	`/// </summary>`
`28`		`- public class SessionManager : ISessionManager`
	`28`	`+ public class UserSessionManager : ISessionManager`
`29`	`29`	`{`
`30`	`30`	`private readonly IAuthenticationApi _sessionAuthApi;`
`31`	`31`
`@@ -35,7 +35,7 @@ public class SessionManager : ISessionManager`
`35`	`35`
`36`	`36`	`private string _keyManagerToken;`
`37`	`37`
`38`		`- public SessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2 certificate)`
	`38`	`+ public UserSessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2 certificate)`
`39`	`39`	`{`
`40`	`40`	`Certificate = certificate;`
`41`	`41`	`var sessionAuthApiFactory = new AuthenticatorApiFactory(sessionAuthUrl);`
`@@ -44,7 +44,7 @@ public SessionManager(string sessionAuthUrl, string keyAuthUrl, X509Certificate2`
`44`	`44`	`_keyAuthApi = keyAuthApiFactory.CreateAuthenticationApi(certificate);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public SessionManager(IAuthenticationApi sessionAuthApi, IAuthenticationApi keyAuthApi, X509Certificate2 certificate)`
	`47`	`+ public UserSessionManager(IAuthenticationApi sessionAuthApi, IAuthenticationApi keyAuthApi, X509Certificate2 certificate)`
`48`	`48`	`{`
`49`	`49`	`Certificate = certificate;`
`50`	`50`	`_sessionAuthApi = sessionAuthApi;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public PresenceApi CreatePresenceApi(ISessionManager sessionManager, IApiExecuto`
`83`	`83`	`/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>`
`84`	`84`	`/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>`
`85`	`85`	`/// <returns>The SecurityApi instance.</returns>`
`86`		`- public SecurityApi CreateSecurityApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)`
	`86`	`+ public SecurityApi CreateSecurityApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)`
`87`	`87`	`{`
`88`	`88`	`return Create<SecurityApi>(sessionManager, apiExecutor);`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,43 +25,43 @@ namespace SymphonyOSS.RestApiClient.Tests`
`25`	`25`
`26`	`26`	`public class AgentApiFactoryTest`
`27`	`27`	`{`
`28`		`- private readonly SessionManager _sessionManager;`
	`28`	`+ private readonly UserSessionManager _userSessionManager;`
`29`	`29`
`30`	`30`	`public AgentApiFactoryTest()`
`31`	`31`	`{`
`32`	`32`	`var certificateMock = new Mock<X509Certificate2>();`
`33`		`- _sessionManager = new SessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);`
	`33`	`+ _userSessionManager = new UserSessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`[Fact]`
`37`	`37`	`public void EnsureConstructs_an_AttachmentsApi_instance()`
`38`	`38`	`{`
`39`	`39`	`var agentApiFactory = new AgentApiFactory("https://agent");`
`40`		`- var result = agentApiFactory.CreateAttachmentsApi(_sessionManager);`
	`40`	`+ var result = agentApiFactory.CreateAttachmentsApi(_userSessionManager);`
`41`	`41`	`Assert.NotNull(result);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact]`
`45`	`45`	`public void EnsureConstructs_a_DatafeedApi_instance()`
`46`	`46`	`{`
`47`	`47`	`var agentApiFactory = new AgentApiFactory("https://agent");`
`48`		`- var result = agentApiFactory.CreateDatafeedApi(_sessionManager);`
	`48`	`+ var result = agentApiFactory.CreateDatafeedApi(_userSessionManager);`
`49`	`49`	`Assert.NotNull(result);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`[Fact]`
`53`	`53`	`public void EnsureConstructs_a_MessagesApi_instance()`
`54`	`54`	`{`
`55`	`55`	`var agentApiFactory = new AgentApiFactory("https://agent");`
`56`		`- var result = agentApiFactory.CreateMessagesApi(_sessionManager);`
	`56`	`+ var result = agentApiFactory.CreateMessagesApi(_userSessionManager);`
`57`	`57`	`Assert.NotNull(result);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`[Fact]`
`61`	`61`	`public void EnsureConstructs_a_UtilApi_instance()`
`62`	`62`	`{`
`63`	`63`	`var agentApiFactory = new AgentApiFactory("https://agent");`
`64`		`- var result = agentApiFactory.CreateUtilApi(_sessionManager);`
	`64`	`+ var result = agentApiFactory.CreateUtilApi(_userSessionManager);`
`65`	`65`	`Assert.NotNull(result);`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,75 +26,75 @@ namespace SymphonyOSS.RestApiClient.Tests`
`26`	`26`
`27`	`27`	`public class PodApiFactoryTest`
`28`	`28`	`{`
`29`		`- private readonly SessionManager _sessionManager;`
	`29`	`+ private readonly UserSessionManager _userSessionManager;`
`30`	`30`
`31`	`31`	`public PodApiFactoryTest()`
`32`	`32`	`{`
`33`	`33`	`var certificateMock = new Mock<X509Certificate2>();`
`34`		`- _sessionManager = new SessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);`
	`34`	`+ _userSessionManager = new UserSessionManager("https://sessionauth", "https://keyauth", certificateMock.Object);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`[Fact]`
`38`	`38`	`public void EnsureConstructs_a_MessageSuppressionApi_instance()`
`39`	`39`	`{`
`40`	`40`	`var podApiFactory = new PodApiFactory("https://pod");`
`41`		`- var result = podApiFactory.CreateMessageSuppressionApi(_sessionManager);`
	`41`	`+ var result = podApiFactory.CreateMessageSuppressionApi(_userSessionManager);`
`42`	`42`	`Assert.NotNull(result);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`[Fact]`
`46`	`46`	`public void EnsureConstructs_a_PresenceApi_instance()`
`47`	`47`	`{`
`48`	`48`	`var podApiFactory = new PodApiFactory("https://pod");`
`49`		`- var result = podApiFactory.CreatePresenceApi(_sessionManager);`
	`49`	`+ var result = podApiFactory.CreatePresenceApi(_userSessionManager);`
`50`	`50`	`Assert.NotNull(result);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`[Fact]`
`54`	`54`	`public void EnsureConstructs_a_SessionApi_instance()`
`55`	`55`	`{`
`56`	`56`	`var podApiFactory = new PodApiFactory("https://pod");`
`57`		`- var result = podApiFactory.CreateSessionApi(_sessionManager);`
	`57`	`+ var result = podApiFactory.CreateSessionApi(_userSessionManager);`
`58`	`58`	`Assert.NotNull(result);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`[Fact]`
`62`	`62`	`public void EnsureConstructs_a_StreamsApi_instance()`
`63`	`63`	`{`
`64`	`64`	`var podApiFactory = new PodApiFactory("https://pod");`
`65`		`- var result = podApiFactory.CreateStreamsApi(_sessionManager);`
	`65`	`+ var result = podApiFactory.CreateStreamsApi(_userSessionManager);`
`66`	`66`	`Assert.NotNull(result);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`[Fact]`
`70`	`70`	`public void EnsureConstructs_a_SystemApi_instance()`
`71`	`71`	`{`
`72`	`72`	`var podApiFactory = new PodApiFactory("https://pod");`
`73`		`- var result = podApiFactory.CreateSystemApi(_sessionManager);`
	`73`	`+ var result = podApiFactory.CreateSystemApi(_userSessionManager);`
`74`	`74`	`Assert.NotNull(result);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`[Fact]`
`78`	`78`	`public void EnsureConstructs_a_UserApi_instance()`
`79`	`79`	`{`
`80`	`80`	`var podApiFactory = new PodApiFactory("https://pod");`
`81`		`- var result = podApiFactory.CreateUserApi(_sessionManager);`
	`81`	`+ var result = podApiFactory.CreateUserApi(_userSessionManager);`
`82`	`82`	`Assert.NotNull(result);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`[Fact]`
`86`	`86`	`public void EnsureConstructs_a_UsersApi_instance()`
`87`	`87`	`{`
`88`	`88`	`var podApiFactory = new PodApiFactory("https://pod");`
`89`		`- var result = podApiFactory.CreateUsersApi(_sessionManager);`
	`89`	`+ var result = podApiFactory.CreateUsersApi(_userSessionManager);`
`90`	`90`	`Assert.NotNull(result);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`[Fact]`
`94`	`94`	`public void EnsureConstructs_a_RoomMembershipApi_instance()`
`95`	`95`	`{`
`96`	`96`	`var podApiFactory = new PodApiFactory("https://pod");`
`97`		`- var result = podApiFactory.CreateRoomMembershipApi(_sessionManager);`
	`97`	`+ var result = podApiFactory.CreateRoomMembershipApi(_userSessionManager);`
`98`	`98`	`Assert.NotNull(result);`
`99`	`99`	`}`
`100`	`100`	`}`