Support saving session credentials on MAUI

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Platforms/Android/ViewModels/AndroidBiometricViewModel.cs

@@ -5,14 +5,14 @@
 using Java.Security;
 using OwlCore.Storage;
 using SecureFolderFS.Core;
-using SecureFolderFS.Core.Cryptography.SecureStore;
 using SecureFolderFS.Maui.AppModels;
 using SecureFolderFS.Maui.Platforms.Android.Helpers;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Extensions;
 using SecureFolderFS.Sdk.ViewModels.Controls.Authentication;
 using SecureFolderFS.Shared.ComponentModel;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Shared.SecureStore;
 
 namespace SecureFolderFS.Maui.Platforms.Android.ViewModels
 {

src/Platforms/SecureFolderFS.Maui/Platforms/iOS/ViewModels/IOSBiometricCreationViewModel.cs

@@ -1,13 +1,12 @@
 using System.Security.Cryptography;
 using OwlCore.Storage;
 using SecureFolderFS.Core.Cryptography;
-using SecureFolderFS.Core.Cryptography.Extensions;
-using SecureFolderFS.Core.Cryptography.SecureStore;
 using SecureFolderFS.Core.DataModels;
 using SecureFolderFS.Core.VaultAccess;
 using SecureFolderFS.Sdk.EventArguments;
 using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.Shared.Models;
+using SecureFolderFS.Shared.SecureStore;
 
 namespace SecureFolderFS.Maui.Platforms.iOS.ViewModels
 {

src/Platforms/SecureFolderFS.Maui/TemplateSelectors/LoginTemplateSelector.cs

@@ -16,6 +16,8 @@ internal sealed class LoginTemplateSelector : DataTemplateSelector
 
         public DataTemplate? KeyFileTemplate { get; set; }
 
+        public DataTemplate? PersistedAuthenticationTemplate { get; set; }
+        
         public DataTemplate? ErrorTemplate { get; set; }
 
         public DataTemplate? UnsupportedTemplate { get; set; }
@@ -44,6 +46,7 @@ internal sealed class LoginTemplateSelector : DataTemplateSelector
 #elif IOS
                 IOSBiometricLoginViewModel => IOSBiometricsTemplate,
 #endif
+                PersistedAuthenticationViewModel => PersistedAuthenticationTemplate,
                 ErrorViewModel => ErrorTemplate,
                 UnsupportedViewModel => UnsupportedTemplate,
                 _ => null

src/Platforms/SecureFolderFS.Maui/UserControls/LoginControl.xaml

@@ -100,6 +100,28 @@
             </ContentView>
         </DataTemplate>
 
+        <!--  Persisted Template  -->
+        <DataTemplate x:Key="PersistedAuthenticationTemplate" x:DataType="vm2:PersistedAuthenticationViewModel">
+            <ContentView>
+                <VerticalStackLayout Spacing="16">
+                    <!--  Title  -->
+                    <Label
+                        HorizontalOptions="Center"
+                        Opacity="0.8"
+                        Text="{l:ResourceString Rid=CredentialsHaveBeenSaved}" />
+
+                    <!--  Unlock button  -->
+                    <local:ActivityButton
+                        ButtonStyle="{StaticResource AccentButtonStyle}"
+                        Command="{Binding ProvideCredentialsCommand}"
+                        FontAttributes="Bold"
+                        HorizontalOptions="Fill"
+                        IsProgressing="{Binding ProvideCredentialsCommand.IsRunning, Mode=OneWay}"
+                        Text="{l:ResourceString Rid=Unlock}" />
+                </VerticalStackLayout>
+            </ContentView>
+        </DataTemplate>
+
         <!--  Error Template  -->
         <DataTemplate x:Key="ErrorTemplate" x:DataType="vm2:ErrorViewModel">
             <ContentView>
@@ -126,6 +148,7 @@
                     ErrorTemplate="{StaticResource ErrorTemplate}"
                     KeyFileTemplate="{StaticResource KeyFileTemplate}"
                     PasswordTemplate="{StaticResource PasswordTemplate}"
+                    PersistedAuthenticationTemplate="{StaticResource PersistedAuthenticationTemplate}"
                     UnsupportedTemplate="{StaticResource UnsupportedTemplate}" />
             </local:ContentPresentation.TemplateSelector>
         </local:ContentPresentation>

src/Platforms/SecureFolderFS.Maui/Views/Vault/LoginPage.xaml

@@ -75,14 +75,24 @@
                         <uc:VaultLocatorControl.LoginView>
                             <VerticalStackLayout IsVisible="{Binding ViewModel.IsProgressing, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}" Spacing="8">
                                 <uc:LoginControl CurrentViewModel="{Binding ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay}" ProvideContinuationButton="True" />
-                                <Button
-                                    Command="{Binding ViewModel.LoginViewModel.RecoverAccessCommand}"
-                                    HorizontalOptions="{OnPlatform Android={LayoutOptions Alignment=Fill},
-                                                                   iOS={LayoutOptions Alignment=Center}}"
-                                    IsVisible="{Binding ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource TypeNameBoolConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}"
-                                    Style="{OnPlatform Android={StaticResource TransparentButtonStyle},
-                                                       iOS={StaticResource NoBackgroundButtonStyle}}"
-                                    Text="{l:ResourceString Rid=RecoverAccess}" />
+                                <VerticalStackLayout>
+                                    <Button
+                                        Command="{Binding ViewModel.LoginViewModel.DiscardSavedCredentialsCommand}"
+                                        HorizontalOptions="{OnPlatform Android={LayoutOptions Alignment=Fill},
+                                                                       iOS={LayoutOptions Alignment=Center}}"
+                                        IsVisible="{Binding ViewModel.LoginViewModel.AreCredentialsSaved, Mode=OneWay}"
+                                        Style="{OnPlatform Android={StaticResource TransparentButtonStyle},
+                                                           iOS={StaticResource NoBackgroundButtonStyle}}"
+                                        Text="{l:ResourceString Rid=DiscardSavedCredentials}" />
+                                    <Button
+                                        Command="{Binding ViewModel.LoginViewModel.RecoverAccessCommand}"
+                                        HorizontalOptions="{OnPlatform Android={LayoutOptions Alignment=Fill},
+                                                                       iOS={LayoutOptions Alignment=Center}}"
+                                        IsVisible="{Binding ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource TypeNameBoolConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}"
+                                        Style="{OnPlatform Android={StaticResource TransparentButtonStyle},
+                                                           iOS={StaticResource NoBackgroundButtonStyle}}"
+                                        Text="{l:ResourceString Rid=RecoverAccess}" />
+                                </VerticalStackLayout>
                             </VerticalStackLayout>
                         </uc:VaultLocatorControl.LoginView>
                     </uc:VaultLocatorControl>

