Fix client name and tags handling

eXpl0it3r · eXpl0it3r · commit ba612be7ca7c · 2026-01-27T11:18:50.000+01:00
diff --git a/Clockify.csproj b/Clockify.csproj
@@ -37,6 +37,7 @@
   <ItemGroup>
     <PackageReference Include="ClockifyClient" Version="1.2.2" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="FastCloner" Version="3.4.4" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Clockify/ClockifyService.cs b/Clockify/ClockifyService.cs
@@ -85,12 +85,15 @@ public async Task<TimeEntryWithRatesDtoV1> GetRunningTimerAsync()
                 logger.LogError($"Fetching running timer failed, no project in workspace matching {_settings.ProjectName}");
                 return null;
             }
+            
+            var entry = timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id);
+            logger.LogInfo($"{string.Join(',', entry?.TagIds?.ToString())}");
 
             return timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id
                                                     && (string.IsNullOrEmpty(_settings.TimerName) || t.Description == _settings.TimerName)
                                                     && (string.IsNullOrEmpty(_settings.TaskName) || string.IsNullOrEmpty(_task?.Id) || t.TaskId == _task.Id)
-                                                    && ((t.TagIds is null && _tags is null) || t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)
-                                                        .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture)))
+                                                    && ((t.TagIds is null && _tags is null) || (t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)
+                                                        .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture))))
                                                     && t.Billable == _settings.Billable);
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
@@ -108,6 +111,9 @@ public async Task UpdateSettingsAsync(PluginSettings settings)
         
         var cacheInvalidationRequired = SettingsValidator.HasChanged(_settings, settings);
         
+        logger.LogInfo($"{settings.ApiKey}/{settings.WorkspaceName}/{settings.TaskName}/{settings.Billable}/{settings.ProjectName}/{settings.ClientName}/{settings.Tags}");
+        logger.LogInfo($"{_settings.ApiKey}/{_settings.WorkspaceName}/{_settings.TaskName}/{_settings.Billable}/{_settings.ProjectName}/{_settings.ClientName}/{_settings.Tags}");
+        
         // Do we need to recreate the client?
         if (!IsValid || _settings.ApiKey != settings.ApiKey || _settings.ServerUrl != settings.ServerUrl)
         {
@@ -135,7 +141,7 @@ public async Task UpdateSettingsAsync(PluginSettings settings)
             cacheInvalidationRequired = true;
         }
 
-        _settings = settings;
+        _settings = FastCloner.FastCloner.DeepClone(settings);
         
         if (cacheInvalidationRequired)
         {
@@ -176,6 +182,12 @@ private async Task<CreateTimeEntryRequest> CreateTimeEntryRequestAsync()
 
     private async Task ReloadCacheAsync()
     {
+        if (_clockifyClient is null)
+        {
+            logger.LogWarn("The Clockify client was not initialized properly");
+            return;
+        }
+        
         _workspace = null;
         _project = null;
         _tags = [];
@@ -185,17 +197,25 @@ private async Task ReloadCacheAsync()
         try
         {
             var workspaces = await _clockifyClient.V1.Workspaces.GetAsync();
-            _workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);
+            var workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);
 
-            if (_workspace != null)
+            if (workspace is not null)
             {
-                _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName);
+                _workspace = FastCloner.FastCloner.DeepClone(workspace);
+                
+                _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);
+                var task = FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName, _client?.Id);
+                if (task == null)
+                {
+                    throw new Exception("Returned Task was null");
+                }
+
+                _project = await task;
                 _tags = await FindMatchingTagsAsync(_workspace.Id, _settings.Tags);
 
-                if (_project != null)
+                if (_project is not null)
                 {
                     _task = await FindMatchingTaskAsync(_workspace.Id, _project.Id, _settings.TaskName);
-                    _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);
                 }
             }
             
@@ -216,7 +236,7 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()
         }
 
         var runningTimer = await GetRunningTimerAsync();
-        if (runningTimer == null)
+        if (runningTimer is null)
         {
             // No running timer
             return null;
@@ -246,13 +266,15 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()
         return runningTimer;
     }
 
-    private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName)
+    private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName, string clientId = null)
     {
-        if (string.IsNullOrEmpty(projectName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectName))
         {
             return null;
         }
         
+        logger.LogInfo($"Finding matching project... {_clockifyClient}");
+        
         try
         {
             var projects = await _clockifyClient.V1.Workspaces[workspaceId].Projects
@@ -262,9 +284,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st
                     q.QueryParameters.StrictNameSearch = true;
                     q.QueryParameters.PageSize = MaxPageSize;
 
-                    if (_client is not null)
+                    if (clientId is not null)
                     {
-                        q.QueryParameters.Clients = [_client.Id];
+                        q.QueryParameters.Clients = [clientId];
                     }
                 });
 
