Add AuthProvider to IAuthSession to hold the AuthProvider used to Aut…

…henticate
ServiceStack · Mar 13, 2017 · 67065b1 · 67065b1
1 parent a3a44aa
commit 67065b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/ServiceStack/Auth/AuthProvider.cs b/src/ServiceStack/Auth/AuthProvider.cs
@@ -140,6 +140,8 @@ protected virtual void SaveUserAuth(IServiceBase authService, IAuthSession sessi
 
         public virtual IHttpResult OnAuthenticated(IServiceBase authService, IAuthSession session, IAuthTokens tokens, Dictionary<string, string> authInfo)
         {
+            session.AuthProvider = Provider;
+
             var userSession = session as AuthUserSession;
             if (userSession != null)
             {

diff --git a/src/ServiceStack/Auth/CredentialsAuthProvider.cs b/src/ServiceStack/Auth/CredentialsAuthProvider.cs
@@ -169,6 +169,8 @@ protected object Authenticate(IServiceBase authService, IAuthSession session, st
 
         public override IHttpResult OnAuthenticated(IServiceBase authService, IAuthSession session, IAuthTokens tokens, Dictionary<string, string> authInfo)
         {
+            session.AuthProvider = Provider;
+
             var userSession = session as AuthUserSession;
             if (userSession != null)
             {

diff --git a/src/ServiceStack/Auth/IAuthSession.cs b/src/ServiceStack/Auth/IAuthSession.cs
@@ -22,6 +22,7 @@ public interface IAuthSession
         List<string> Permissions { get; set; }
         bool IsAuthenticated { get; set; }
         bool FromToken { get; set; } //Partially restored from JWT
+        string AuthProvider { get; set; }
         string ProfileUrl { get; set; }
 
         //Used for digest authentication replay protection

diff --git a/src/ServiceStack/AuthUserSession.cs b/src/ServiceStack/AuthUserSession.cs
@@ -55,7 +55,8 @@ public AuthUserSession()
         [DataMember(Order = 39)] public virtual string ProfileUrl { get; set; }
         [DataMember(Order = 40)] public virtual string Sequence { get; set; }
         [DataMember(Order = 41)] public long Tag { get; set; }
-        [DataMember(Order = 42)] public List<IAuthTokens> ProviderOAuthAccess { get; set; }
+        [DataMember(Order = 42)] public string AuthProvider { get; set; }
+        [DataMember(Order = 43)] public List<IAuthTokens> ProviderOAuthAccess { get; set; }
 
         public virtual bool IsAuthorized(string provider)
         {