From 4f7a69f3689c6aeba6021629818e4e3cced17475 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 3 Apr 2015 20:41:16 -0400 Subject: create user info from exchange token --- .../HttpServer/Security/AuthorizationContext.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs') diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs index cd4d23f5c..9461143a8 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Net; +using MediaBrowser.Controller.Connect; +using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Security; using ServiceStack.Web; using System; @@ -10,10 +11,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security public class AuthorizationContext : IAuthorizationContext { private readonly IAuthenticationRepository _authRepo; + private readonly IConnectManager _connectManager; - public AuthorizationContext(IAuthenticationRepository authRepo) + public AuthorizationContext(IAuthenticationRepository authRepo, IConnectManager connectManager) { _authRepo = authRepo; + _connectManager = connectManager; } public AuthorizationInfo GetAuthorizationInfo(object requestContext) @@ -144,6 +147,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security info.DeviceId = tokenInfo.DeviceId; } } + else + { + var user = _connectManager.GetUserFromExchangeToken(token); + if (user != null) + { + info.UserId = user.Id.ToString("N"); + } + } httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo; } -- cgit v1.2.3