From 0e67d8cf1cf51c5ed74275b6844d2bb34d133f7b Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 22:21:13 +1000
Subject: [PATCH 01/42] Remove security protocol usage

---
 GmailAPIHelper/GmailHelper.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 8f774fe..ab7e373 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -141,7 +141,6 @@ public static GmailService GetGmailService(string applicationName, TokenPathType
                     new FileDataStore(credPath, true)).Result;
             }
             //Create Gmail API service.
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
             var service = new GmailService(new BaseClientService.Initializer()
             {
                 HttpClientInitializer = credential,

From f5bf2dd99c1f4230dd1308b2b913273b90949b95 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:03:56 +1000
Subject: [PATCH 02/42] Remove security protocol usage

---
 GmailAPIHelper/GmailHelper.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index ab7e373..ee6ce3c 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -8,7 +8,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;

From 817d42b6f5126622f5a54d0b309355cc7285c5dc Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:14:33 +1000
Subject: [PATCH 03/42] Regex Match - Timeout to limit the execution time

---
 GmailAPIHelper/GmailHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index ee6ce3c..18036d5 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1433,7 +1433,7 @@ private static bool IsValidEmail(this string email)
             string pattern = @"^[^0-9](?!\.)(""([^""\r\\]|\\[""\r\\])*""|"
                             + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
                             + @"@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$";
-            var regex = new Regex(pattern, RegexOptions.IgnoreCase);
+            var regex = new Regex(pattern, RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(100));
             return regex.IsMatch(email);
         }
 

From fb1ccd8ce2417d8f92975dd8f244b24619cd03cb Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:33:40 +1000
Subject: [PATCH 04/42] Code quality check

---
 .github/workflows/code-quality.yml | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 .github/workflows/code-quality.yml

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
new file mode 100644
index 0000000..8d76ac1
--- /dev/null
+++ b/.github/workflows/code-quality.yml
@@ -0,0 +1,49 @@
+name: SonarCloud
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: windows-latest
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'zulu'
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache SonarCloud scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v3
+        with:
+          path: .\.sonar\scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+      - name: Install SonarCloud scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          New-Item -Path .\.sonar\scanner -ItemType Directory
+          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        shell: powershell
+        run: |
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"abhinavminhas_Gmail-API-Helper" /o:"abhinavminhas" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          dotnet build
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
\ No newline at end of file

From 192c7dee8eb4b15332d4e83855821ecbef9b1a8c Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:39:58 +1000
Subject: [PATCH 05/42] Test cleanup yml renamed

---
 .github/workflows/{testcleanup.yml => test-cleanup.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{testcleanup.yml => test-cleanup.yml} (100%)

diff --git a/.github/workflows/testcleanup.yml b/.github/workflows/test-cleanup.yml
similarity index 100%
rename from .github/workflows/testcleanup.yml
rename to .github/workflows/test-cleanup.yml

From 6525f56f96fb33c156db15852a16bdf1d665dd43 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:57:06 +1000
Subject: [PATCH 06/42] Code quality check update

---
 .github/workflows/code-quality.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 8d76ac1..108e816 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -6,6 +6,8 @@ on:
       - dev
   pull_request:
     types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
 jobs:
   build:
     name: Build and analyze
@@ -40,7 +42,7 @@ jobs:
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
       - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |

From bc299a55506122cb39ce2a091e0a3c40ae241735 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 00:05:07 +1000
Subject: [PATCH 07/42] Code quality check update

---
 .github/workflows/code-quality.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 108e816..4f5d597 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -1,4 +1,4 @@
-name: SonarCloud
+name: Code Quality (SonarCloud)
 on:
   push:
     branches:

From a7a1469c560aa223ec103f3c5d4e4112c3d8ca21 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 00:25:13 +1000
Subject: [PATCH 08/42] GetMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 18036d5..b6cebc4 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -190,13 +190,16 @@ public static Message GetMessage(this GmailService gmailService, string query, b
             if (messages.Count > 0)
             {
                 var requiredLatestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var messageRequest = service.Users.Messages.Get(userId, requiredLatestMessage.Id);
-                messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
-                requiredLatestMessage = messageRequest.Execute();
-                if (markRead)
+                if (requiredLatestMessage != null)
                 {
-                    var labelToRemove = new List<string> { "UNREAD" };
-                    service.RemoveLabels(requiredLatestMessage.Id, labelToRemove, userId: userId);
+                    var messageRequest = service.Users.Messages.Get(userId, requiredLatestMessage.Id);
+                    messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
+                    requiredLatestMessage = messageRequest.Execute();
+                    if (markRead)
+                    {
+                        var labelToRemove = new List<string> { "UNREAD" };
+                        service.RemoveLabels(requiredLatestMessage.Id, labelToRemove, userId: userId);
+                    }
                 }
                 if (disposeGmailService)
                     service.DisposeGmailService();

From 651eb217d3a293474291118216b83b3c0b0bb62e Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:03:11 +1000
Subject: [PATCH 09/42] GetLatestMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 49 +++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index b6cebc4..ebf9799 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -287,35 +287,38 @@ public static string GetLatestMessage(this GmailService gmailService, string que
             {
                 string requiredMessage = null;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var messageRequest = service.Users.Messages.Get(userId, latestMessage.Id);
-                messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
-                var latestMessageDetails = messageRequest.Execute();
-                MessagePart requiredMessagePart = null;
-                if (latestMessageDetails.Payload.MimeType == "text/plain")
-                    requiredMessagePart = latestMessageDetails.Payload;
-                else if (latestMessageDetails.Payload.MimeType == "text/html")
-                    requiredMessagePart = latestMessageDetails.Payload;
-                else
+                if (latestMessage != null)
                 {
-                    if (latestMessageDetails.Payload.Parts != null)
+                    var messageRequest = service.Users.Messages.Get(userId, latestMessage.Id);
+                    messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
+                    var latestMessageDetails = messageRequest.Execute();
+                    MessagePart requiredMessagePart = null;
+                    if (latestMessageDetails.Payload.MimeType == "text/plain")
+                        requiredMessagePart = latestMessageDetails.Payload;
+                    else if (latestMessageDetails.Payload.MimeType == "text/html")
+                        requiredMessagePart = latestMessageDetails.Payload;
+                    else
                     {
-                        requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/plain");
-                        if (requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
-                            requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/html");
+                        if (latestMessageDetails.Payload.Parts != null)
+                        {
+                            requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/plain");
+                            if (requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
+                                requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/html");
+                        }
                     }
-                }
-                if (requiredMessagePart != null)
-                {
-                    byte[] data = Convert.FromBase64String(requiredMessagePart.Body.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
-                    requiredMessage = Encoding.UTF8.GetString(data);
-                    if (markRead)
+                    if (requiredMessagePart != null)
                     {
-                        var labelToRemove = new List<string> { "UNREAD" };
-                        service.RemoveLabels(latestMessage.Id, labelToRemove, userId: userId);
+                        byte[] data = Convert.FromBase64String(requiredMessagePart.Body.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
+                        requiredMessage = Encoding.UTF8.GetString(data);
+                        if (markRead)
+                        {
+                            var labelToRemove = new List<string> { "UNREAD" };
+                            service.RemoveLabels(latestMessage.Id, labelToRemove, userId: userId);
+                        }
                     }
+                    else
+                        requiredMessagePart = null;
                 }
-                else
-                    requiredMessagePart = null;
                 if (disposeGmailService)
                     service.DisposeGmailService();
                 return requiredMessage;

From a1bf6b05b3a0921a39535e34caeb1da24af54f07 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:20:40 +1000
Subject: [PATCH 10/42] GetLatestMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index ebf9799..787a93a 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -302,7 +302,7 @@ public static string GetLatestMessage(this GmailService gmailService, string que
                         if (latestMessageDetails.Payload.Parts != null)
                         {
                             requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/plain");
-                            if (requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
+                            if (requiredMessagePart != null || requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
                                 requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/html");
                         }
                     }

From 167716bd2e497a77e76fc330206f8a7c0978537c Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:36:00 +1000
Subject: [PATCH 11/42] GetLatestMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 787a93a..887af41 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -302,7 +302,7 @@ public static string GetLatestMessage(this GmailService gmailService, string que
                         if (latestMessageDetails.Payload.Parts != null)
                         {
                             requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/plain");
-                            if (requiredMessagePart != null || requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
+                            if (requiredMessagePart == null || requiredMessagePart.Body.Data == "" || requiredMessagePart.Body.Data == null)
                                 requiredMessagePart = latestMessageDetails.Payload.Parts.FirstOrDefault(x => x.MimeType == "text/html");
                         }
                     }

From 97e87e5d8444cb50906a0c5ee92ff6b824af144a Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:43:56 +1000
Subject: [PATCH 12/42] GetMessageAttachments() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 887af41..aca4a3d 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -368,22 +368,25 @@ public static int GetMessageAttachments(this GmailService gmailService, string q
             if (messages.Count > 0)
             {
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var messageRequest = service.Users.Messages.Get(userId, latestMessage.Id);
-                messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
-                var latestMessageDetails = messageRequest.Execute();
-                if (latestMessageDetails.Payload != null)
+                if (latestMessage != null)
                 {
-                    if (latestMessageDetails.Payload.Parts.Count > 0)
+                    var messageRequest = service.Users.Messages.Get(userId, latestMessage.Id);
+                    messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
+                    var latestMessageDetails = messageRequest.Execute();
+                    if (latestMessageDetails.Payload != null)
                     {
-                        foreach (var part in latestMessageDetails.Payload.Parts)
+                        if (latestMessageDetails.Payload.Parts.Count > 0)
                         {
-                            if (part.Filename != "")
+                            foreach (var part in latestMessageDetails.Payload.Parts)
                             {
-                                var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
-                                var messageAttachmentResponse = messageAttachmentRequest.Execute();
-                                var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
-                                File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
-                                count++;
+                                if (part.Filename != "")
+                                {
+                                    var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
+                                    var messageAttachmentResponse = messageAttachmentRequest.Execute();
+                                    var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
+                                    File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
+                                    count++;
+                                }
                             }
                         }
                     }

From 277cd59ce3943ac5b78db24382e79fc484719520 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 14:20:12 +1000
Subject: [PATCH 13/42] MoveMessageToTrash() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index aca4a3d..b035109 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -646,12 +646,17 @@ public static bool MoveMessageToTrash(this GmailService gmailService, string que
             }
             if (messages.Count > 0)
             {
+                var isMoved = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var moveToTrashRequest = service.Users.Messages.Trash(userId, latestMessage.Id);
-                moveToTrashRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var moveToTrashRequest = service.Users.Messages.Trash(userId, latestMessage.Id);
+                    moveToTrashRequest.Execute();
+                    isMoved = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isMoved;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From 7afb4989c765ea5f14d05534760a30e91b24541d Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 14:55:27 +1000
Subject: [PATCH 14/42] UntrashMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index b035109..708ac0b 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -727,14 +727,19 @@ public static bool UntrashMessage(this GmailService gmailService, string query,
             }
             if (messages.Count > 0)
             {
+                var isMoved = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var untrashMessageRequest = service.Users.Messages.Untrash(userId, latestMessage.Id);
-                untrashMessageRequest.Execute();
-                var labelToAdd = new List<string> { "INBOX" };
-                service.AddLabels(latestMessage.Id, labelToAdd, userId: userId);
+                if (latestMessage != null)
+                {
+                    var untrashMessageRequest = service.Users.Messages.Untrash(userId, latestMessage.Id);
+                    untrashMessageRequest.Execute();
+                    var labelToAdd = new List<string> { "INBOX" };
+                    service.AddLabels(latestMessage.Id, labelToAdd, userId: userId);
+                    isMoved = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isMoved;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From 5866e62287979be12f36db0ff4cf3dc1a043a815 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 15:09:17 +1000
Subject: [PATCH 15/42] ReportSpamMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 708ac0b..224d0d2 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -817,12 +817,17 @@ public static bool ReportSpamMessage(this GmailService gmailService, string quer
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From 544d46070990f711b5e15ae038cdae2bbbb7f627 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 15:29:49 +1000
Subject: [PATCH 16/42] UnspamMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 224d0d2..60426e2 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -908,12 +908,17 @@ public static bool UnspamMessage(this GmailService gmailService, string query, s
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From df6e060c30f164f3d4e9bbb95edd7897b14ebe55 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 17:06:31 +1000
Subject: [PATCH 17/42] MarkMessageAsRead() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 60426e2..1a9f661 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -998,12 +998,17 @@ public static bool MarkMessageAsRead(this GmailService gmailService, string quer
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From d54d86999316ed18cbdcfeb570e1b311d902907a Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:51:02 +1000
Subject: [PATCH 18/42] MarkMessageAsUnread() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 1a9f661..c29ed9b 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1087,12 +1087,17 @@ public static bool MarkMessageAsUnread(this GmailService gmailService, string qu
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From 25e5b6cbb3cdd2798ef2c6c605d66517aea1d691 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:54:29 +1000
Subject: [PATCH 19/42] ModifyMessage() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index c29ed9b..32d9646 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1183,12 +1183,17 @@ public static bool ModifyMessage(this GmailService gmailService, string query, L
             }
             if (messages.Count > 0)
             {
+                var isModified = false;
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
-                modifyMessageRequest.Execute();
+                if (latestMessage != null)
+                {
+                    var modifyMessageRequest = service.Users.Messages.Modify(mods, userId, latestMessage.Id);
+                    modifyMessageRequest.Execute();
+                    isModified = true;
+                }
                 if (disposeGmailService)
                     service.DisposeGmailService();
-                return true;
+                return isModified;
             }
             if (disposeGmailService)
                 service.DisposeGmailService();

From 38137f4370590c043874bf134e5dfbc680793747 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 27 Jul 2024 21:11:07 +1000
Subject: [PATCH 20/42] GetMessageLabels() - Remove null execution path

---
 GmailAPIHelper/GmailHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 32d9646..3e27b02 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1277,7 +1277,7 @@ public static List<Label> GetMessageLabels(this GmailService gmailService, strin
             if (messages.Count > 0)
             {
                 var latestMessage = messages.OrderByDescending(item => item.InternalDate).FirstOrDefault();
-                if (latestMessage.LabelIds.Count > 0)
+                if (latestMessage != null && latestMessage.LabelIds.Count > 0)
                 {
                     foreach (var labelId in latestMessage.LabelIds)
                     {

From 8b8d1fa893d0437b5846f9b0a9730714f321f0c6 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:00:35 +1000
Subject: [PATCH 21/42] Move code quality check to Build.yml

---
 .github/workflows/build.yml        | 46 +++++++++++++++++++++++++++++-
 .github/workflows/code-quality.yml |  6 ----
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c1b8c1..13ec3bc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #CI/MANUAL TRIGGER
-name: Build
+name: Build / Test / Code Coverage / Code Quality (SonarCloud)
 
 on:
   push:
@@ -12,6 +12,7 @@ on:
 
 jobs:
   Build_DotNet_OS-VSVersion:
+    name: Build And Test (.NET Framework)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -65,6 +66,7 @@ jobs:
     
   
   Build_DotNetCore_OS-Version:
+    name: Build And Test (.NET Core)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -110,6 +112,7 @@ jobs:
       run: dotnet test --no-build --verbosity normal --configuration Release --filter TestCategory=GMAIL-TESTS-DOTNETCORE
 
   Code-Coverage:
+    name: Code Cpverage (Codecov)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -158,3 +161,44 @@ jobs:
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
+
+  Code-Quality:
+    name: Code Quality (SonarCloud)
+    runs-on: windows-latest
+    steps:
+      - name: Setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'zulu'
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Cache SonarCloud Packages
+        uses: actions/cache@v3
+        with:
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache SonarCloud Scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v3
+        with:
+          path: .\.sonar\scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+      - name: Install SonarCloud Scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          New-Item -Path .\.sonar\scanner -ItemType Directory
+          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+      - name: Build And Analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        shell: powershell
+        run: |
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"abhinavminhas_Gmail-API-Helper" /o:"abhinavminhas" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          dotnet build
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 4f5d597..a37d2d4 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -1,11 +1,5 @@
 name: Code Quality (SonarCloud)
 on:
-  push:
-    branches:
-      - main
-      - dev
-  pull_request:
-    types: [opened, synchronize, reopened]
   workflow_dispatch:
 
 jobs:

From 6056a9c1cf10f43873a879e09cc934dc0322e5d0 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:26:12 +1000
Subject: [PATCH 22/42] Actions yml refactoring

---
 .github/workflows/build.yml                 | 8 ++++----
 .github/workflows/coverage.yml              | 1 +
 .github/workflows/publish-nuget-Package.yml | 1 +
 .github/workflows/test-cleanup.yml          | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13ec3bc..c0b5e0b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #CI/MANUAL TRIGGER
-name: Build / Test / Code Coverage / Code Quality (SonarCloud)
+name: Build / Test / Code Coverage (Codecov) / Code Quality (SonarCloud)
 
 on:
   push:
@@ -12,7 +12,7 @@ on:
 
 jobs:
   Build_DotNet_OS-VSVersion:
-    name: Build And Test (.NET Framework)
+    name: Build/Test (.NET Framework)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -66,7 +66,7 @@ jobs:
     
   
   Build_DotNetCore_OS-Version:
-    name: Build And Test (.NET Core)
+    name: Build (.NET Core)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -112,7 +112,7 @@ jobs:
       run: dotnet test --no-build --verbosity normal --configuration Release --filter TestCategory=GMAIL-TESTS-DOTNETCORE
 
   Code-Coverage:
-    name: Code Cpverage (Codecov)
+    name: Code Coverage (Codecov)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 5e9ffc7..5d6104f 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   build:
+    name: Code Coverage (Codecov)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/publish-nuget-Package.yml b/.github/workflows/publish-nuget-Package.yml
index 37a3caf..47ac7f1 100644
--- a/.github/workflows/publish-nuget-Package.yml
+++ b/.github/workflows/publish-nuget-Package.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   build:
+    name: Publish Nuget Package
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/test-cleanup.yml b/.github/workflows/test-cleanup.yml
index b489d84..8a4f740 100644
--- a/.github/workflows/test-cleanup.yml
+++ b/.github/workflows/test-cleanup.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   build:
+    name: Test Cleanup
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

From a36bead2bb0b79c3e94b5a7cd2fd453f615c4536 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:28:53 +1000
Subject: [PATCH 23/42] Code quality used actions version updates

---
 .github/workflows/build.yml        | 8 ++++----
 .github/workflows/code-quality.yml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0b5e0b..b4185ce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,22 +167,22 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Setup JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Cache SonarCloud Packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache SonarCloud Scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index a37d2d4..61243d7 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -8,22 +8,22 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner

From 08adf46c36924925ad14de6c2a742a64b26d52cd Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:44:58 +1000
Subject: [PATCH 24/42] Actions yml refactoring

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b4185ce..3943da9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #CI/MANUAL TRIGGER
-name: Build / Test / Code Coverage (Codecov) / Code Quality (SonarCloud)
+name: Build / Test
 
 on:
   push:

From 8681749e4713650ced15c33ec9cebc275e9c3979 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:54:20 +1000
Subject: [PATCH 25/42] Actions yml refactoring

---
 .github/workflows/test-cleanup.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-cleanup.yml b/.github/workflows/test-cleanup.yml
index 8a4f740..ba24b75 100644
--- a/.github/workflows/test-cleanup.yml
+++ b/.github/workflows/test-cleanup.yml
@@ -2,7 +2,7 @@ name: Test CleanUp
 
 on:
   workflow_run:
-    workflows: [ Build ]
+    workflows: [ Build / Test ]
     branches: [ main, dev ]
     types: [ completed ]
   workflow_dispatch:

From 0ae7bde195d970ac613d1b9b7b919922046b0115 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 11:59:41 +1000
Subject: [PATCH 26/42] Actions yml refactoring

---
 .github/workflows/code-quality.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 61243d7..15f8f08 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -4,10 +4,10 @@ on:
 
 jobs:
   build:
-    name: Build and analyze
+    name: Code Quality (SonarCloud)
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 17
+      - name: Set Up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
@@ -15,26 +15,26 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Cache SonarCloud packages
+      - name: Cache SonarCloud Packages
         uses: actions/cache@v4
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Cache SonarCloud scanner
+      - name: Cache SonarCloud Scanner
         id: cache-sonar-scanner
         uses: actions/cache@v4
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner
           restore-keys: ${{ runner.os }}-sonar-scanner
-      - name: Install SonarCloud scanner
+      - name: Install SonarCloud Scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           New-Item -Path .\.sonar\scanner -ItemType Directory
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
-      - name: Build and analyze
+      - name: Build And Analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

From 7a07bcdf382304b16b73b28f876ddcaa62e61af1 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 12:43:29 +1000
Subject: [PATCH 27/42] Code quality - Add at least one assertion to the test
 cases

---
 GmailAPIHelper.CORE.Tests/GmailTests.cs | 25 +++++++++++++++++--------
 GmailAPIHelper.NET.Tests/GmailTests.cs  | 19 +++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/GmailAPIHelper.CORE.Tests/GmailTests.cs b/GmailAPIHelper.CORE.Tests/GmailTests.cs
index 4dee61d..3591935 100644
--- a/GmailAPIHelper.CORE.Tests/GmailTests.cs
+++ b/GmailAPIHelper.CORE.Tests/GmailTests.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 
 namespace GmailAPIHelper.CORE.Tests
 {
@@ -75,7 +76,8 @@ public void Test_GetGmailService_TokenPath_Home()
                 destPath = Environment.GetEnvironmentVariable("HOME") + "/" + "token.json";
             Directory.CreateDirectory(destPath);
             File.Copy(sourcePath, destPath + "/Google.Apis.Auth.OAuth2.Responses.TokenResponse-user", overwrite: true);
-            GmailHelper.GetGmailService(ApplicationName, GmailHelper.TokenPathType.HOME);
+            var service = GmailHelper.GetGmailService(ApplicationName, GmailHelper.TokenPathType.HOME);
+            Assert.IsTrue(service.GetType() == typeof(Google.Apis.Gmail.v1.GmailService));
             Directory.Delete(destPath, recursive: true);
         }
 
@@ -90,7 +92,8 @@ public void Test_GetGmailService_TokenPath_Custom()
                 credPath = Environment.CurrentDirectory + "/" + "token.json";
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 credPath = Environment.CurrentDirectory + "/" + "token.json";
-            GmailHelper.GetGmailService(ApplicationName, GmailHelper.TokenPathType.CUSTOM, credPath);
+            var service = GmailHelper.GetGmailService(ApplicationName, GmailHelper.TokenPathType.CUSTOM, credPath);
+            Assert.IsTrue(service.GetType() == typeof(Google.Apis.Gmail.v1.GmailService));
         }
 
         [TestMethod]
@@ -365,6 +368,7 @@ public void Test_SendMessage_PlainText()
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 path = Environment.CurrentDirectory + "/TestFiles/PlainEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsFalse(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             GmailHelper.GetGmailService(ApplicationName)
                 .SendMessage(GmailHelper.EmailContentType.PLAIN, TestEmailId, cc: TestEmailId, bcc: TestEmailId, subject: "EMAIL WITH PLAIN TEXT", body: body);
         }
@@ -381,6 +385,7 @@ public void Test_SendMessage_HtmlText()
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 path = Environment.CurrentDirectory + "/TestFiles/HTMLEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsTrue(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             GmailHelper.GetGmailService(ApplicationName)
                 .SendMessage(GmailHelper.EmailContentType.HTML, TestEmailId, cc: TestEmailId, bcc: TestEmailId, subject: "EMAIL WITH HTML TEXT", body: body);
         }
@@ -463,6 +468,7 @@ public void Test_SendMessage_Attachments_PlainText()
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 path = Environment.CurrentDirectory + "/TestFiles/PlainEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsFalse(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             var attachmentPath = "";
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 attachmentPath = Environment.CurrentDirectory + "\\TestFiles\\Attachments\\";
@@ -499,6 +505,7 @@ public void Test_SendMessage_Attachments_HtmlText()
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 path = Environment.CurrentDirectory + "/TestFiles/HTMLEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsTrue(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             var attachmentPath = "";
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 attachmentPath = Environment.CurrentDirectory + "\\TestFiles\\Attachments\\";
@@ -1484,18 +1491,20 @@ public void Test_ListUserLabels()
         [TestCategory("TestCleanup")]
         public void Inbox_CleanUp()
         {
-            GmailHelper.GetGmailService(ApplicationName)
+            var mesagesMoved = 0;
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: $"[from:{TestEmailId}]in:inbox is:unread");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: $"[from:{TestEmailId}]in:spam is:unread");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETCORE MESSAGE AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETFRAMEWORK MESSAGE AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETCORE MESSAGES AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETFRAMEWORK MESSAGES AS READ']in:inbox is:read");
+            Assert.IsTrue(mesagesMoved >= 0);
         }
     }
 }
\ No newline at end of file
diff --git a/GmailAPIHelper.NET.Tests/GmailTests.cs b/GmailAPIHelper.NET.Tests/GmailTests.cs
index 1c1ae1f..e081a90 100644
--- a/GmailAPIHelper.NET.Tests/GmailTests.cs
+++ b/GmailAPIHelper.NET.Tests/GmailTests.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace GmailAPIHelper.NET.Tests
 {
@@ -284,6 +285,7 @@ public void Test_GetMessagesAttachments_NoMatchingEmail()
         public void Test_SendMessage_PlainText()
         {
             var body = File.ReadAllText(Environment.CurrentDirectory + "\\TestFiles\\PlainEmail.txt");
+            Assert.IsFalse(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             GmailHelper.GetGmailService(ApplicationName)
                 .SendMessage(GmailHelper.EmailContentType.PLAIN, TestEmailId, cc: TestEmailId, bcc: TestEmailId, subject: "EMAIL WITH PLAIN TEXT", body: body);
         }
@@ -293,6 +295,7 @@ public void Test_SendMessage_PlainText()
         public void Test_SendMessage_HtmlText()
         {
             var body = File.ReadAllText(Environment.CurrentDirectory + "\\TestFiles\\HTMLEmail.txt");
+            Assert.IsTrue(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             GmailHelper.GetGmailService(ApplicationName)
                 .SendMessage(GmailHelper.EmailContentType.HTML, TestEmailId, cc: TestEmailId, bcc: TestEmailId, subject: "EMAIL WITH HTML TEXT", body: body);
         }
@@ -369,6 +372,7 @@ public void Test_SendMessage_Attachments_PlainText()
         {
             var path = Environment.CurrentDirectory + "\\TestFiles\\PlainEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsFalse(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             var attachmentPath = Environment.CurrentDirectory + "\\TestFiles\\Attachments\\";
             var attachments = new List<string>
             {
@@ -393,6 +397,7 @@ public void Test_SendMessage_Attachments_HtmlText()
         {
             var path = Environment.CurrentDirectory + "\\TestFiles\\HTMLEmail.txt";
             var body = File.ReadAllText(path);
+            Assert.IsTrue(Regex.IsMatch(body, "<(.|\n)*?>", RegexOptions.None, TimeSpan.FromMilliseconds(100)));
             var attachmentPath = Environment.CurrentDirectory + "\\TestFiles\\Attachments\\";
             var attachments = new List<string>
             {
@@ -1261,18 +1266,20 @@ public void Test_ListUserLabels()
         [TestCategory("TestCleanup")]
         public void Inbox_CleanUp()
         {
-            GmailHelper.GetGmailService(ApplicationName)
+            var mesagesMoved = 0;
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: $"[from:{TestEmailId}]in:inbox is:unread");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: $"[from:{TestEmailId}]in:spam is:unread");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETCORE MESSAGE AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETFRAMEWORK MESSAGE AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETCORE MESSAGES AS READ']in:inbox is:read");
-            GmailHelper.GetGmailService(ApplicationName)
+            mesagesMoved += GmailHelper.GetGmailService(ApplicationName)
                 .MoveMessagesToTrash(query: "[subject:'MARK DOTNETFRAMEWORK MESSAGES AS READ']in:inbox is:read");
+            Assert.IsTrue(mesagesMoved >= 0);
         }
     }
 }
\ No newline at end of file

From 46755b2bc749be721cc261a3850dfd74e3918ce7 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 14:52:53 +1000
Subject: [PATCH 28/42] GetMessageAttachments/GetMessagesAttachments - Merge if
 statement with the enclosing one

---
 GmailAPIHelper/GmailHelper.cs | 50 +++++++++++++++--------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 3e27b02..3c3856f 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -373,20 +373,17 @@ public static int GetMessageAttachments(this GmailService gmailService, string q
                     var messageRequest = service.Users.Messages.Get(userId, latestMessage.Id);
                     messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
                     var latestMessageDetails = messageRequest.Execute();
-                    if (latestMessageDetails.Payload != null)
+                    if (latestMessageDetails.Payload != null && latestMessageDetails.Payload.Parts.Count > 0)
                     {
-                        if (latestMessageDetails.Payload.Parts.Count > 0)
+                        foreach (var part in latestMessageDetails.Payload.Parts)
                         {
-                            foreach (var part in latestMessageDetails.Payload.Parts)
+                            if (part.Filename != "")
                             {
-                                if (part.Filename != "")
-                                {
-                                    var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
-                                    var messageAttachmentResponse = messageAttachmentRequest.Execute();
-                                    var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
-                                    File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
-                                    count++;
-                                }
+                                var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
+                                var messageAttachmentResponse = messageAttachmentRequest.Execute();
+                                var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
+                                File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
+                                count++;
                             }
                         }
                     }
@@ -436,28 +433,25 @@ public static Dictionary<string, int> GetMessagesAttachments(this GmailService g
                 var messageRequest = service.Users.Messages.Get(userId, message.Id);
                 messageRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Full;
                 var latestMessageDetails = messageRequest.Execute();
-                if (latestMessageDetails.Payload != null)
+                if (latestMessageDetails.Payload != null && latestMessageDetails.Payload.Parts.Count > 0)
                 {
-                    if (latestMessageDetails.Payload.Parts.Count > 0)
+                    int count = 0;
+                    foreach (var part in latestMessageDetails.Payload.Parts)
                     {
-                        int count = 0;
-                        foreach (var part in latestMessageDetails.Payload.Parts)
+                        if (part.Filename != "")
                         {
-                            if (part.Filename != "")
-                            {
-                                directoryPath = Path.Combine(originalDirectoryPath, message.Id);
-                                if (!Directory.Exists(directoryPath))
-                                    Directory.CreateDirectory(directoryPath);
-                                var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
-                                var messageAttachmentResponse = messageAttachmentRequest.Execute();
-                                var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
-                                File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
-                                count++;
-                            }
+                            directoryPath = Path.Combine(originalDirectoryPath, message.Id);
+                            if (!Directory.Exists(directoryPath))
+                                Directory.CreateDirectory(directoryPath);
+                            var messageAttachmentRequest = service.Users.Messages.Attachments.Get(userId, latestMessageDetails.Id, part.Body.AttachmentId);
+                            var messageAttachmentResponse = messageAttachmentRequest.Execute();
+                            var messageAttachmentData = Convert.FromBase64String(messageAttachmentResponse.Data.Replace('-', '+').Replace('_', '/').Replace(" ", "+"));
+                            File.WriteAllBytes(Path.Combine(directoryPath, part.Filename), messageAttachmentData);
+                            count++;
                         }
-                        if (count > 0)
-                            attachmentInfo.Add(message.Id, count);
                     }
+                    if (count > 0)
+                        attachmentInfo.Add(message.Id, count);
                 }
             }
             if (disposeGmailService)

From 6ade862a7ca237c1e5a2d8c705846abf0a05759c Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:04:23 +1000
Subject: [PATCH 29/42] Define a constant instead of using the literal multiple
 times for 'token.json'

---
 GmailAPIHelper/GmailHelper.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 3c3856f..f696326 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -23,6 +23,7 @@ public static class GmailHelper
     {
         private static List<string> _scopes;
         private static string _applicationName;
+        private const string _tokenFile = "token.json";
 
         /// <summary>
         /// 'Token Path Type' enum.
@@ -85,22 +86,22 @@ private static string SetCredentialPath(TokenPathType tokenPathType, string toke
             if (tokenPathType == TokenPathType.HOME)
             {
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    credPath = Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%") + "\\" + "token.json";
+                    credPath = Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%") + "\\" + _tokenFile;
                 else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                    credPath = Environment.GetEnvironmentVariable("HOME") + "/" + "token.json";
+                    credPath = Environment.GetEnvironmentVariable("HOME") + "/" + _tokenFile;
                 else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                    credPath = Environment.GetEnvironmentVariable("HOME") + "/" + "token.json";
+                    credPath = Environment.GetEnvironmentVariable("HOME") + "/" + _tokenFile;
                 else
                     throw new NotImplementedException("OS Platform: Not 'Windows/Linux/OSX' Platform.");
             }
             else if (tokenPathType == TokenPathType.WORKING_DIRECTORY)
             {
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    credPath = Environment.CurrentDirectory + "\\" + "token.json";
+                    credPath = Environment.CurrentDirectory + "\\" + _tokenFile;
                 else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                    credPath = Environment.CurrentDirectory + "/" + "token.json";
+                    credPath = Environment.CurrentDirectory + "/" + _tokenFile;
                 else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                    credPath = Environment.CurrentDirectory + "/" + "token.json";
+                    credPath = Environment.CurrentDirectory + "/" + _tokenFile;
                 else
                     throw new NotImplementedException("OS Platform: Not 'Windows/Linux/OSX' Platform.");
             }

From aecce271f16c77581a93d69f5a9b6eb50ca2b078 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:40:16 +1000
Subject: [PATCH 30/42] GetLatestMessage() - Remove useless assignment to local
 variable 'requiredMessagePart'.

---
 GmailAPIHelper/GmailHelper.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index f696326..d58e957 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -317,8 +317,6 @@ public static string GetLatestMessage(this GmailService gmailService, string que
                             service.RemoveLabels(latestMessage.Id, labelToRemove, userId: userId);
                         }
                     }
-                    else
-                        requiredMessagePart = null;
                 }
                 if (disposeGmailService)
                     service.DisposeGmailService();

From 30a65bb0df012a9454b7deaac08609ae4dc649c5 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 16:20:04 +1000
Subject: [PATCH 31/42] ModifyMessage/ModifyMessages - Throw
 'ArgumentNullException' instead of 'NullReferenceException'

---
 GmailAPIHelper.CORE.Tests/GmailTests.cs |  4 ++--
 GmailAPIHelper.NET.Tests/GmailTests.cs  |  4 ++--
 GmailAPIHelper/GmailHelper.cs           | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/GmailAPIHelper.CORE.Tests/GmailTests.cs b/GmailAPIHelper.CORE.Tests/GmailTests.cs
index 3591935..265387f 100644
--- a/GmailAPIHelper.CORE.Tests/GmailTests.cs
+++ b/GmailAPIHelper.CORE.Tests/GmailTests.cs
@@ -1093,7 +1093,7 @@ public void Test_ModifyMessage_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (NullReferenceException ex) { Assert.AreEqual("Either 'Labels To Add' or 'Labels to Remove' required.", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
         }
 
         [TestMethod]
@@ -1148,7 +1148,7 @@ public void Test_ModifyMessages_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (NullReferenceException ex) { Assert.AreEqual("Either 'Labels To Add' or 'Labels to Remove' required.", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
         }
 
         [TestMethod]
diff --git a/GmailAPIHelper.NET.Tests/GmailTests.cs b/GmailAPIHelper.NET.Tests/GmailTests.cs
index e081a90..e361447 100644
--- a/GmailAPIHelper.NET.Tests/GmailTests.cs
+++ b/GmailAPIHelper.NET.Tests/GmailTests.cs
@@ -882,7 +882,7 @@ public void Test_ModifyMessage_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (NullReferenceException ex) { Assert.AreEqual("Either 'Labels To Add' or 'Labels to Remove' required.", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
         }
 
         [TestMethod]
@@ -930,7 +930,7 @@ public void Test_ModifyMessages_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (NullReferenceException ex) { Assert.AreEqual("Either 'Labels To Add' or 'Labels to Remove' required.", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
         }
 
         [TestMethod]
diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index d58e957..12b4f44 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1136,7 +1136,7 @@ public static int MarkMessagesAsUnread(this GmailService gmailService, string qu
 
         /// <summary>
         /// Modifies the labels on the latest message for a specified query criteria.
-        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'NullReferenceException' if none supplied.
+        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentNullException' if none supplied.
         /// </summary>
         /// <param name="gmailService">'Gmail' service initializer value.</param>
         /// <param name="query">'Query' criteria for the email to search.</param>
@@ -1145,11 +1145,11 @@ public static int MarkMessagesAsUnread(this GmailService gmailService, string qu
         /// <param name="userId">User's email address. 'User Id' for request to authenticate. Default - 'me (authenticated user)'.</param>
         /// <param name="disposeGmailService">Boolean value to choose whether to dispose Gmail service instance used or not. Default - 'true'.</param>
         /// <returns>Boolean value to confirm if the email message labels for the criteria were modified or not.</returns>
-        /// <exception cref="NullReferenceException">Throws 'NullReferenceException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
+        /// <exception cref="ArgumentNullException">Throws 'ArgumentNullException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
         public static bool ModifyMessage(this GmailService gmailService, string query, List<string> labelsToAdd = null, List<string> labelsToRemove = null, string userId = "me", bool disposeGmailService = true)
         {
             if (labelsToAdd == null && labelsToRemove == null)
-                throw new NullReferenceException("Either 'Labels To Add' or 'Labels to Remove' required.");
+                throw new ArgumentNullException("<labelsToAdd> / <labelsToRemove> required.");
             var mods = new ModifyMessageRequest();
             if (labelsToAdd != null)
                 mods.AddLabelIds = labelsToAdd;
@@ -1195,7 +1195,7 @@ public static bool ModifyMessage(this GmailService gmailService, string query, L
 
         /// <summary>
         /// Modifies the labels on the messages for a specified query criteria.
-        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'NullReferenceException' if none supplied.
+        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentNullException' if none supplied.
         /// </summary>
         /// <param name="gmailService">'Gmail' service initializer value.</param>
         /// <param name="query">'Query' criteria for the email to search.</param>
@@ -1204,11 +1204,11 @@ public static bool ModifyMessage(this GmailService gmailService, string query, L
         /// <param name="userId">User's email address. 'User Id' for request to authenticate. Default - 'me (authenticated user)'.</param>
         /// <param name="disposeGmailService">Boolean value to choose whether to dispose Gmail service instance used or not. Default - 'true'.</param>
         /// <returns>Count of email messages with labels modified.</returns>
-        /// <exception cref="NullReferenceException">Throws 'NullReferenceException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
+        /// <exception cref="ArgumentNullException">Throws 'ArgumentNullException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
         public static int ModifyMessages(this GmailService gmailService, string query, List<string> labelsToAdd = null, List<string> labelsToRemove = null, string userId = "me", bool disposeGmailService = true)
         {
             if (labelsToAdd == null && labelsToRemove == null)
-                throw new NullReferenceException("Either 'Labels To Add' or 'Labels to Remove' required.");
+                throw new ArgumentNullException("<labelsToAdd> / <labelsToRemove> required.");
             var mods = new ModifyMessageRequest();
             if (labelsToAdd != null)
                 mods.AddLabelIds = labelsToAdd;

From 7039b77e556ce0c5bea3f37fe485ed0524c564ef Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 16:31:16 +1000
Subject: [PATCH 32/42] ModifyMessage/ModifyMessages - Throw
 'ArgumentNullException' instead of 'NullReferenceException'

---
 GmailAPIHelper.NET.Tests/GmailTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GmailAPIHelper.NET.Tests/GmailTests.cs b/GmailAPIHelper.NET.Tests/GmailTests.cs
index e361447..12b1f10 100644
--- a/GmailAPIHelper.NET.Tests/GmailTests.cs
+++ b/GmailAPIHelper.NET.Tests/GmailTests.cs
@@ -882,7 +882,7 @@ public void Test_ModifyMessage_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null.\r\nParameter name: <labelsToAdd> / <labelsToRemove> required.", ex.Message); }
         }
 
         [TestMethod]
@@ -930,7 +930,7 @@ public void Test_ModifyMessages_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
+            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null.\r\nParameter name: <labelsToAdd> / <labelsToRemove> required.", ex.Message); }
         }
 
         [TestMethod]

From bd2d316029b8a2214b9d635d7f2e9f8bb9a62595 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sun, 28 Jul 2024 17:29:19 +1000
Subject: [PATCH 33/42] ModifyMessage/ModifyMessages - Throw
 'ArgumentException' instead of 'ArgumentNullException'

---
 GmailAPIHelper.CORE.Tests/GmailTests.cs |  4 ++--
 GmailAPIHelper.NET.Tests/GmailTests.cs  |  4 ++--
 GmailAPIHelper/GmailHelper.cs           | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/GmailAPIHelper.CORE.Tests/GmailTests.cs b/GmailAPIHelper.CORE.Tests/GmailTests.cs
index 265387f..dff1b25 100644
--- a/GmailAPIHelper.CORE.Tests/GmailTests.cs
+++ b/GmailAPIHelper.CORE.Tests/GmailTests.cs
@@ -1093,7 +1093,7 @@ public void Test_ModifyMessage_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
+            catch (ArgumentException ex) { Assert.AreEqual("Parameters 'labelsToAdd' / 'labelsToRemove' required.", ex.Message); }
         }
 
         [TestMethod]
@@ -1148,7 +1148,7 @@ public void Test_ModifyMessages_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null. (Parameter '<labelsToAdd> / <labelsToRemove> required.')", ex.Message); }
+            catch (ArgumentException ex) { Assert.AreEqual("Parameters 'labelsToAdd' / 'labelsToRemove' required.", ex.Message); }
         }
 
         [TestMethod]
diff --git a/GmailAPIHelper.NET.Tests/GmailTests.cs b/GmailAPIHelper.NET.Tests/GmailTests.cs
index 12b1f10..cfb12a6 100644
--- a/GmailAPIHelper.NET.Tests/GmailTests.cs
+++ b/GmailAPIHelper.NET.Tests/GmailTests.cs
@@ -882,7 +882,7 @@ public void Test_ModifyMessage_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null.\r\nParameter name: <labelsToAdd> / <labelsToRemove> required.", ex.Message); }
+            catch (ArgumentException ex) { Assert.AreEqual("Parameters 'labelsToAdd' / 'labelsToRemove' required.", ex.Message); }
         }
 
         [TestMethod]
@@ -930,7 +930,7 @@ public void Test_ModifyMessages_NoLabelsSupplied()
                 Assert.Fail("No Exception Thrown.");
             }
             catch (AssertFailedException ex) { throw ex; }
-            catch (ArgumentNullException ex) { Assert.AreEqual("Value cannot be null.\r\nParameter name: <labelsToAdd> / <labelsToRemove> required.", ex.Message); }
+            catch (ArgumentException ex) { Assert.AreEqual("Parameters 'labelsToAdd' / 'labelsToRemove' required.", ex.Message); }
         }
 
         [TestMethod]
diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 12b4f44..62cdfe7 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -1136,7 +1136,7 @@ public static int MarkMessagesAsUnread(this GmailService gmailService, string qu
 
         /// <summary>
         /// Modifies the labels on the latest message for a specified query criteria.
-        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentNullException' if none supplied.
+        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentException' if none supplied.
         /// </summary>
         /// <param name="gmailService">'Gmail' service initializer value.</param>
         /// <param name="query">'Query' criteria for the email to search.</param>
@@ -1145,11 +1145,11 @@ public static int MarkMessagesAsUnread(this GmailService gmailService, string qu
         /// <param name="userId">User's email address. 'User Id' for request to authenticate. Default - 'me (authenticated user)'.</param>
         /// <param name="disposeGmailService">Boolean value to choose whether to dispose Gmail service instance used or not. Default - 'true'.</param>
         /// <returns>Boolean value to confirm if the email message labels for the criteria were modified or not.</returns>
-        /// <exception cref="ArgumentNullException">Throws 'ArgumentNullException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
+        /// <exception cref="ArgumentException">Throws 'ArgumentException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
         public static bool ModifyMessage(this GmailService gmailService, string query, List<string> labelsToAdd = null, List<string> labelsToRemove = null, string userId = "me", bool disposeGmailService = true)
         {
             if (labelsToAdd == null && labelsToRemove == null)
-                throw new ArgumentNullException("<labelsToAdd> / <labelsToRemove> required.");
+                throw new ArgumentException("Parameters 'labelsToAdd' / 'labelsToRemove' required.");
             var mods = new ModifyMessageRequest();
             if (labelsToAdd != null)
                 mods.AddLabelIds = labelsToAdd;
@@ -1195,7 +1195,7 @@ public static bool ModifyMessage(this GmailService gmailService, string query, L
 
         /// <summary>
         /// Modifies the labels on the messages for a specified query criteria.
-        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentNullException' if none supplied.
+        /// Requires - 'labelsToAdd' And/Or 'labelsToRemove' param value. Throws 'ArgumentException' if none supplied.
         /// </summary>
         /// <param name="gmailService">'Gmail' service initializer value.</param>
         /// <param name="query">'Query' criteria for the email to search.</param>
@@ -1204,11 +1204,11 @@ public static bool ModifyMessage(this GmailService gmailService, string query, L
         /// <param name="userId">User's email address. 'User Id' for request to authenticate. Default - 'me (authenticated user)'.</param>
         /// <param name="disposeGmailService">Boolean value to choose whether to dispose Gmail service instance used or not. Default - 'true'.</param>
         /// <returns>Count of email messages with labels modified.</returns>
-        /// <exception cref="ArgumentNullException">Throws 'ArgumentNullException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
+        /// <exception cref="ArgumentException">Throws 'ArgumentException' if none of 'labelsToAdd' and 'labelsToRemove' value is supplied</exception>
         public static int ModifyMessages(this GmailService gmailService, string query, List<string> labelsToAdd = null, List<string> labelsToRemove = null, string userId = "me", bool disposeGmailService = true)
         {
             if (labelsToAdd == null && labelsToRemove == null)
-                throw new ArgumentNullException("<labelsToAdd> / <labelsToRemove> required.");
+                throw new ArgumentException("Parameters 'labelsToAdd' / 'labelsToRemove' required.");
             var mods = new ModifyMessageRequest();
             if (labelsToAdd != null)
                 mods.AddLabelIds = labelsToAdd;

From 3030a24667eee03adf020c08fa26dd1dcc0c2532 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Mon, 29 Jul 2024 23:13:19 +1000
Subject: [PATCH 34/42] Remove TestClass annotation from TesBase

---
 GmailAPIHelper.CORE.Tests/TestBase.cs | 1 -
 GmailAPIHelper.NET.Tests/TestBase.cs  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/GmailAPIHelper.CORE.Tests/TestBase.cs b/GmailAPIHelper.CORE.Tests/TestBase.cs
index 9fe2cfb..6f18ef2 100644
--- a/GmailAPIHelper.CORE.Tests/TestBase.cs
+++ b/GmailAPIHelper.CORE.Tests/TestBase.cs
@@ -3,7 +3,6 @@
 
 namespace GmailAPIHelper.CORE.Tests
 {
-    [TestClass]
     public class TestBase
     {
         private TestContext _testContextInstance;
diff --git a/GmailAPIHelper.NET.Tests/TestBase.cs b/GmailAPIHelper.NET.Tests/TestBase.cs
index 5695fbc..4a2e8b8 100644
--- a/GmailAPIHelper.NET.Tests/TestBase.cs
+++ b/GmailAPIHelper.NET.Tests/TestBase.cs
@@ -3,7 +3,6 @@
 
 namespace GmailAPIHelper.NET.Tests
 {
-    [TestClass]
     public class TestBase
     {
         private TestContext _testContextInstance;

From bc14a60d1651cee11f5ddc939d1f92244b74b0e4 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Mon, 29 Jul 2024 23:51:44 +1000
Subject: [PATCH 35/42] Use constant instead of using literal 'UNREAD'

---
 GmailAPIHelper/GmailHelper.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 62cdfe7..9e61b1b 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -24,6 +24,7 @@ public static class GmailHelper
         private static List<string> _scopes;
         private static string _applicationName;
         private const string _tokenFile = "token.json";
+        private const string _labelUnread = "UNREAD";
 
         /// <summary>
         /// 'Token Path Type' enum.
@@ -198,7 +199,7 @@ public static Message GetMessage(this GmailService gmailService, string query, b
                     requiredLatestMessage = messageRequest.Execute();
                     if (markRead)
                     {
-                        var labelToRemove = new List<string> { "UNREAD" };
+                        var labelToRemove = new List<string> { _labelUnread };
                         service.RemoveLabels(requiredLatestMessage.Id, labelToRemove, userId: userId);
                     }
                 }
@@ -245,7 +246,7 @@ public static List<Message> GetMessages(this GmailService gmailService, string q
                 messages.Add(currentMessage);
                 if (markRead)
                 {
-                    var labelToRemove = new List<string> { "UNREAD" };
+                    var labelToRemove = new List<string> { _labelUnread };
                     service.RemoveLabels(message.Id, labelToRemove, userId: userId);
                 }
             }
@@ -313,7 +314,7 @@ public static string GetLatestMessage(this GmailService gmailService, string que
                         requiredMessage = Encoding.UTF8.GetString(data);
                         if (markRead)
                         {
-                            var labelToRemove = new List<string> { "UNREAD" };
+                            var labelToRemove = new List<string> { _labelUnread };
                             service.RemoveLabels(latestMessage.Id, labelToRemove, userId: userId);
                         }
                     }
@@ -968,7 +969,7 @@ public static bool MarkMessageAsRead(this GmailService gmailService, string quer
         {
             var mods = new ModifyMessageRequest
             {
-                RemoveLabelIds = new List<string> { "UNREAD" }
+                RemoveLabelIds = new List<string> { _labelUnread }
             };
             var service = gmailService;
             List<Message> result = new List<Message>();
@@ -1020,7 +1021,7 @@ public static int MarkMessagesAsRead(this GmailService gmailService, string quer
         {
             var mods = new ModifyMessageRequest
             {
-                RemoveLabelIds = new List<string> { "UNREAD" }
+                RemoveLabelIds = new List<string> { _labelUnread }
             };
             int counter = 0;
             var service = gmailService;
@@ -1057,7 +1058,7 @@ public static bool MarkMessageAsUnread(this GmailService gmailService, string qu
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "UNREAD" }
+                AddLabelIds = new List<string> { _labelUnread }
             };
             var service = gmailService;
             List<Message> result = new List<Message>();
@@ -1109,7 +1110,7 @@ public static int MarkMessagesAsUnread(this GmailService gmailService, string qu
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "UNREAD" }
+                AddLabelIds = new List<string> { _labelUnread }
             };
             int counter = 0;
             var service = gmailService;

From 89b221c0ffe5720bcd93c4d5a61aeedf072f5b36 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Tue, 30 Jul 2024 00:12:43 +1000
Subject: [PATCH 36/42] Use constant instead of using literal 'INBOX'

---
 GmailAPIHelper/GmailHelper.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 9e61b1b..aa7765f 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -25,6 +25,7 @@ public static class GmailHelper
         private static string _applicationName;
         private const string _tokenFile = "token.json";
         private const string _labelUnread = "UNREAD";
+        private const string _labelInbox = "INBOX";
 
         /// <summary>
         /// 'Token Path Type' enum.
@@ -727,7 +728,7 @@ public static bool UntrashMessage(this GmailService gmailService, string query,
                 {
                     var untrashMessageRequest = service.Users.Messages.Untrash(userId, latestMessage.Id);
                     untrashMessageRequest.Execute();
-                    var labelToAdd = new List<string> { "INBOX" };
+                    var labelToAdd = new List<string> { _labelInbox };
                     service.AddLabels(latestMessage.Id, labelToAdd, userId: userId);
                     isMoved = true;
                 }
@@ -766,7 +767,7 @@ public static int UntrashMessages(this GmailService gmailService, string query,
             {
                 var untrashMessageRequest = service.Users.Messages.Untrash(userId, message.Id);
                 untrashMessageRequest.Execute();
-                var labelToAdd = new List<string> { "INBOX" };
+                var labelToAdd = new List<string> { _labelInbox };
                 service.AddLabels(message.Id, labelToAdd, userId: userId);
                 counter++;
             }
@@ -788,7 +789,7 @@ public static bool ReportSpamMessage(this GmailService gmailService, string quer
             var mods = new ModifyMessageRequest
             {
                 AddLabelIds = new List<string> { "SPAM" },
-                RemoveLabelIds = new List<string> { "INBOX" }
+                RemoveLabelIds = new List<string> { _labelInbox }
             };
             var service = gmailService;
             List<Message> result = new List<Message>();
@@ -841,7 +842,7 @@ public static int ReportSpamMessages(this GmailService gmailService, string quer
             var mods = new ModifyMessageRequest
             {
                 AddLabelIds = new List<string> { "SPAM" },
-                RemoveLabelIds = new List<string> { "INBOX" }
+                RemoveLabelIds = new List<string> { _labelInbox }
             };
             int counter = 0;
             var service = gmailService;
@@ -878,7 +879,7 @@ public static bool UnspamMessage(this GmailService gmailService, string query, s
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "INBOX" },
+                AddLabelIds = new List<string> { _labelInbox },
                 RemoveLabelIds = new List<string> { "SPAM" }
             };
             var service = gmailService;
@@ -931,7 +932,7 @@ public static int UnspamMessages(this GmailService gmailService, string query, s
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "INBOX" },
+                AddLabelIds = new List<string> { _labelInbox },
                 RemoveLabelIds = new List<string> { "SPAM" }
             };
             int counter = 0;

From 3c72c983a5d5de4c45472039bbed67e8a2a032ff Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Tue, 30 Jul 2024 00:43:55 +1000
Subject: [PATCH 37/42] Use constant instead of using literal 'SPAM'

---
 GmailAPIHelper/GmailHelper.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index aa7765f..11daa55 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -26,6 +26,7 @@ public static class GmailHelper
         private const string _tokenFile = "token.json";
         private const string _labelUnread = "UNREAD";
         private const string _labelInbox = "INBOX";
+        private const string _labelSpam = "SPAM"
 
         /// <summary>
         /// 'Token Path Type' enum.
@@ -788,7 +789,7 @@ public static bool ReportSpamMessage(this GmailService gmailService, string quer
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "SPAM" },
+                AddLabelIds = new List<string> { _labelSpam },
                 RemoveLabelIds = new List<string> { _labelInbox }
             };
             var service = gmailService;
@@ -841,7 +842,7 @@ public static int ReportSpamMessages(this GmailService gmailService, string quer
         {
             var mods = new ModifyMessageRequest
             {
-                AddLabelIds = new List<string> { "SPAM" },
+                AddLabelIds = new List<string> { _labelSpam },
                 RemoveLabelIds = new List<string> { _labelInbox }
             };
             int counter = 0;
@@ -880,7 +881,7 @@ public static bool UnspamMessage(this GmailService gmailService, string query, s
             var mods = new ModifyMessageRequest
             {
                 AddLabelIds = new List<string> { _labelInbox },
-                RemoveLabelIds = new List<string> { "SPAM" }
+                RemoveLabelIds = new List<string> { _labelSpam }
             };
             var service = gmailService;
             List<Message> result = new List<Message>();
@@ -933,7 +934,7 @@ public static int UnspamMessages(this GmailService gmailService, string query, s
             var mods = new ModifyMessageRequest
             {
                 AddLabelIds = new List<string> { _labelInbox },
-                RemoveLabelIds = new List<string> { "SPAM" }
+                RemoveLabelIds = new List<string> { _labelSpam }
             };
             int counter = 0;
             var service = gmailService;

From 61e1ecf49ffb8e020c551a999e925fdb2f9a89a8 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Tue, 30 Jul 2024 00:55:39 +1000
Subject: [PATCH 38/42] Use constant instead of using literal 'SPAM'

---
 GmailAPIHelper/GmailHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index 11daa55..b2dda87 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -26,7 +26,7 @@ public static class GmailHelper
         private const string _tokenFile = "token.json";
         private const string _labelUnread = "UNREAD";
         private const string _labelInbox = "INBOX";
-        private const string _labelSpam = "SPAM"
+        private const string _labelSpam = "SPAM";
 
         /// <summary>
         /// 'Token Path Type' enum.

From 12d915705bab06183a297e2cb56d28e03f759e79 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Tue, 30 Jul 2024 23:46:00 +1000
Subject: [PATCH 39/42] Remove member variables '_scope' & '_applicationName'
 and declare it as a local variable in the relevant methods

---
 GmailAPIHelper/GmailHelper.cs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/GmailAPIHelper/GmailHelper.cs b/GmailAPIHelper/GmailHelper.cs
index b2dda87..85cbec6 100644
--- a/GmailAPIHelper/GmailHelper.cs
+++ b/GmailAPIHelper/GmailHelper.cs
@@ -21,8 +21,6 @@ namespace GmailAPIHelper
     /// </summary>
     public static class GmailHelper
     {
-        private static List<string> _scopes;
-        private static string _applicationName;
         private const string _tokenFile = "token.json";
         private const string _labelUnread = "UNREAD";
         private const string _labelInbox = "INBOX";
@@ -124,13 +122,14 @@ private static string SetCredentialPath(TokenPathType tokenPathType, string toke
         /// <returns>Gmail Service.</returns>
         public static GmailService GetGmailService(string applicationName, TokenPathType tokenPathType = TokenPathType.WORKING_DIRECTORY, string tokenPath = "")
         {
-            _scopes = new List<string>();
-            _applicationName = applicationName;
-            _scopes.Add(GmailService.Scope.GmailMetadata);
-            _scopes.Add(GmailService.Scope.GmailReadonly);
-            _scopes.Add(GmailService.Scope.GmailModify);
-            _scopes.Add(GmailService.Scope.GmailLabels);
-            _scopes.Add(GmailService.Scope.GmailSend);
+            var scopes = new List<string>
+            {
+                GmailService.Scope.GmailMetadata,
+                GmailService.Scope.GmailReadonly,
+                GmailService.Scope.GmailModify,
+                GmailService.Scope.GmailLabels,
+                GmailService.Scope.GmailSend
+            };
             UserCredential credential;
             using (var stream = new FileStream("credentials.json", FileMode.Open, FileAccess.Read))
             {
@@ -138,7 +137,7 @@ public static GmailService GetGmailService(string applicationName, TokenPathType
                 string credPath = SetCredentialPath(tokenPathType, tokenPath);
                 credential = GoogleWebAuthorizationBroker.AuthorizeAsync(
                     GoogleClientSecrets.FromStream(stream).Secrets,
-                    _scopes,
+                    scopes,
                     "user",
                     CancellationToken.None,
                     new FileDataStore(credPath, true)).Result;
@@ -147,7 +146,7 @@ public static GmailService GetGmailService(string applicationName, TokenPathType
             var service = new GmailService(new BaseClientService.Initializer()
             {
                 HttpClientInitializer = credential,
-                ApplicationName = _applicationName
+                ApplicationName = applicationName
             });
             return service;
         }

From 68f455462d10918e4d41d2d1abb19e07d277c0e7 Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 2 Aug 2024 22:36:53 +1000
Subject: [PATCH 40/42] Readme update

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index db3fcc3..946f37f 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,14 @@
 *Gmail API helper solution in .NET*. </br></br>
 ![Gmail-API-Helper (Build)](https://github.com/abhinavminhas/Gmail-API-Helper/actions/workflows/build.yml/badge.svg)
 [![codecov](https://codecov.io/gh/abhinavminhas/Gmail-API-Helper/branch/main/graph/badge.svg?token=18ZV2GGET8)](https://codecov.io/gh/abhinavminhas/Gmail-API-Helper)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=abhinavminhas_Gmail-API-Helper&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=abhinavminhas_Gmail-API-Helper)
 ![maintainer](https://img.shields.io/badge/Creator/Maintainer-abhinavminhas-e65c00)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-[![NuGet](https://img.shields.io/nuget/v/GmailHelper?color=%23004880&label=Nuget)](https://www.nuget.org/packages/GmailHelper/)
+[![NuGet](https://img.shields.io/nuget/v/GmailHelper?color=%23004880&label=Nuget)](https://www.nuget.org/packages/GmailHelper/)  
+
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=abhinavminhas_Gmail-API-Helper&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=abhinavminhas_Gmail-API-Helper)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=abhinavminhas_Gmail-API-Helper&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=abhinavminhas_Gmail-API-Helper)
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=abhinavminhas_Gmail-API-Helper&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=abhinavminhas_Gmail-API-Helper)
 
 The [Gmail API](https://developers.google.com/gmail/api) is used to interact with users' Gmail inboxes and settings, supports several popular programming languages. This solution is the implementation of the same providing certain useful extension methods in .NET to retrieve/send/manipulate email messages and manage labels. The solution uses 'Gmail Search Query' to retrieve/manipulate required email messages.
 

From 396f029f748a69bca35d3c60513439d3ddf7bfdf Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Fri, 2 Aug 2024 22:40:51 +1000
Subject: [PATCH 41/42] Nuget package creation - v1.10.0

---
 .github/workflows/publish-nuget-Package.yml |  2 +-
 CHANGELOG.md                                | 34 +++++++++++++++++++++
 GmailAPIHelper/GmailAPIHelper.csproj        | 10 ++++--
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-nuget-Package.yml b/.github/workflows/publish-nuget-Package.yml
index 47ac7f1..9434dac 100644
--- a/.github/workflows/publish-nuget-Package.yml
+++ b/.github/workflows/publish-nuget-Package.yml
@@ -1,7 +1,7 @@
 name: Publish Nuget Package
 
 env:
-    NUGET_PACKAGE_NAME_VERSION: "GmailHelper.1.9.31.nupkg"
+    NUGET_PACKAGE_NAME_VERSION: "GmailHelper.1.10.0.nupkg"
 
 on:
   workflow_dispatch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9369078..19a270f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,40 @@ All notable changes to this project documented here.
 
 ## [Released]
 
+## [1.10.0](https://www.nuget.org/packages/GmailHelper/1.10.0) - 2024-08-04
+### Changed
+* Security Updates
+    * Remove security protocol usage completely _(Due to deprecated versions in .Net Standard 2.0, should rely on .NET version's security protocol using this package)_.
+    * Email regex match - Introduce timeout to limit the execution time (DDoS protection).
+* Code Quality Updates
+    * Remove null execution path (below impacted)
+        * GetMessage
+        * GetLatestMessage
+        * GetMessageAttachments
+        * MoveMessageToTrash
+        * UntrashMessage
+        * ReportSpamMessage
+        * UnspamMessage
+        * MarkMessageAsRead
+        * MarkMessageAsUnread
+        * ModifyMessage
+        * GetMessageLabels
+    *   Merge if statement with the enclosing if statement (below impacted) 
+        * GetMessageAttachments
+        * GetMessagesAttachments
+    *   Remove useless assignment to local variable 'requiredMessagePart' (below impacted) 
+        * GetLatestMessage
+    *   Throw 'ArgumentException' instead of 'NullReferenceException' (below impacted) 
+        * ModifyMessage
+        * ModifyMessages
+    * Define a constant instead of using the literal multiple times for 
+        * 'token.json'
+        * 'INBOX'
+        * 'SPAM'
+    * Remove member variables and declare it as a local variable in the relevant methods 
+        * _scope
+        * _applicationName
+
 ## [1.9.31](https://www.nuget.org/packages/GmailHelper/1.9.31) - 2024-07-23
 ### Changed
 - MimeKitLite dependency update from ('4.7.0' -> '4.7.1').
diff --git a/GmailAPIHelper/GmailAPIHelper.csproj b/GmailAPIHelper/GmailAPIHelper.csproj
index 371901f..d801425 100644
--- a/GmailAPIHelper/GmailAPIHelper.csproj
+++ b/GmailAPIHelper/GmailAPIHelper.csproj
@@ -30,8 +30,14 @@ Solution Version:
     <PackageId>GmailHelper</PackageId>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageReleaseNotes>1. MimeKitLite dependency update from ('4.7.0' -&gt; '4.7.1').</PackageReleaseNotes>
-    <Version>1.9.31</Version>
+    <PackageReleaseNotes>Security Updates:
+1. Remove security protocol usage completely (Due to deprecated versions in .Net Standard 2.0, should rely on .NET version's security protocol using this package).
+2. Email regex match - Introduce timeout to limit the execution time (DDoS protection).
+
+Code Quality Updates:
+1. Throw 'ArgumentException' instead of 'NullReferenceException' (ModifyMessage/ModifyMessages).
+</PackageReleaseNotes>
+    <Version>1.10.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

From 5c4775b2a3b93eb976c6a931a69a20fb9fe70e8c Mon Sep 17 00:00:00 2001
From: abhinavminhas <abhinavminhas@users.noreply.github.com>
Date: Sat, 3 Aug 2024 16:35:29 +1000
Subject: [PATCH 42/42] Test addition

---
 GmailAPIHelper.CORE.Tests/GmailTests.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/GmailAPIHelper.CORE.Tests/GmailTests.cs b/GmailAPIHelper.CORE.Tests/GmailTests.cs
index dff1b25..a1e22d3 100644
--- a/GmailAPIHelper.CORE.Tests/GmailTests.cs
+++ b/GmailAPIHelper.CORE.Tests/GmailTests.cs
@@ -81,6 +81,14 @@ public void Test_GetGmailService_TokenPath_Home()
             Directory.Delete(destPath, recursive: true);
         }
 
+        [TestMethod]
+        [TestCategory("GMAIL-TESTS-DOTNETCORE")]
+        public void Test_GetGmailService_TokenPath_WorkingDirectory()
+        {
+            var service = GmailHelper.GetGmailService(ApplicationName, GmailHelper.TokenPathType.WORKING_DIRECTORY);
+            Assert.IsTrue(service.GetType() == typeof(Google.Apis.Gmail.v1.GmailService));
+        }
+
         [TestMethod]
         [TestCategory("GMAIL-TESTS-DOTNETCORE")]
         public void Test_GetGmailService_TokenPath_Custom()