From cd42bce822453e4860430989de5b75f379c11e6b Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Fri, 16 Oct 2015 10:54:53 -0400 Subject: [PATCH] Move exception to SecurityManager --- MediaBrowser.Api/PluginService.cs | 3 +-- .../Security/PluginSecurityManager.cs | 7 ++----- MediaBrowser.Common/Security/ISecurityManager.cs | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index c1d29681c6..dc3d103eb5 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -296,8 +296,7 @@ namespace MediaBrowser.Api /// public async Task Post(RegisterAppstoreSale request) { - var success = await _securityManager.RegisterAppStoreSale(request.Store, request.Application, request.Product, request.Feature, request.Type, request.StoreId, request.StoreToken, request.Email, request.Amount); - if (!success) throw new ApplicationException("Error registering store sale"); + await _securityManager.RegisterAppStoreSale(request.Store, request.Application, request.Product, request.Feature, request.Type, request.StoreId, request.StoreToken, request.Email, request.Amount); } /// diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs index 861d638f2c..facaaeff9b 100644 --- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs +++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs @@ -199,8 +199,7 @@ namespace MediaBrowser.Common.Implementations.Security /// /// /// - /// true if successful - public async Task RegisterAppStoreSale(string store, string application, string product, string feature, + public async Task RegisterAppStoreSale(string store, string application, string product, string feature, string type, string storeId, string storeToken, string email, string amt) { var data = new Dictionary() @@ -232,8 +231,6 @@ namespace MediaBrowser.Common.Implementations.Security { SupporterKey = reg.key; } - - return true; } } @@ -241,7 +238,7 @@ namespace MediaBrowser.Common.Implementations.Security { _logger.ErrorException("Error registering appstore purchase {0}", e, _jsonSerializer.SerializeToString(data)); //TODO - really need to write this to a file so we can re-try it automatically - return false; + throw new ApplicationException("Error registering store sale"); } } diff --git a/MediaBrowser.Common/Security/ISecurityManager.cs b/MediaBrowser.Common/Security/ISecurityManager.cs index 5d15808da5..1b2e22a78c 100644 --- a/MediaBrowser.Common/Security/ISecurityManager.cs +++ b/MediaBrowser.Common/Security/ISecurityManager.cs @@ -59,8 +59,7 @@ namespace MediaBrowser.Common.Security /// /// /// - /// true if successful - Task RegisterAppStoreSale(string store, string application, string product, string feature, + Task RegisterAppStoreSale(string store, string application, string product, string feature, string type, string storeId, string storeToken, string email, string amt); } } \ No newline at end of file