Merge pull request #119 from ChrispyPeaches/hotfix-remove-keystore-an…

…d-modify-app-metadata [Hotfix] Various hotfixes and improvements
ChrispyPeaches · May 8, 2024 · 7a87492 · 7a87492
2 parents b0dbd17 + 20047c8
commit 7a87492
Show file tree

Hide file tree

Showing 24 changed files with 459 additions and 274 deletions.
diff --git a/src/FocusApp.Client/AppShell.cs b/src/FocusApp.Client/AppShell.cs
@@ -10,6 +10,7 @@
 using FocusApp.Client.Views.Social;
 using SimpleToolkit.SimpleShell.Extensions;
 using Microsoft.Maui;
+using FocusApp.Client.Views.Settings;
 
 namespace FocusApp.Client;
 

diff --git a/src/FocusApp.Client/FocusApp.Client.csproj b/src/FocusApp.Client/FocusApp.Client.csproj
@@ -40,10 +40,10 @@
 
 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" Color="#BB8EFF" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#BB8EFF" BaseSize="128,128" />
+		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#BB8EFF" BaseSize="456, 456" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
@@ -105,11 +105,6 @@
 	</ItemGroup>
 
 	<PropertyGroup Condition="$(TargetFramework.Contains('-android')) and '$(Configuration)' == 'Release'">
-		<AndroidKeyStore>True</AndroidKeyStore>
-		<AndroidSigningKeyStore>ff.keystore</AndroidSigningKeyStore>
-		<AndroidSigningKeyAlias>MyAppkey</AndroidSigningKeyAlias>
-		<AndroidSigningKeyPass>2x4WFl6FUbU3</AndroidSigningKeyPass>
-		<AndroidSigningStorePass>2x4WFl6FUbU3</AndroidSigningStorePass>
 	</PropertyGroup>
 
 </Project>
diff --git a/src/FocusApp.Client/Helpers/AuthenticationService.cs b/src/FocusApp.Client/Helpers/AuthenticationService.cs
@@ -1,5 +1,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using Auth0.OidcClient;
+using FocusApp.Client.Views;
 using FocusApp.Shared.Models;
 
 namespace FocusApp.Client.Helpers;
@@ -8,22 +10,25 @@ internal interface IAuthenticationService
 {
     string? Auth0Id { get; set; }
     string? Email { get; set; }
-    string? AuthToken { get; set; }
     User? CurrentUser { get; set; }
     Island? SelectedIsland { get; set; }
     Pet? SelectedPet { get; set; }
     Badge? SelectedBadge { get; set; }
     Decor? SelectedDecor { get; set; }
+    int Balance { get; set; }
 
     event PropertyChangedEventHandler? PropertyChanged;
+
+    void ClearUser();
+    Task Logout(IAuth0Client auth0Client);
+    void PopulateWithUserData(User user);
 }
 
 public class AuthenticationService : INotifyPropertyChanged, IAuthenticationService
 {
     public event PropertyChangedEventHandler? PropertyChanged;
     public string? Auth0Id { get; set; } = "";
     public string? Email { get; set; } = "";
-    public string? AuthToken { get; set; } = "";
 
     private User? _currentUser;
     public User? CurrentUser
@@ -32,6 +37,13 @@ public User? CurrentUser
         set => SetProperty(ref _currentUser, value);
     }
 
+    private int? _balance;
+    public int Balance
+    {
+        get => _balance ?? 0;
+        set => SetProperty(ref _balance, value);
+    }
+
     private Island? _selectedIsland;
     public Island? SelectedIsland
     {
@@ -60,6 +72,56 @@ public Decor? SelectedDecor
         set => SetProperty(ref _selectedDecor, value);
     }
 
+    /// <summary>
+    /// Remove user data from auth service and secure storage,
+    /// navigate to the login page,and
+    /// log the user out using the auth0 client.
+    /// </summary>
+    /// <remarks>
+    /// Note that the auth0Client.LogoutAsync needs to happen after the navigation
+    /// to LoginPage due to an issue with Maui navigation handlers.
+    /// Details here: https://github.com/dotnet/maui/issues/11259
+    /// </remarks>
+    public async Task Logout(IAuth0Client auth0Client)
+    {
+        ClearUser();
+
+        SecureStorage.Default.Remove("id_token");
+        SecureStorage.Default.Remove("access_token");
+
+        await Shell.Current.GoToAsync("///" + nameof(LoginPage));
+
+        await auth0Client.LogoutAsync();
+    }
+
+    /// <summary>
+    /// Remove all data for the "logged in" user.
+    /// </summary>
+    public void ClearUser()
+    {
+        Auth0Id = string.Empty;
+        Email = string.Empty;
+        Balance = 0;
+        CurrentUser = null;
+        SelectedIsland = null;
+        SelectedPet = null;
+        SelectedBadge = null;
+        SelectedDecor = null;
+    }
+
+    public void PopulateWithUserData(User user)
+    {
+        CurrentUser = user;
+
+        Auth0Id = user.Auth0Id;
+        Email = user.Email;
+        Balance = user.Balance;
+        SelectedBadge = user.SelectedBadge;
+        SelectedDecor = user.SelectedDecor;
+        SelectedIsland = user.SelectedIsland;
+        SelectedPet = user.SelectedPet;
+    }
+
     #region Property Changed Notification Logic
 
     private void SetProperty<T>(ref T backingStore, in T value, [CallerMemberName] in string propertyname = "")

diff --git a/src/FocusApp.Client/Helpers/UserManager.cs b/src/FocusApp.Client/Helpers/UserManager.cs
@@ -20,6 +20,13 @@ public UserManager(string domain, string clientId)
         _clientId = clientId;
     }
 
