From ef62bd4199dc42be9bd5763a8d32aa6e3ffdd273 Mon Sep 17 00:00:00 2001
From: Andre Rosado <arosado@bitwarden.com>
Date: Tue, 5 Sep 2023 14:29:28 +0100
Subject: [PATCH] Reverted AnonAddy to AddyIo refactor, keeping text and url
 changes

---
 src/App/Pages/Generator/GeneratorPage.xaml    |  8 +++----
 .../Pages/Generator/GeneratorPageViewModel.cs | 22 +++++++++----------
 src/Core/Enums/ForwardedEmailServiceType.cs   |  2 +-
 .../Domain/UsernameGenerationOptions.cs       | 12 +++++-----
 ...ddyIoForwarder.cs => AnonAddyForwarder.cs} | 10 ++++-----
 .../Services/UsernameGenerationService.cs     |  6 ++---
 6 files changed, 30 insertions(+), 30 deletions(-)
 rename src/Core/Services/EmailForwarders/{AddyIoForwarder.cs => AnonAddyForwarder.cs} (77%)

diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index ae1009867..73bc146ca 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -269,15 +269,15 @@
                                 Grid.Column="1"
                                 AutomationId="ShowForwardedEmailApiSecretButton" />
                         </Grid>
-                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AddyIo}}"
+                        <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                             Text="{u:I18n DomainNameRequiredParenthesis}"
                             StyleClass="box-label"
                             Margin="0,10,0,0"/>
-                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AddyIo}}"
-                            x:Name="_addyIoDomainNameEntry"
+                        <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
+                            x:Name="_anonAddyDomainNameEntry"
                             Text="{Binding AddyIoDomainName}"
                             StyleClass="box-value"
-                            AutomationId="AddyIoDomainNameEntry" />
+                            AutomationId="AnonAddyDomainNameEntry" />
                     </StackLayout>                    
                     <!--RANDOM WORD OPTIONS-->
                     <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
