From 8146361ac766dced749c324d058f05fc3811c108 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sun, 27 Sep 2015 12:46:15 -0400 Subject: [PATCH] Revert "Add store registration endpoint (pointing to test)" This reverts commit 42ddf1cd86b5a5b50f8023e492ce6d7fcadc0fe1. --- MediaBrowser.Api/PluginService.cs | 30 -------------- .../Security/PluginSecurityManager.cs | 39 ------------------- .../Security/RegRecord.cs | 1 - .../Security/ISecurityManager.cs | 8 ---- 4 files changed, 78 deletions(-) diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index 224a88881b..eb49914eb1 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -118,30 +118,6 @@ namespace MediaBrowser.Api public string Name { get; set; } } - [Route("/Appstore/Register", "POST", Summary = "Registers an appstore sale")] - [Authenticated] - public class RegisterAppstoreSale - { - [ApiMember(Name = "Store", Description = "Store Name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Store { get; set; } - [ApiMember(Name = "Application", Description = "Application id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Application { get; set; } - [ApiMember(Name = "Product", Description = "Product id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Product { get; set; } - [ApiMember(Name = "Type", Description = "Type of product (Product or Subscription)", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Type { get; set; } - [ApiMember(Name = "StoreId", Description = "Store User Id (if needed)", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public string StoreId { get; set; } - [ApiMember(Name = "StoreToken", Description = "Unique ID for this purchase in the store", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string StoreToken { get; set; } - [ApiMember(Name = "Feature", Description = "Emby Feature Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Feature { get; set; } - [ApiMember(Name = "Email", Description = "Email address for purchase", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Email { get; set; } - [ApiMember(Name = "Amount", Description = "String representation of price (can have currency sign)", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] - public string Amount { get; set; } - } - /// /// Class PluginsService /// @@ -289,12 +265,6 @@ namespace MediaBrowser.Api return ToOptimizedSerializedResultUsingCache(result); } - public async Task Post(RegisterAppstoreSale request) - { - var success = await _securityManager.RegisterAppStoreSale(request.Store, request.Application, request.Product, request.Type, request.StoreId, request.StoreToken, request.Email, request.Amount); - if (!success) throw new ApplicationException("Error registering store sale"); - } - /// /// Posts the specified request. /// diff --git a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs index 4880b326e0..ec36132980 100644 --- a/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs +++ b/MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs @@ -18,7 +18,6 @@ namespace MediaBrowser.Common.Implementations.Security public class PluginSecurityManager : ISecurityManager { private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate"; - private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "https://wwwm.mb3admin.com/test/admin/" + "service/appstore/register"; /// /// The _is MB supporter @@ -186,44 +185,6 @@ namespace MediaBrowser.Common.Implementations.Security } } - public async Task RegisterAppStoreSale(string store, string application, string product, - string type, string storeId, string storeToken, string email, string amt) - { - var data = new Dictionary() - { - {"store", store}, - {"application", application}, - {"product", product}, - {"type", type}, - {"storeId", storeId}, - {"token", storeToken}, - {"email", email}, - {"amt", amt} - }; - - try - { - using (var json = await _httpClient.Post(AppstoreRegUrl, data, CancellationToken.None).ConfigureAwait(false)) - { - var reg = _jsonSerializer.DeserializeFromStream(json); - if (!String.IsNullOrEmpty(reg.key)) - { - SupporterKey = reg.key; - } - - return true; - } - - } - catch (Exception e) - { - _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; - } - - } - private async Task GetRegistrationStatusInternal(string feature, string mb2Equivalent = null, string version = null) diff --git a/MediaBrowser.Common.Implementations/Security/RegRecord.cs b/MediaBrowser.Common.Implementations/Security/RegRecord.cs index ece70b7726..f4e4337bfa 100644 --- a/MediaBrowser.Common.Implementations/Security/RegRecord.cs +++ b/MediaBrowser.Common.Implementations/Security/RegRecord.cs @@ -7,6 +7,5 @@ namespace MediaBrowser.Common.Implementations.Security public string featId { get; set; } public bool registered { get; set; } public DateTime expDate { get; set; } - public string key { get; set; } } } \ No newline at end of file diff --git a/MediaBrowser.Common/Security/ISecurityManager.cs b/MediaBrowser.Common/Security/ISecurityManager.cs index 17bd88b65f..9354543532 100644 --- a/MediaBrowser.Common/Security/ISecurityManager.cs +++ b/MediaBrowser.Common/Security/ISecurityManager.cs @@ -1,4 +1,3 @@ -using System; using MediaBrowser.Model.Entities; using System.Threading.Tasks; @@ -41,13 +40,6 @@ namespace MediaBrowser.Common.Security /// Task LoadAllRegistrationInfo(); - /// - /// Register an appstore sale - /// - /// true if successful - Task RegisterAppStoreSale(string store, string application, string product, - string type, string storeId, string storeToken, string email, string amt); - /// /// Gets the supporter information. ///