src/Platforms/SecureFolderFS.UI/Strings/en-US/Resources.resx

@@ -1448,4 +1448,10 @@
   <data name="FileModified" xml:space="preserve">
       <value>Modified</value>
   </data>
+  <data name="CredentialsHaveBeenSaved" xml:space="preserve">
+      <value>Credentials have been saved for this vault</value>
+  </data>
+  <data name="DiscardSavedCredentials" xml:space="preserve">
+      <value>Discard saved credentials</value>
+  </data>
 </root>

src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceRoot/VaultPreviewRootControl.xaml

@@ -51,10 +51,12 @@
                 <StackPanel VerticalAlignment="Center" Spacing="8">
                     <uc:LoginControl CurrentViewModel="{x:Bind ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay}" ProvideContinuationButton="True" />
                     <uc:LoginOptions
+                        AreCredentialsSaved="{x:Bind ViewModel.LoginViewModel.AreCredentialsSaved, Mode=OneWay}"
+                        DiscardSavedCredentialsCommand="{x:Bind ViewModel.LoginViewModel.DiscardSavedCredentialsCommand, Mode=OneWay}"
                         IsReadOnly="{x:Bind ViewModel.IsReadOnly, Mode=TwoWay}"
                         RecoverAccessCommand="{x:Bind ViewModel.RecoverAccessCommand, Mode=OneWay}"
                         RestartLoginCommand="{x:Bind ViewModel.LoginViewModel.RestartLoginProcessCommand, Mode=OneWay}"
-                        ShouldSaveCredentials="{x:Bind ViewModel.ShouldSaveCredentials, Mode=TwoWay}"
+                        ShouldSaveCredentials="{x:Bind ViewModel.LoginViewModel.ShouldSaveCredentials, Mode=TwoWay}"
                         Visibility="{x:Bind ViewModel.LoginViewModel.CurrentViewModel, Mode=OneWay, Converter={StaticResource TypeNameVisibilityConverter}, ConverterParameter='MigrationViewModel,ErrorViewModel|invert'}" />
                 </StackPanel>
             </StackPanel>

src/Platforms/SecureFolderFS.Uno/UserControls/LoginControl.xaml

@@ -186,7 +186,8 @@
         <!--  Persisted Template  -->
         <DataTemplate x:Key="PersistedAuthenticationTemplate" x:DataType="vm5:PersistedAuthenticationViewModel">
             <StackPanel Spacing="16">
-                <TextBlock HorizontalAlignment="Center" Text="Credentials have been saved for this vault" />
+                <!--  Title  -->
+                <TextBlock HorizontalAlignment="Center" Text="{l:ResourceString Rid=CredentialsHaveBeenSaved}" />
 
                 <!--  Continue  -->
                 <Button

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Root/VaultPreviewViewModel.cs

@@ -30,7 +30,6 @@ public sealed partial class VaultPreviewViewModel : ObservableObject, IAsyncInit
         [ObservableProperty] private UnlockedVaultViewModel? _UnlockedVaultViewModel;
         [ObservableProperty] private LoginViewModel? _LoginViewModel;
         [ObservableProperty] private VaultViewModel _VaultViewModel;
-        [ObservableProperty] private bool _ShouldSaveCredentials;
         [ObservableProperty] private bool _IsReadOnly;
 
         public VaultPreviewViewModel(VaultViewModel vaultViewModel, INavigationService vaultNavigation)