Auth: Logout disabled user (#17166)

* Feature: revoke user token when disabled * Chore: fix linter error
2019-05-23 15:54:47 +03:00
parent c87b2c9913
commit a3a7916597
3 changed files with 26 additions and 18 deletions
@@ -222,16 +222,23 @@ func adminDisableUserScenario(desc string, action string, url string, routePatte
 	Convey(desc+" "+url, func() {
 		defer bus.ClearBusHandlers()

+		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+		hs := HTTPServer{
+			Bus:              bus.GetBus(),
+			AuthTokenService: fakeAuthTokenService,
+		}
+
 		sc := setupScenarioContext(url)
-		sc.defaultHandler = Wrap(func(c *m.ReqContext) {
+		sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
 			sc.context = c
 			sc.context.UserId = TestUserID

 			if action == "enable" {
-				AdminEnableUser(c)
-			} else {
-				AdminDisableUser(c)
+				return AdminEnableUser(c)
 			}
+
+			return hs.AdminDisableUser(c)
 		})

 		sc.m.Post(routePattern, sc.defaultHandler)