diff --git a/src/App/Pages/Generator/GeneratorPageViewModel.cs b/src/App/Pages/Generator/GeneratorPageViewModel.cs
index 67c92f5fd..dd9201a09 100644
--- a/src/App/Pages/Generator/GeneratorPageViewModel.cs
+++ b/src/App/Pages/Generator/GeneratorPageViewModel.cs
@@ -77,7 +77,7 @@ namespace Bit.App.Pages
             };
 
             ForwardedEmailServiceTypeOptions = new List<ForwardedEmailServiceType> {
-                ForwardedEmailServiceType.AddyIo,
+                ForwardedEmailServiceType.AnonAddy,
                 ForwardedEmailServiceType.DuckDuckGo,
                 ForwardedEmailServiceType.Fastmail,
                 ForwardedEmailServiceType.FirefoxRelay,
@@ -451,8 +451,8 @@ namespace Bit.App.Pages
             {
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AddyIo:
-                        return _usernameOptions.AddyIoApiAccessToken;
+                    case ForwardedEmailServiceType.AnonAddy:
+                        return _usernameOptions.AnonAddyApiAccessToken;
                     case ForwardedEmailServiceType.DuckDuckGo:
                         return _usernameOptions.DuckDuckGoApiKey;
                     case ForwardedEmailServiceType.Fastmail:
@@ -470,10 +470,10 @@ namespace Bit.App.Pages
                 bool changed = false;
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AddyIo:
-                        if (_usernameOptions.AddyIoApiAccessToken != value)
+                    case ForwardedEmailServiceType.AnonAddy:
+                        if (_usernameOptions.AnonAddyApiAccessToken != value)
                         {
-                            _usernameOptions.AddyIoApiAccessToken = value;
+                            _usernameOptions.AnonAddyApiAccessToken = value;
                             changed = true;
                         }
                         break;
@@ -523,7 +523,7 @@ namespace Bit.App.Pages
             {
                 switch (ForwardedEmailServiceSelected)
                 {
-                    case ForwardedEmailServiceType.AddyIo:
+                    case ForwardedEmailServiceType.AnonAddy:
                     case ForwardedEmailServiceType.FirefoxRelay:
                         return AppResources.APIAccessToken;
                     case ForwardedEmailServiceType.DuckDuckGo:
@@ -547,12 +547,12 @@ namespace Bit.App.Pages
 
         public string AddyIoDomainName
         {
-            get => _usernameOptions.AddyIoDomainName;
+            get => _usernameOptions.AnonAddyDomainName;
             set
             {
-                if (_usernameOptions.AddyIoDomainName != value)
+                if (_usernameOptions.AnonAddyDomainName != value)
                 {
-                    _usernameOptions.AddyIoDomainName = value;
+                    _usernameOptions.AnonAddyDomainName = value;
                     TriggerPropertyChanged(nameof(AddyIoDomainName));
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
@@ -832,7 +832,7 @@ namespace Bit.App.Pages
             {
                 if (ex is ForwardedEmailInvalidSecretException)
                 {
-                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AddyIo || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
+                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AnonAddy || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
                                 ? AppResources.InvalidAPIToken
                                 : AppResources.InvalidAPIKey;
                 }
diff --git a/src/Core/Enums/ForwardedEmailServiceType.cs b/src/Core/Enums/ForwardedEmailServiceType.cs
index 5a0df251b..b969e207d 100644
--- a/src/Core/Enums/ForwardedEmailServiceType.cs
+++ b/src/Core/Enums/ForwardedEmailServiceType.cs
@@ -6,7 +6,7 @@ namespace Bit.Core.Enums
     {
         None = -1,
         [LocalizableEnum("AddyIo")]
-        AddyIo = 0,
+        AnonAddy = 0,
         [LocalizableEnum("FirefoxRelay")]
         FirefoxRelay = 1,
         [LocalizableEnum("SimpleLogin")]
diff --git a/src/Core/Models/Domain/UsernameGenerationOptions.cs b/src/Core/Models/Domain/UsernameGenerationOptions.cs
index 8e88599e3..deb98521d 100644
--- a/src/Core/Models/Domain/UsernameGenerationOptions.cs
+++ b/src/Core/Models/Domain/UsernameGenerationOptions.cs
@@ -22,8 +22,8 @@ namespace Bit.Core.Models.Domain
         public string SimpleLoginApiKey { get; set; }
         public string DuckDuckGoApiKey { get; set; }
         public string FastMailApiKey { get; set; }
-        public string AddyIoApiAccessToken { get; set; }
-        public string AddyIoDomainName { get; set; }
+        public string AnonAddyApiAccessToken { get; set; }
+        public string AnonAddyDomainName { get; set; }
         public string EmailWebsite { get; set; }
 
         public ForwarderOptions GetForwarderOptions()
@@ -35,11 +35,11 @@ namespace Bit.Core.Models.Domain
 
             switch (ServiceType)
             {
-                case ForwardedEmailServiceType.AddyIo:
-                    return new AddyIoForwarderOptions
+                case ForwardedEmailServiceType.AnonAddy:
+                    return new AnonAddyForwarderOptions
                     {
-                        ApiKey = AddyIoApiAccessToken,
-                        DomainName = AddyIoDomainName
+                        ApiKey = AnonAddyApiAccessToken,
+                        DomainName = AnonAddyDomainName
                     };
                 case ForwardedEmailServiceType.DuckDuckGo:
                     return new ForwarderOptions { ApiKey = DuckDuckGoApiKey };
diff --git a/src/Core/Services/EmailForwarders/AddyIoForwarder.cs b/src/Core/Services/EmailForwarders/AnonAddyForwarder.cs
similarity index 77%
rename from src/Core/Services/EmailForwarders/AddyIoForwarder.cs
rename to src/Core/Services/EmailForwarders/AnonAddyForwarder.cs
index 162dfcb0f..3ce0e59f1 100644
--- a/src/Core/Services/EmailForwarders/AddyIoForwarder.cs
+++ b/src/Core/Services/EmailForwarders/AnonAddyForwarder.cs
@@ -7,26 +7,26 @@ using Newtonsoft.Json.Linq;
 
 namespace Bit.Core.Services.EmailForwarders
 {
-    public class AddyIoForwarderOptions : ForwarderOptions
+    public class AnonAddyForwarderOptions : ForwarderOptions
     {
         public string DomainName { get; set; }
     }
 
-    public class AddyIoForwarder : BaseForwarder<AddyIoForwarderOptions>
+    public class AnonAddyForwarder : BaseForwarder<AnonAddyForwarderOptions>
     {
         protected override string RequestUri => "https://app.addy.io/api/v1/aliases";
 
-        protected override bool CanGenerate(AddyIoForwarderOptions options)
+        protected override bool CanGenerate(AnonAddyForwarderOptions options)
         {
             return !string.IsNullOrWhiteSpace(options.ApiKey) && !string.IsNullOrWhiteSpace(options.DomainName);
         }
 
-        protected override void ConfigureHeaders(HttpRequestHeaders headers, AddyIoForwarderOptions options)
+        protected override void ConfigureHeaders(HttpRequestHeaders headers, AnonAddyForwarderOptions options)
         {
             headers.Add("Authorization", $"Bearer {options.ApiKey}");
         }
 
-        protected override Task<HttpContent> GetContentAsync(IApiService apiService, AddyIoForwarderOptions options)
+        protected override Task<HttpContent> GetContentAsync(IApiService apiService, AnonAddyForwarderOptions options)
         {
             return Task.FromResult<HttpContent>(new FormUrlEncodedContent(new Dictionary<string, string>
             {
diff --git a/src/Core/Services/UsernameGenerationService.cs b/src/Core/Services/UsernameGenerationService.cs
index 6506ca0a2..9ec9fa215 100644
--- a/src/Core/Services/UsernameGenerationService.cs
+++ b/src/Core/Services/UsernameGenerationService.cs
@@ -135,10 +135,10 @@ namespace Bit.Core.Services
 
         private async Task<string> GenerateForwardedEmailAliasAsync(UsernameGenerationOptions options)
         {
-            if (options.ServiceType == ForwardedEmailServiceType.AddyIo)
+            if (options.ServiceType == ForwardedEmailServiceType.AnonAddy)
             {
-                return await new AddyIoForwarder()
-                                    .GenerateAsync(_apiService, (AddyIoForwarderOptions)options.GetForwarderOptions());
+                return await new AnonAddyForwarder()
+                                    .GenerateAsync(_apiService, (AnonAddyForwarderOptions)options.GetForwarderOptions());
             }
 
             BaseForwarder<ForwarderOptions> simpleForwarder = null;