+    public async Task<string?> GetIdToken()
+    {
+        return await SecureStorage.Default.GetAsync("id_token");
+    }
+
+
+
     public async Task<ClaimsPrincipal> GetAuthenticatedUser()
     { 
         ClaimsPrincipal user = null;

diff --git a/src/FocusApp.Client/MauiProgram.cs b/src/FocusApp.Client/MauiProgram.cs
@@ -101,7 +101,7 @@ private static IServiceCollection RegisterRefitClient(this IServiceCollection se
         {
             services
                 .AddRefitClient<IAPIClient>()
-                .ConfigureHttpClient(c => c.BaseAddress = new Uri("http://10.0.2.2:5223"));
+                .ConfigureHttpClient(c => c.BaseAddress = new Uri("http://test.zenpxl.com:25565"));
 
             return services;
         }

diff --git a/src/FocusApp.Client/Methods/Shop/PurchaseItem.cs b/src/FocusApp.Client/Methods/Shop/PurchaseItem.cs
@@ -46,7 +46,7 @@ public async Task<Unit> Handle(Command command, CancellationToken cancellationTo
                             });
 
                             // Update the user's balance on the local database
-                            user.Balance = _authenticationService.CurrentUser.Balance;
+                            user.Balance = _authenticationService.Balance;
                         }
                         catch (Exception ex)
                         {
@@ -61,7 +61,7 @@ await _client.AddUserPet(new AddUserPetCommand
                             {
                                 UserId = _authenticationService.CurrentUser.Id,
                                 PetId = command.Item.Id,
-                                UpdatedBalance = _authenticationService.CurrentUser.Balance,
+                                UpdatedBalance = _authenticationService.Balance,
                             });
                         }
                         catch (Exception ex)
@@ -82,7 +82,7 @@ await _client.AddUserPet(new AddUserPetCommand
                             });
 
                             // Update the user's balance on the local database
-                            user.Balance = _authenticationService.CurrentUser.Balance;
+                            user.Balance = _authenticationService.Balance;
                         }
                         catch (Exception ex)
                         {
@@ -97,7 +97,7 @@ await _client.AddUserDecor(new AddUserDecorCommand
                             {
                                 UserId = _authenticationService.CurrentUser.Id,
                                 DecorId = command.Item.Id,
-                                UpdatedBalance = _authenticationService.CurrentUser.Balance,
+                                UpdatedBalance = _authenticationService.Balance,
                             });
                         }
                         catch (Exception ex)
@@ -117,7 +117,7 @@ await _client.AddUserDecor(new AddUserDecorCommand
                             });
 
                             // Update the user's balance on the local database
-                            user.Balance = _authenticationService.CurrentUser.Balance;
+                            user.Balance = _authenticationService.Balance;
                         }
                         catch (Exception ex)
                         {
@@ -131,7 +131,7 @@ await _client.AddUserIsland(new AddUserIslandCommand
                             {
                                 UserId = _authenticationService.CurrentUser.Id,
                                 IslandId = command.Item.Id,
-                                UpdatedBalance = _authenticationService.CurrentUser.Balance,
+                                UpdatedBalance = _authenticationService.Balance,
                             });
                         }
                         catch (Exception ex)

diff --git a/src/FocusApp.Client/Methods/User/AddSessionToUser.cs b/src/FocusApp.Client/Methods/User/AddSessionToUser.cs
@@ -50,7 +50,7 @@ public async Task Handle(
 
             UserSession session = CreateSession(query, user);
 
-            _authService.CurrentUser.Balance += session.CurrencyEarned;
+            _authService.Balance += session.CurrencyEarned;
 
             // If a user isn't found, don't track the session
             if (user is null) return;

diff --git a/src/FocusApp.Client/Methods/User/GetPersistentUserLogin.cs b/src/FocusApp.Client/Methods/User/GetPersistentUserLogin.cs
@@ -53,13 +53,7 @@ public async Task<Result> Handle(Query query, CancellationToken cancellationToke
                         throw new InvalidOperationException("User not found in the local database.");
 
                     // Set session variables
-                    _authenticationService.Auth0Id = user.Auth0Id;
-                    _authenticationService.CurrentUser = user;
-
-                    _authenticationService.SelectedBadge = user.SelectedBadge;
-                    _authenticationService.SelectedDecor = user.SelectedDecor;
-                    _authenticationService.SelectedIsland = user.SelectedIsland;
-                    _authenticationService.SelectedPet = user.SelectedPet;
+                    _authenticationService.PopulateWithUserData(user);
 
                     return new Result
                     {

diff --git a/src/FocusApp.Client/Platforms/Android/AndroidManifest.xml b/src/FocusApp.Client/Platforms/Android/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.ZenPxl.FocusFriends" android:versionCode="1" android:versionName="Development Test">
-	<application android:allowBackup="true" 
-				 android:icon="@mipmap/appicon" 
-				 android:supportsRtl="true" 
-				 android:usesCleartextTraffic="true"
-				 android:enableOnBackInvokedCallback="true"				 
-				 android:label="FocusApp"></application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.ZenPxl.FocusFriends" android:versionCode="1" android:versionName="1.0">
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="true" android:label="Focus Friends"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
-
 	<queries>
 		<intent>
 			<action android:name="android.support.customtabs.action.CustomTabsService" />

diff --git a/src/FocusApp.Client/Resources/AppIcon/appicon.svg b/src/FocusApp.Client/Resources/AppIcon/appicon.svg