From 389023c3eb755619c2ae5d5268a9564507efdcc0 Mon Sep 17 00:00:00 2001 From: Uncled1023 Date: Thu, 17 Jan 2019 23:53:49 -0800 Subject: [PATCH] Added username claim to API claims available in token --- IdentityServer/Configuration.cs | 2 +- Teknik/Areas/API/V1/Controllers/UploadAPIv1Controller.cs | 9 +++------ Teknik/Areas/Upload/Controllers/UploadController.cs | 9 +++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/IdentityServer/Configuration.cs b/IdentityServer/Configuration.cs index 2185969..aa36d5e 100644 --- a/IdentityServer/Configuration.cs +++ b/IdentityServer/Configuration.cs @@ -90,7 +90,7 @@ namespace Teknik.IdentityServer.Configuration Name = config.UserConfig.IdentityServerConfig.APIName, DisplayName = "Teknik API", Description = "Teknik API Access for end users", - UserClaims = new List {"role"}, + UserClaims = new List {"role", "username"}, ApiSecrets = new List {new Secret(config.UserConfig.IdentityServerConfig.APISecret.Sha256()) }, Scopes = new List { new Scope("teknik-api.read", "Teknik API Read Access"), diff --git a/Teknik/Areas/API/V1/Controllers/UploadAPIv1Controller.cs b/Teknik/Areas/API/V1/Controllers/UploadAPIv1Controller.cs index cb5c1bb..c855b3d 100644 --- a/Teknik/Areas/API/V1/Controllers/UploadAPIv1Controller.cs +++ b/Teknik/Areas/API/V1/Controllers/UploadAPIv1Controller.cs @@ -41,13 +41,10 @@ namespace Teknik.Areas.API.V1.Controllers if (User.Identity.IsAuthenticated) { maxUploadSize = _config.UploadConfig.MaxUploadSizeBasic; - if (User.Identity.IsAuthenticated) + IdentityUserInfo userInfo = await IdentityHelper.GetIdentityUserInfo(_config, User.Identity.Name); + if (userInfo.AccountType == AccountType.Premium) { - IdentityUserInfo userInfo = await IdentityHelper.GetIdentityUserInfo(_config, User.Identity.Name); - if (userInfo.AccountType == AccountType.Premium) - { - maxUploadSize = _config.UploadConfig.MaxUploadSizePremium; - } + maxUploadSize = _config.UploadConfig.MaxUploadSizePremium; } } if (model.file.Length <= maxUploadSize) diff --git a/Teknik/Areas/Upload/Controllers/UploadController.cs b/Teknik/Areas/Upload/Controllers/UploadController.cs index f401d1f..6ad7b25 100644 --- a/Teknik/Areas/Upload/Controllers/UploadController.cs +++ b/Teknik/Areas/Upload/Controllers/UploadController.cs @@ -66,13 +66,10 @@ namespace Teknik.Areas.Upload.Controllers if (User.Identity.IsAuthenticated) { maxUploadSize = _config.UploadConfig.MaxUploadSizeBasic; - if (User.Identity.IsAuthenticated) + IdentityUserInfo userInfo = await IdentityHelper.GetIdentityUserInfo(_config, User.Identity.Name); + if (userInfo.AccountType == AccountType.Premium) { - IdentityUserInfo userInfo = await IdentityHelper.GetIdentityUserInfo(_config, User.Identity.Name); - if (userInfo.AccountType == AccountType.Premium) - { - maxUploadSize = _config.UploadConfig.MaxUploadSizePremium; - } + maxUploadSize = _config.UploadConfig.MaxUploadSizePremium; } } if (uploadFile.file.Length <= maxUploadSize)