Account Switching (#1807)

* Account Switching (#1720) * Account switching * WIP * wip * wip * updates to send test logic * fixed Send tests * fixes for theme handling on account switching and re-adding existing account * switch fixes * fixes * fixes * cleanup * vault timeout fixes * account list status enhancements * logout fixes and token handling improvements * merge latest (#1727) * remove duplicate dependency * fix for initial login token storage paradox (#1730) * Fix avatar color update toolbar item issue on iOS for account switching (#1735) * Updated account switching menu UI (#1733) * updated account switching menu UI * additional changes * add key suffix to constant * GetFirstLetters method tweaks * Fix crash on account switching when logging out when having more than user at a time (#1740) * single account migration to multi-account on app update (#1741) * Account Switching Tap to dismiss (#1743) * Added tap to dismiss on the Account switching overlay and improved a bit the code * Fix account switching overlay background transparent on the proper place * Fixed transparent background and the shadow on the account switching overlay * Fix iOS top space on Account switching list overlay after modal (#1746) * Fix top space added to Account switching list overlay after closing modal * Fix top space added to Account switching list overlay after closing modal on lock, login and home views just in case we add modals in the future there as well * Usability: dismiss account list on certain events (#1748) * dismiss account list on certain events * use new FireAndForget method for back button logic * Create and use Account Switching overlay control (#1753) * Added Account switching overlay control and its own ViewModel and refactored accordingly * Fix account switching Accounts list binding update * Implemented dismiss account switching overlay when changing tabs and when selecting the same tab. Also updated the deprecated listener on CustomTabbedRenderer on Android (#1755) * Overriden Equals on AvatarImageSource so it doesn't get set multiple times when it's the same image thus producing blinking on tab chaged (#1756) * Usability improvements for logout on vault timeout (#1781) * accountswitching fixes (#1784) * Fix for invalid PIN lock state when switching accounts (#1792) * fix for pin lock flow * named tuple values and updated async * clear send service cache on account switch (#1796) * Global theme and account removal (#1793) * Global theme and account removal * remove redundant call to hide account list overlay * cleanup and additional tweaks * add try/catch to remove account dialog flow Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
2026-01-06 10:34:07 +00:00 · 2022-02-23 12:40:17 -05:00
parent ded3f07fa6
commit 2e8824ce05
144 changed files with 5064 additions and 1761 deletions
--- a/src/Core/Models/Domain/Account.cs
+++ b/src/Core/Models/Domain/Account.cs
@@ -0,0 +1,110 @@
+using Bit.Core.Enums;
+using Bit.Core.Models.Data;
+
+namespace Bit.Core.Models.Domain
+{
+    public class Account : Domain
+    {
+        public AccountProfile Profile;
+        public AccountTokens Tokens;
+        public AccountSettings Settings;
+        public AccountKeys Keys;
+
+        public Account() { }
+
+        public Account(AccountProfile profile, AccountTokens tokens)
+        {
+            Profile = profile;
+            Tokens = tokens;
+            Settings = new AccountSettings();
+            Keys = new AccountKeys();
+        }
+
+        public Account(Account account)
+        {
+            // Copy constructor excludes Keys (for storage)
+            Profile = new AccountProfile(account.Profile);
+            Tokens = new AccountTokens(account.Tokens);
+            Settings = new AccountSettings(account.Settings);
+        }
+
+        public class AccountProfile
+        {
+            public AccountProfile() { }
+
+            public AccountProfile(AccountProfile copy)
+            {
+                if (copy == null)
+                {
+                    return;
+                }
+
+                UserId = copy.UserId;
+                Email = copy.Email;
+                Name = copy.Name;
+                Stamp = copy.Stamp;
+                OrgIdentifier = copy.OrgIdentifier;
+                KdfType = copy.KdfType;
+                KdfIterations = copy.KdfIterations;
+                EmailVerified = copy.EmailVerified;
+                HasPremiumPersonally = copy.HasPremiumPersonally;
+            }
+
+            public string UserId;
+            public string Email;
+            public string Name;
+            public string Stamp;
+            public string OrgIdentifier;
+            public KdfType? KdfType;
+            public int? KdfIterations;
+            public bool? EmailVerified;
+            public bool? HasPremiumPersonally;
+        }
+
+        public class AccountTokens
+        {
+            public AccountTokens() { }
+
+            public AccountTokens(AccountTokens copy)
+            {
+                if (copy == null)
+                {
+                    return;
+                }
+
+                AccessToken = copy.AccessToken;
+                RefreshToken = copy.RefreshToken;
+            }
+
+            public string AccessToken;
+            public string RefreshToken;
+        }
+
+        public class AccountSettings
+        {
+            public AccountSettings() { }
+
+            public AccountSettings(AccountSettings copy)
+            {
+                if (copy == null)
+                {
+                    return;
+                }
+
+                EnvironmentUrls = copy.EnvironmentUrls;
+                VaultTimeout = copy.VaultTimeout;
+                VaultTimeoutAction = copy.VaultTimeoutAction;
+            }
+
+            public EnvironmentUrlData EnvironmentUrls;
+            public int? VaultTimeout;
+            public VaultTimeoutAction? VaultTimeoutAction;
+        }
+
+        public class AccountKeys
+        {
+            public SymmetricCryptoKey Key;
+            public EncString PinProtectedKey;
+        }
+    }
+}