jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Computer authorized enrolment

Browse Source 
Computer Accounts could not enrol
This commit is contained in:
Gary Sharp
2013-10-21 20:02:40 +11:00
parent 5f9a49bca3
commit 4dfe9ad086
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/DeviceBI/Enrol.cs
+1 -1
View File
@@ -347,7 +347,7 @@ namespace Disco.BI.DeviceBI
{
if (!authenticatedToken.Has(Claims.Device.Actions.EnrolDevices))
{
if (authenticatedToken.Has(Claims.ComputerAccount))
if (!authenticatedToken.Has(Claims.ComputerAccount))
throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.Id));
if (!authenticatedToken.User.Id.Equals(string.Format("{0}$", Request.DeviceComputerName), System.StringComparison.InvariantCultureIgnoreCase))
throw new EnrolSafeException(string.Format("Connection not correctly authenticated (SN: {0}; Auth User: {1})", Request.DeviceSerialNumber, authenticatedToken.User.Id));
Disco.BI/BI/Extensions/ClientServicesExtensions.cs
+6 -4
View File
@@ -7,6 +7,7 @@ using System.Web;
using Disco.Data.Repository;
using Disco.Models.Repository;
using Disco.Services.Users;
using Disco.Services.Authorization;
namespace Disco.BI.Extensions
{
@@ -43,12 +44,13 @@ namespace Disco.BI.Extensions
using (DiscoDataContext database = new DiscoDataContext())
{
User user = UserService.GetUser(username, database, true);
AuthorizationToken token = UserService.GetAuthorization(username, database, true);
WhoAmIResponse response = new WhoAmIResponse()
{
Username = user.Id,
DisplayName = user.DisplayName,
Type = "TODO!"
Username = token.User.Id,
DisplayName = token.User.DisplayName,
Type = token.Has(Claims.ComputerAccount) ? "Computer Account" : "User Account"
};
return response;
}