@@ -281,9 +303,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st
             }
             
             logger.LogInfo("Finding matching project successful");
-            return projects.Single();
+            return FastCloner.FastCloner.DeepClone(projects.Single());
         }
-        catch (Exception exception) when (exception is ApiException or HttpRequestException)
+        catch (Exception exception) when (exception is ApiException or HttpRequestException or NullReferenceException)
         {
             logger.LogWarn($"Finding matching project failed, unable to retrieve project {projectName}: {exception.Message}");
             return null;
@@ -292,7 +314,7 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st
 
     private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string workspaceId, string clientName)
     {
-        if (string.IsNullOrEmpty(clientName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(clientName))
         {
             return null;
         }
@@ -306,7 +328,8 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works
                     q.QueryParameters.PageSize = MaxPageSize;
                 });
             
-            return clientResponse?.FirstOrDefault();
+            var client = clientResponse?.FirstOrDefault();
+            return client != null ? FastCloner.FastCloner.DeepClone(client) : null;
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
         {
@@ -317,7 +340,7 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works
 
     private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string projectId, string taskName)
     {
-        if (string.IsNullOrEmpty(taskName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectId) || string.IsNullOrEmpty(taskName))
         {
             return null;
         }
@@ -332,7 +355,8 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p
                     q.QueryParameters.PageSize = MaxPageSize;
                 });
 
