Implemented IapService

d2dyno1 · d2dyno1 · commit 6e94fea13d22 · 2023-05-18T00:29:46.000+02:00
diff --git a/SecureFolderFS.AvaloniaUI/App.axaml.cs b/SecureFolderFS.AvaloniaUI/App.axaml.cs
@@ -83,7 +83,7 @@ private IServiceProvider ConfigureServices(IModifiableFolder settingsFolder)
                 .AddSingleton<ILocalizationService, LocalizationService>()
                 .AddSingleton<IFileExplorerService, FileExplorerService>()
                 .AddSingleton<IClipboardService, ClipboardService>()
-                .AddSingleton<IUpdateService, UpdateService>()
+                .AddSingleton<IUpdateService, AvaloniaUpdateService>()
 
                 // Conditional (singleton) services
 #if DEBUG
diff --git a/SecureFolderFS.AvaloniaUI/ServiceImplementation/AvaloniaUpdateService.cs b/SecureFolderFS.AvaloniaUI/ServiceImplementation/AvaloniaUpdateService.cs
@@ -1,30 +1,28 @@
+using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Services;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using SecureFolderFS.Sdk.Enums;
-using SecureFolderFS.Sdk.Services;
 
 namespace SecureFolderFS.AvaloniaUI.ServiceImplementation
 {
-    // TODO implement
+    // TODO: Implement updates on AvaloniaUI
     /// <inheritdoc cref="IUpdateService"/>
-    internal sealed class UpdateService : IUpdateService
+    internal sealed class AvaloniaUpdateService : IUpdateService
     {
+        /// <inheritdoc/>
         public Task<bool> IsSupportedAsync()
         {
             return Task.FromResult(false);
         }
 
-        public Task<bool> InitializeAsync()
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<bool> IsUpdateAvailableAsync()
+        /// <inheritdoc/>
+        public Task<bool> IsUpdateAvailableAsync(CancellationToken cancellationToken = default)
         {
             throw new NotImplementedException();
         }
 
+        /// <inheritdoc/>
         public Task<AppUpdateResultType> UpdateAsync(IProgress<double>? progress, CancellationToken cancellationToken = default)
         {
             throw new NotImplementedException();
diff --git a/SecureFolderFS.AvaloniaUI/UserControls/GraphControl.axaml.cs b/SecureFolderFS.AvaloniaUI/UserControls/GraphControl.axaml.cs
@@ -32,7 +32,7 @@ public GraphControl()
         private async void Chart_Loaded(object sender, RoutedEventArgs e)
         {
             // Workaround for the application freezing after unlocking at least 2 vaults
-            // TODO Find the cause of the issue and fix it
+            // TODO: Find the cause of the issue and fix it
             await Task.Delay(500);
 
             Chart.Series = new ISeries[]
diff --git a/SecureFolderFS.Sdk/Services/IUpdateService.cs b/SecureFolderFS.Sdk/Services/IUpdateService.cs
@@ -16,17 +16,12 @@ public interface IUpdateService
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. The value is true if updates are supported, otherwise false.</returns>
         Task<bool> IsSupportedAsync();
 
-        /// <summary>
-        /// Initializes resources used for updating the app.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If successful, returns true otherwise false.</returns>
-        Task<bool> InitializeAsync();
-
         /// <summary>
         /// Checks whether there are available updates.
         /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
         /// <returns>A <see cref="Task"/> that represents the asynchronous operation. If available updates were found, returns true otherwise false.</returns>
-        Task<bool> IsUpdateAvailableAsync();
+        Task<bool> IsUpdateAvailableAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Starts all app updates in the update queue.
diff --git a/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs b/SecureFolderFS.Sdk/ViewModels/Controls/Banners/UpdateBannerViewModel.cs
@@ -37,10 +37,9 @@ public UpdateBannerViewModel()
         public async Task InitAsync(CancellationToken cancellationToken = default)
         {
             var updatesSupported = await UpdateService.IsSupportedAsync();
-            var isInitialized = updatesSupported && await UpdateService.InitializeAsync();
 
             return; // TODO: Implement updates
-            if (!updatesSupported || !isInitialized)
+            if (!updatesSupported)
             {
                 await Task.Delay(800);
 
diff --git a/SecureFolderFS.Sdk/ViewModels/Views/Wizard/NewVault/EncryptionWizardViewModel.cs b/SecureFolderFS.Sdk/ViewModels/Views/Wizard/NewVault/EncryptionWizardViewModel.cs
@@ -48,7 +48,7 @@ public override Task InitAsync(CancellationToken cancellationToken = default)
             foreach (var item in VaultService.GetFileNameCiphers())
             {
                 var name = string.IsNullOrEmpty(item) ? "None" : item;
-                FileNameCiphers.Add(new(name));
+                FileNameCiphers.Add(new(item, name));
             }
 
             return Task.CompletedTask;
diff --git a/SecureFolderFS.UI/ServiceImplementation/DebugIapService.cs b/SecureFolderFS.UI/ServiceImplementation/DebugIapService.cs
@@ -0,0 +1,29 @@
+﻿using SecureFolderFS.Sdk.Enums;
+using SecureFolderFS.Sdk.Services;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SecureFolderFS.UI.ServiceImplementation
+{
+    /// <inheritdoc cref="IIapService"/>
+    public sealed class DebugIapService : IIapService
+    {
+        /// <inheritdoc/>
+        public Task<bool> IsOwnedAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(true);
+        }
+
+        /// <inheritdoc/>
+        public Task<bool> PurchaseAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult(false);
+        }
+
+        /// <inheritdoc/>
+        public Task<string?> GetPriceAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult<string?>(null);
+        }
+    }
+}
diff --git a/SecureFolderFS.WinUI/App.xaml.cs b/SecureFolderFS.WinUI/App.xaml.cs
@@ -4,7 +4,6 @@
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.Storage;
 using SecureFolderFS.Sdk.Storage.ModifiableStorage;
-using SecureFolderFS.UI;
 using SecureFolderFS.UI.Helpers;
 using SecureFolderFS.UI.ServiceImplementation;
 using SecureFolderFS.UI.Storage.NativeStorage;
@@ -53,7 +52,7 @@ public App()
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             // Get settings folder
-            var settingsFolderPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SETTINGS_FOLDER_NAME);
+            var settingsFolderPath = Path.Combine(ApplicationData.Current.LocalFolder.Path, SecureFolderFS.UI.Constants.LocalSettings.SETTINGS_FOLDER_NAME);
             _ = Directory.CreateDirectory(settingsFolderPath);
             var settingsFolder = new NativeFolder(settingsFolderPath);
 
@@ -103,7 +102,7 @@ private IServiceProvider ConfigureServices(IModifiableFolder settingsFolder)
                 // Conditional (singleton) services
 #if DEBUG
                 .AddSingleton<ITelemetryService, DebugTelemetryService>()
-                .AddSingleton<IIapService, MicrosoftStoreIapService>()
+                .AddSingleton<IIapService, DebugIapService>()
 #else
                 .AddSingleton<ITelemetryService, AppCenterTelemetryService>()
                 .AddSingleton<IIapService, MicrosoftStoreIapService>()
diff --git a/SecureFolderFS.WinUI/Constants.cs b/SecureFolderFS.WinUI/Constants.cs
@@ -0,0 +1,7 @@
+﻿namespace SecureFolderFS.WinUI
+{
+    internal static class Constants
+    {
+        public const string IAP_SECUREFOLDERFS_PLUS_ID = "9N3GB650DVJQ";
+    }
+}
diff --git a/SecureFolderFS.WinUI/Dialogs/PaymentDialog.xaml b/SecureFolderFS.WinUI/Dialogs/PaymentDialog.xaml
@@ -34,7 +34,7 @@
                 Text="SecureFolderFS+" />
         </StackPanel>
 
-        <TextBlock FontSize="18" Text="Thank you for your interest in SecureFolderFS!" />
+        <TextBlock FontSize="18" Text="This feature requires SecureFolderFS+" />
         <TextBlock Text="Thanks to your support, we can maintain and keep SecureFolderFS free for everyone!" TextWrapping="WrapWholeWords" />
     </StackPanel>
 </ContentDialog>
diff --git a/SecureFolderFS.WinUI/ServiceImplementation/MicrosoftStoreIapService.cs b/SecureFolderFS.WinUI/ServiceImplementation/MicrosoftStoreIapService.cs
@@ -1,29 +1,107 @@
 ﻿using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Services;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Services.Store;
 
 namespace SecureFolderFS.WinUI.ServiceImplementation
 {
+    /// <inheritdoc cref="IIapService"/>
     internal sealed class MicrosoftStoreIapService : IIapService
     {
+        private StoreContext? _storeContext;
+
         /// <inheritdoc/>
-        public Task<bool> IsOwnedAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        public async Task<bool> IsOwnedAsync(IapProductType productType, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult(false);
+            if (!TrySetStoreContext() || _storeContext is null)
+                return false;
+
+            var iapId = GetIapId(productType);
+            if (iapId is null)
+                return false;
+
+            var appLicense = await _storeContext.GetAppLicenseAsync().AsTask(cancellationToken);
+            if (appLicense is null)
+                return false;
+
+            foreach (var item in appLicense.AddOnLicenses)
+            {
+                var license = item.Value;
+                if (!license.IsActive)
+                    continue;
+
+                if (license.InAppOfferToken.Contains(iapId))
+                    return true;
+            }
+
+            return false;
         }
 
         /// <inheritdoc/>
-        public Task<bool> PurchaseAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        public async Task<bool> PurchaseAsync(IapProductType productType, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult(false);
+            var iapId = GetIapId(productType);
+            if (iapId is null)
+                return false;
+
+            var product = await GetProductAsync(iapId, cancellationToken);
+            if (product is null)
+                return false;
+
+            var purchaseResult = await product.RequestPurchaseAsync();
+            if (purchaseResult is null)
+                return false;
+
+            return purchaseResult.ExtendedError is null;
         }
 
         /// <inheritdoc/>
-        public Task<string?> GetPriceAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        public async Task<string?> GetPriceAsync(IapProductType productType, CancellationToken cancellationToken = default)
+        {
+            var iapId = GetIapId(productType);
+            if (iapId is null)
+                return null;
+
+            var product = await GetProductAsync(iapId, cancellationToken);
+            if (product is null)
+                return null;
+
+            return product.Price.FormattedPrice;
+        }
+
+        private async Task<StoreProduct?> GetProductAsync(string iapId, CancellationToken cancellationToken)
+        {
+            if (!TrySetStoreContext() || _storeContext is null)
+                return null;
+
+            var result = await _storeContext.GetAssociatedStoreProductsAsync(new[] { "Durable" }).AsTask(cancellationToken);
+            if (result.ExtendedError is not null)
+                return null;
+
+            foreach (var item in result.Products.Values)
+            {
+                if (item.InAppOfferToken.Contains(iapId))
+                    return item;
+            }
+
+            return null;
+        }
+
+        private string? GetIapId(IapProductType productType)
+        {
+            return productType switch
+            {
+                IapProductType.SecureFolderFSPlus => Constants.IAP_SECUREFOLDERFS_PLUS_ID,
+                _ => null
+            };
+        }
+
+        private bool TrySetStoreContext()
         {
-            return Task.FromResult("");
+            _storeContext ??= StoreContext.GetDefault();
+            return _storeContext is not null;
         }
     }
 }
diff --git a/SecureFolderFS.WinUI/ServiceImplementation/MicrosoftStoreUpdateService.cs b/SecureFolderFS.WinUI/ServiceImplementation/MicrosoftStoreUpdateService.cs
@@ -1,11 +1,11 @@
-﻿using SecureFolderFS.Shared.Extensions;
+﻿using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Services;
+using SecureFolderFS.Shared.Extensions;
 using System;
 using System.Collections.Generic;
-using SecureFolderFS.Sdk.Enums;
+using System.Threading;
 using System.Threading.Tasks;
 using Windows.Services.Store;
-using System.Threading;
 
 namespace SecureFolderFS.WinUI.ServiceImplementation
 {
@@ -22,20 +22,14 @@ public Task<bool> IsSupportedAsync()
         }
 
         /// <inheritdoc/>
-        public async Task<bool> InitializeAsync()
+        public async Task<bool> IsUpdateAvailableAsync(CancellationToken cancellationToken = default)
         {
-            _storeContext ??= await Task.Run(StoreContext.GetDefault);
-            return true;
-        }
-
-        /// <inheritdoc/>
-        public async Task<bool> IsUpdateAvailableAsync()
-        {
-            AssertInitialized();
+            if (!TrySetStoreContext() || _storeContext is null)
+                return false;
 
             try
             {
-                _updates = await _storeContext!.GetAppAndOptionalStorePackageUpdatesAsync();
+                _updates = await _storeContext.GetAppAndOptionalStorePackageUpdatesAsync().AsTask(cancellationToken);
                 return !_updates.IsEmpty();
             }
             catch (Exception)
@@ -47,10 +41,11 @@ public async Task<bool> IsUpdateAvailableAsync()
         /// <inheritdoc/>
         public async Task<AppUpdateResultType> UpdateAsync(IProgress<double>? progress, CancellationToken cancellationToken = default)
         {
-            AssertInitialized();
+            if (!TrySetStoreContext() || _storeContext is null)
+                return AppUpdateResultType.FailedUnknownError;
 
-            var operation = _storeContext!.RequestDownloadAndInstallStorePackageUpdatesAsync(_updates);
-            operation.Progress = (asyncInfo, update) => progress?.Report(update.PackageDownloadProgress);
+            var operation = _storeContext.RequestDownloadAndInstallStorePackageUpdatesAsync(_updates);
+            operation.Progress = (_, update) => progress?.Report(update.PackageDownloadProgress);
             var result = await operation.AsTask(cancellationToken);
 
             return result.OverallState switch
@@ -68,9 +63,10 @@ public async Task<AppUpdateResultType> UpdateAsync(IProgress<double>? progress,
             };
         }
 
-        private void AssertInitialized()
+        private bool TrySetStoreContext()
         {
-            _ = _storeContext ?? throw new InvalidOperationException($"{nameof(_storeContext)} was not initialized.");
+            _storeContext ??= StoreContext.GetDefault();
+            return _storeContext is not null;
         }
     }
 }
diff --git a/SecureFolderFS.WinUI/UserControls/GraphControl.xaml.cs b/SecureFolderFS.WinUI/UserControls/GraphControl.xaml.cs
@@ -43,6 +43,10 @@ private async void RootButton_Loaded(object sender, RoutedEventArgs e)
 
         private async void Chart_Loaded(object sender, RoutedEventArgs e)
         {
+            // Workaround for the application freezing after unlocking at least 2 vaults
+            // TODO: Find the cause of the issue and fix it
+            await Task.Delay(500);
+
             Chart.Series = new ISeries[]
             {
                 new LineSeries<GraphPoint>()
diff --git a/SecureFolderFS.WinUI/WindowViews/MainWindow.xaml.cs b/SecureFolderFS.WinUI/WindowViews/MainWindow.xaml.cs
@@ -2,7 +2,6 @@
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.UI;
 using WinUIEx;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -27,7 +26,7 @@ private MainWindow()
         private void EnsureEarlyWindow()
         {
             // Set persistence id
-            PersistenceId = Constants.MAIN_WINDOW_ID;
+            PersistenceId = SecureFolderFS.UI.Constants.MAIN_WINDOW_ID;
 
             // Set title
             AppWindow.Title = "SecureFolderFS";

Original file line number	Diff line number	Diff line change
`@@ -1,30 +1,28 @@`
	`1`	`+using SecureFolderFS.Sdk.Enums;`
	`2`	`+using SecureFolderFS.Sdk.Services;`
`1`	`3`	`using System;`
`2`	`4`	`using System.Threading;`
`3`	`5`	`using System.Threading.Tasks;`
`4`		`-using SecureFolderFS.Sdk.Enums;`
`5`		`-using SecureFolderFS.Sdk.Services;`
`6`	`6`
`7`	`7`	`namespace SecureFolderFS.AvaloniaUI.ServiceImplementation`
`8`	`8`	`{`
`9`		`- // TODO implement`
	`9`	`+ // TODO: Implement updates on AvaloniaUI`
`10`	`10`	`/// <inheritdoc cref="IUpdateService"/>`
`11`		`- internal sealed class UpdateService : IUpdateService`
	`11`	`+ internal sealed class AvaloniaUpdateService : IUpdateService`
`12`	`12`	`{`
	`13`	`+ /// <inheritdoc/>`
`13`	`14`	`public Task<bool> IsSupportedAsync()`
`14`	`15`	`{`
`15`	`16`	`return Task.FromResult(false);`
`16`	`17`	`}`
`17`	`18`
`18`		`- public Task<bool> InitializeAsync()`
`19`		`- {`
`20`		`- throw new NotImplementedException();`
`21`		`- }`
`22`		`-`
`23`		`- public Task<bool> IsUpdateAvailableAsync()`
	`19`	`+ /// <inheritdoc/>`
	`20`	`+ public Task<bool> IsUpdateAvailableAsync(CancellationToken cancellationToken = default)`
`24`	`21`	`{`
`25`	`22`	`throw new NotImplementedException();`
`26`	`23`	`}`
`27`	`24`
	`25`	`+ /// <inheritdoc/>`
`28`	`26`	`public Task<AppUpdateResultType> UpdateAsync(IProgress<double>? progress, CancellationToken cancellationToken = default)`
`29`	`27`	`{`
`30`	`28`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public GraphControl()`
`32`	`32`	`private async void Chart_Loaded(object sender, RoutedEventArgs e)`
`33`	`33`	`{`
`34`	`34`	`// Workaround for the application freezing after unlocking at least 2 vaults`
`35`		`- // TODO Find the cause of the issue and fix it`
	`35`	`+ // TODO: Find the cause of the issue and fix it`
`36`	`36`	`await Task.Delay(500);`
`37`	`37`
`38`	`38`	`Chart.Series = new ISeries[]`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,9 @@ public UpdateBannerViewModel()`
`37`	`37`	`public async Task InitAsync(CancellationToken cancellationToken = default)`
`38`	`38`	`{`
`39`	`39`	`var updatesSupported = await UpdateService.IsSupportedAsync();`
`40`		`- var isInitialized = updatesSupported && await UpdateService.InitializeAsync();`
`41`	`40`
`42`	`41`	`return; // TODO: Implement updates`
`43`		`- if (!updatesSupported \|\| !isInitialized)`
	`42`	`+ if (!updatesSupported)`
`44`	`43`	`{`
`45`	`44`	`await Task.Delay(800);`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override Task InitAsync(CancellationToken cancellationToken = default)`
`48`	`48`	`foreach (var item in VaultService.GetFileNameCiphers())`
`49`	`49`	`{`
`50`	`50`	`var name = string.IsNullOrEmpty(item) ? "None" : item;`
`51`		`- FileNameCiphers.Add(new(name));`
	`51`	`+ FileNameCiphers.Add(new(item, name));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return Task.CompletedTask;`