During Credentials and Basic Authentication set AuthResponse ReferrerUrl

jeffgabhart · jeffgabhart · commit 40a9baa29b83 · 2012-12-18T17:21:17.000-06:00
diff --git a/src/ServiceStack.ServiceInterface/Auth/BasicAuthProvider.cs b/src/ServiceStack.ServiceInterface/Auth/BasicAuthProvider.cs
@@ -30,7 +30,9 @@ public override object Authenticate(IServiceBase authService, IAuthSession sessi
             var userName = basicAuth.Value.Key;
             var password = basicAuth.Value.Value;
 
-            return Authenticate(authService, session, userName, password);
+            return Authenticate(authService, session, userName, password, request.Continue);
         }
+
+        
     }
 }
diff --git a/src/ServiceStack.ServiceInterface/Auth/CredentialsAuthProvider.cs b/src/ServiceStack.ServiceInterface/Auth/CredentialsAuthProvider.cs
@@ -71,10 +71,15 @@ public override bool IsAuthorized(IAuthSession session, IOAuthTokens tokens, Aut
         public override object Authenticate(IServiceBase authService, IAuthSession session, Auth request)
         {
             new CredentialsAuthValidator().ValidateAndThrow(request);
-            return Authenticate(authService, session, request.UserName, request.Password);
+            return Authenticate(authService, session, request.UserName, request.Password, request.Continue);
         }
 
         protected object Authenticate(IServiceBase authService, IAuthSession session, string userName, string password)
+        {
+            return Authenticate(authService, session, userName, password, string.Empty);
+        }
+
+        protected object Authenticate(IServiceBase authService, IAuthSession session, string userName, string password, string referrerUrl)
         {
             if (!LoginMatchesSession(session, userName))
             {
@@ -92,6 +97,7 @@ protected object Authenticate(IServiceBase authService, IAuthSession session, st
                 return new AuthResponse {
                     UserName = userName,
                     SessionId = session.Id,
+                    ReferrerUrl = referrerUrl
                 };
             }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ public override object Authenticate(IServiceBase authService, IAuthSession sessi`
`30`	`30`	`var userName = basicAuth.Value.Key;`
`31`	`31`	`var password = basicAuth.Value.Value;`
`32`	`32`
`33`		`- return Authenticate(authService, session, userName, password);`
	`33`	`+ return Authenticate(authService, session, userName, password, request.Continue);`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,15 @@ public override bool IsAuthorized(IAuthSession session, IOAuthTokens tokens, Aut`
`71`	`71`	`public override object Authenticate(IServiceBase authService, IAuthSession session, Auth request)`
`72`	`72`	`{`
`73`	`73`	`new CredentialsAuthValidator().ValidateAndThrow(request);`
`74`		`- return Authenticate(authService, session, request.UserName, request.Password);`
	`74`	`+ return Authenticate(authService, session, request.UserName, request.Password, request.Continue);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`protected object Authenticate(IServiceBase authService, IAuthSession session, string userName, string password)`
	`78`	`+ {`
	`79`	`+ return Authenticate(authService, session, userName, password, string.Empty);`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ protected object Authenticate(IServiceBase authService, IAuthSession session, string userName, string password, string referrerUrl)`
`78`	`83`	`{`
`79`	`84`	`if (!LoginMatchesSession(session, userName))`
`80`	`85`	`{`
`@@ -92,6 +97,7 @@ protected object Authenticate(IServiceBase authService, IAuthSession session, st`
`92`	`97`	`return new AuthResponse {`
`93`	`98`	`UserName = userName,`
`94`	`99`	`SessionId = session.Id,`
	`100`	`+ ReferrerUrl = referrerUrl`
`95`	`101`	`};`
`96`	`102`	`}`
`97`	`103`