-            return taskResponse?.FirstOrDefault();
+            var task = taskResponse?.FirstOrDefault();
+            return FastCloner.FastCloner.DeepClone(task);
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
         {
@@ -343,7 +367,7 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p
 
     private async Task<string> FindOrCreateTaskAsync(string workspaceId, string projectId, string taskName)
     {
-        if (string.IsNullOrEmpty(taskName))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(projectId) || string.IsNullOrEmpty(taskName))
         {
             return null;
         }
@@ -374,7 +398,7 @@ private async Task<string> FindOrCreateTaskAsync(string workspaceId, string proj
 
     private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, string tags)
     {
-        if (string.IsNullOrEmpty(tags))
+        if (string.IsNullOrEmpty(workspaceId) || string.IsNullOrEmpty(tags))
         {
             return [];
         }
@@ -395,7 +419,7 @@ private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, strin
             var tagsOnWorkspace = await _clockifyClient.V1.Workspaces[workspaceId].Tags
                 .GetAsync(q => q.QueryParameters.PageSize = MaxPageSize);
 
-            return tagsOnWorkspace == null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();
+            return tagsOnWorkspace is null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();
         }
         catch (Exception exception) when (exception is ApiException or HttpRequestException)
         {

Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,15 @@ public async Task<TimeEntryWithRatesDtoV1> GetRunningTimerAsync()`
`85`	`85`	`logger.LogError($"Fetching running timer failed, no project in workspace matching {_settings.ProjectName}");`
`86`	`86`	`return null;`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ var entry = timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id);`
	`90`	`+ logger.LogInfo($"{string.Join(',', entry?.TagIds?.ToString())}");`
`88`	`91`
`89`	`92`	`return timeEntries?.FirstOrDefault(t => t.ProjectId == _project.Id`
`90`	`93`	`&& (string.IsNullOrEmpty(_settings.TimerName) \|\| t.Description == _settings.TimerName)`
`91`	`94`	`&& (string.IsNullOrEmpty(_settings.TaskName) \|\| string.IsNullOrEmpty(_task?.Id) \|\| t.TaskId == _task.Id)`
`92`		`- && ((t.TagIds is null && _tags is null) \|\| t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)`
`93`		`- .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture)))`
	`95`	`+ && ((t.TagIds is null && _tags is null) \|\| (t.TagIds is not null && _tags is not null && t.TagIds.OrderBy(s => s, StringComparer.InvariantCulture)`
	`96`	`+ .SequenceEqual(_tags.OrderBy(s => s, StringComparer.InvariantCulture))))`
`94`	`97`	`&& t.Billable == _settings.Billable);`
`95`	`98`	`}`
`96`	`99`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`@@ -108,6 +111,9 @@ public async Task UpdateSettingsAsync(PluginSettings settings)`
`108`	`111`
`109`	`112`	`var cacheInvalidationRequired = SettingsValidator.HasChanged(_settings, settings);`
`110`	`113`
	`114`	`+ logger.LogInfo($"{settings.ApiKey}/{settings.WorkspaceName}/{settings.TaskName}/{settings.Billable}/{settings.ProjectName}/{settings.ClientName}/{settings.Tags}");`
	`115`	`+ logger.LogInfo($"{_settings.ApiKey}/{_settings.WorkspaceName}/{_settings.TaskName}/{_settings.Billable}/{_settings.ProjectName}/{_settings.ClientName}/{_settings.Tags}");`
	`116`	`+`
`111`	`117`	`// Do we need to recreate the client?`
`112`	`118`	`if (!IsValid \|\| _settings.ApiKey != settings.ApiKey \|\| _settings.ServerUrl != settings.ServerUrl)`
`113`	`119`	`{`
`@@ -135,7 +141,7 @@ public async Task UpdateSettingsAsync(PluginSettings settings)`
`135`	`141`	`cacheInvalidationRequired = true;`
`136`	`142`	`}`
`137`	`143`
`138`		`- _settings = settings;`
	`144`	`+ _settings = FastCloner.FastCloner.DeepClone(settings);`
`139`	`145`
`140`	`146`	`if (cacheInvalidationRequired)`
`141`	`147`	`{`
`@@ -176,6 +182,12 @@ private async Task<CreateTimeEntryRequest> CreateTimeEntryRequestAsync()`
`176`	`182`
`177`	`183`	`private async Task ReloadCacheAsync()`
`178`	`184`	`{`
	`185`	`+ if (_clockifyClient is null)`
	`186`	`+ {`
	`187`	`+ logger.LogWarn("The Clockify client was not initialized properly");`
	`188`	`+ return;`
	`189`	`+ }`
	`190`	`+`
`179`	`191`	`_workspace = null;`
`180`	`192`	`_project = null;`
`181`	`193`	`_tags = [];`
`@@ -185,17 +197,25 @@ private async Task ReloadCacheAsync()`
`185`	`197`	`try`
`186`	`198`	`{`
`187`	`199`	`var workspaces = await _clockifyClient.V1.Workspaces.GetAsync();`
`188`		`- _workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);`
	`200`	`+ var workspace = workspaces?.SingleOrDefault(w => w.Name == _settings.WorkspaceName);`
`189`	`201`
`190`		`- if (_workspace != null)`
	`202`	`+ if (workspace is not null)`
`191`	`203`	`{`
`192`		`- _project = await FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName);`
	`204`	`+ _workspace = FastCloner.FastCloner.DeepClone(workspace);`
	`205`	`+`
	`206`	`+ _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);`
	`207`	`+ var task = FindMatchingProjectAsync(_workspace.Id, _settings.ProjectName, _client?.Id);`
	`208`	`+ if (task == null)`
	`209`	`+ {`
	`210`	`+ throw new Exception("Returned Task was null");`
	`211`	`+ }`
	`212`	`+`
	`213`	`+ _project = await task;`
`193`	`214`	`_tags = await FindMatchingTagsAsync(_workspace.Id, _settings.Tags);`
`194`	`215`
`195`		`- if (_project != null)`
	`216`	`+ if (_project is not null)`
`196`	`217`	`{`
`197`	`218`	`_task = await FindMatchingTaskAsync(_workspace.Id, _project.Id, _settings.TaskName);`
`198`		`- _client = await FindMatchingClientAsync(_workspace.Id, _settings.ClientName);`
`199`	`219`	`}`
`200`	`220`	`}`
`201`	`221`
`@@ -216,7 +236,7 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()`
`216`	`236`	`}`
`217`	`237`
`218`	`238`	`var runningTimer = await GetRunningTimerAsync();`
`219`		`- if (runningTimer == null)`
	`239`	`+ if (runningTimer is null)`
`220`	`240`	`{`
`221`	`241`	`// No running timer`
`222`	`242`	`return null;`
`@@ -246,13 +266,15 @@ private async Task<TimeEntryWithRatesDtoV1> StopRunningTimerAsync()`
`246`	`266`	`return runningTimer;`
`247`	`267`	`}`
`248`	`268`
`249`		`- private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName)`
	`269`	`+ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, string projectName, string clientId = null)`
`250`	`270`	`{`
`251`		`- if (string.IsNullOrEmpty(projectName))`
	`271`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectName))`
`252`	`272`	`{`
`253`	`273`	`return null;`
`254`	`274`	`}`
`255`	`275`
	`276`	`+ logger.LogInfo($"Finding matching project... {_clockifyClient}");`
	`277`	`+`
`256`	`278`	`try`
`257`	`279`	`{`
`258`	`280`	`var projects = await _clockifyClient.V1.Workspaces[workspaceId].Projects`
`@@ -262,9 +284,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st`
`262`	`284`	`q.QueryParameters.StrictNameSearch = true;`
`263`	`285`	`q.QueryParameters.PageSize = MaxPageSize;`
`264`	`286`
`265`		`- if (_client is not null)`
	`287`	`+ if (clientId is not null)`
`266`	`288`	`{`
`267`		`- q.QueryParameters.Clients = [_client.Id];`
	`289`	`+ q.QueryParameters.Clients = [clientId];`
`268`	`290`	`}`
`269`	`291`	`});`
`270`	`292`
`@@ -281,9 +303,9 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st`
`281`	`303`	`}`
`282`	`304`
`283`	`305`	`logger.LogInfo("Finding matching project successful");`
`284`		`- return projects.Single();`
	`306`	`+ return FastCloner.FastCloner.DeepClone(projects.Single());`
`285`	`307`	`}`
`286`		`- catch (Exception exception) when (exception is ApiException or HttpRequestException)`
	`308`	`+ catch (Exception exception) when (exception is ApiException or HttpRequestException or NullReferenceException)`
`287`	`309`	`{`
`288`	`310`	`logger.LogWarn($"Finding matching project failed, unable to retrieve project {projectName}: {exception.Message}");`
`289`	`311`	`return null;`
`@@ -292,7 +314,7 @@ private async Task<ProjectDtoV1> FindMatchingProjectAsync(string workspaceId, st`
`292`	`314`
`293`	`315`	`private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string workspaceId, string clientName)`
`294`	`316`	`{`
`295`		`- if (string.IsNullOrEmpty(clientName))`
	`317`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(clientName))`
`296`	`318`	`{`
`297`	`319`	`return null;`
`298`	`320`	`}`
`@@ -306,7 +328,8 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works`
`306`	`328`	`q.QueryParameters.PageSize = MaxPageSize;`
`307`	`329`	`});`
`308`	`330`
`309`		`- return clientResponse?.FirstOrDefault();`
	`331`	`+ var client = clientResponse?.FirstOrDefault();`
	`332`	`+ return client != null ? FastCloner.FastCloner.DeepClone(client) : null;`
`310`	`333`	`}`
`311`	`334`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`312`	`335`	`{`
`@@ -317,7 +340,7 @@ private async Task<ClientWithCurrencyDtoV1> FindMatchingClientAsync(string works`
`317`	`340`
`318`	`341`	`private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string projectId, string taskName)`
`319`	`342`	`{`
`320`		`- if (string.IsNullOrEmpty(taskName))`
	`343`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectId) \|\| string.IsNullOrEmpty(taskName))`
`321`	`344`	`{`
`322`	`345`	`return null;`
`323`	`346`	`}`
`@@ -332,7 +355,8 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p`
`332`	`355`	`q.QueryParameters.PageSize = MaxPageSize;`
`333`	`356`	`});`
`334`	`357`
`335`		`- return taskResponse?.FirstOrDefault();`
	`358`	`+ var task = taskResponse?.FirstOrDefault();`
	`359`	`+ return FastCloner.FastCloner.DeepClone(task);`
`336`	`360`	`}`
`337`	`361`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`338`	`362`	`{`
`@@ -343,7 +367,7 @@ private async Task<TaskDtoV1> FindMatchingTaskAsync(string workspaceId, string p`
`343`	`367`
`344`	`368`	`private async Task<string> FindOrCreateTaskAsync(string workspaceId, string projectId, string taskName)`
`345`	`369`	`{`
`346`		`- if (string.IsNullOrEmpty(taskName))`
	`370`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(projectId) \|\| string.IsNullOrEmpty(taskName))`
`347`	`371`	`{`
`348`	`372`	`return null;`
`349`	`373`	`}`
`@@ -374,7 +398,7 @@ private async Task<string> FindOrCreateTaskAsync(string workspaceId, string proj`
`374`	`398`
`375`	`399`	`private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, string tags)`
`376`	`400`	`{`
`377`		`- if (string.IsNullOrEmpty(tags))`
	`401`	`+ if (string.IsNullOrEmpty(workspaceId) \|\| string.IsNullOrEmpty(tags))`
`378`	`402`	`{`
`379`	`403`	`return [];`
`380`	`404`	`}`
`@@ -395,7 +419,7 @@ private async Task<List<string>> FindMatchingTagsAsync(string workspaceId, strin`
`395`	`419`	`var tagsOnWorkspace = await _clockifyClient.V1.Workspaces[workspaceId].Tags`
`396`	`420`	`.GetAsync(q => q.QueryParameters.PageSize = MaxPageSize);`
`397`	`421`
`398`		`- return tagsOnWorkspace == null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();`
	`422`	`+ return tagsOnWorkspace is null ? [] : tagsOnWorkspace.Where(t => tagList.Contains(t.Name)).Select(t => t.Id).ToList();`
`399`	`423`	`}`
`400`	`424`	`catch (Exception exception) when (exception is ApiException or HttpRequestException)`
`401`	`425`	`{`