Merge pull request #10 from bb-io/develop

Develop
bb-io · Jun 18, 2024 · caabd86 · caabd86
2 parents 730f37d + 650c013
commit caabd86
Show file tree

Hide file tree

Showing 32 changed files with 43 additions and 42 deletions.
diff --git a/Apps.Crowdin/Actions/FileActions.cs b/Apps.Crowdin/Actions/FileActions.cs
@@ -80,11 +80,11 @@ public async Task<FileEntity> AddFile(
             ExcludedTargetLanguages = input.ExcludedTargetLanguages?.ToList(),
             AttachLabelIds = input.AttachLabelIds?.ToList()
         };
+
         var file = await client.SourceFiles.AddFile(intProjectId!.Value, request);
-
         return new(file);
     }
-
+    
     [Action("Update file", Description = "Update an existing file with new content")]
     public async Task<FileEntity> UpdateFile(
         [ActionParameter] ProjectRequest project,

diff --git a/Apps.Crowdin/Actions/ProjectActions.cs b/Apps.Crowdin/Actions/ProjectActions.cs
@@ -31,10 +31,9 @@ public async Task<ListProjectsResponse> ListProjects([ActionParameter] ListProje
         var client = new CrowdinClient(Creds);
 
         var items = await Paginator.Paginate((lim, offset)
-            => client.ProjectsGroups.ListProjects<ProjectBase>(userId, groupId, input.HasManagerAccess ?? false, lim, offset));
-
+            => client.ProjectsGroups.ListProjects<ProjectBase>(userId, groupId, input.HasManagerAccess ?? false, null, lim, offset));
+        
         var projects = items.Select(x => new ProjectEntity(x)).ToArray();
-
         return new(projects);
     }
 

diff --git a/Apps.Crowdin/Api/CrowdinClient.cs b/Apps.Crowdin/Api/CrowdinClient.cs
@@ -6,9 +6,12 @@ namespace Apps.Crowdin.Api;
 
 public class CrowdinClient : CrowdinApiClient
 {
-    public CrowdinClient(IEnumerable<AuthenticationCredentialsProvider> creds) 
+    private readonly AuthenticationCredentialsProvider[] _creds;
+
+    public CrowdinClient(IEnumerable<AuthenticationCredentialsProvider> creds)
         : base(GetCrowdinCreds(creds))
     {
+        this._creds = creds.ToArray();
     }
 
     private static CrowdinCredentials GetCrowdinCreds(

diff --git a/Apps.Crowdin/Apps.Crowdin.csproj b/Apps.Crowdin/Apps.Crowdin.csproj
@@ -5,14 +5,14 @@
     <Nullable>enable</Nullable>
     <Product>Crowdin</Product>
     <Description>Cloud-based solution that streamlines localization management</Description>
-    <Version>1.0.5</Version>
+    <Version>1.0.7</Version>
     <AssemblyName>Apps.Crowdin</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Blackbird.Applications.Sdk.Common" Version="2.6.0" />
+    <PackageReference Include="Blackbird.Applications.Sdk.Common" Version="2.8.0" />
     <PackageReference Include="Blackbird.Applications.SDK.Extensions.FileManagement" Version="1.0.1" />
     <PackageReference Include="Blackbird.Applications.Sdk.Utils" Version="1.0.25" />
-    <PackageReference Include="Crowdin.Api" Version="2.22.1" />
+    <PackageReference Include="Crowdin.Api" Version="2.23.1" />
     <PackageReference Include="MimeTypes" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Apps.Crowdin/DataSourceHandlers/ProjectDataHandler.cs b/Apps.Crowdin/DataSourceHandlers/ProjectDataHandler.cs
@@ -8,23 +8,19 @@
 
 namespace Apps.Crowdin.DataSourceHandlers;
 
-public class ProjectDataHandler : BaseInvocable, IAsyncDataSourceHandler
+public class ProjectDataHandler(InvocationContext invocationContext)
+    : BaseInvocable(invocationContext), IAsyncDataSourceHandler
 {
     private AuthenticationCredentialsProvider[] Creds =>
         InvocationContext.AuthenticationCredentialsProviders.ToArray();
 
-    public ProjectDataHandler(InvocationContext invocationContext) : base(invocationContext)
-    {
-    }
-
     public async Task<Dictionary<string, string>> GetDataAsync(DataSourceContext context,
         CancellationToken cancellationToken)
     {
         var client = new CrowdinClient(Creds);
 
         var items = await Paginator.Paginate((lim, offset)
-            => client.ProjectsGroups.ListProjects<ProjectBase>(null, null, false, lim, offset));
-
+            => client.ProjectsGroups.ListProjects<ProjectBase>(null, null, false, null, lim, offset));
         return items
             .Where(x => context.SearchString == null ||
                         x.Name.Contains(context.SearchString, StringComparison.OrdinalIgnoreCase))

diff --git a/Apps.Crowdin/Models/Request/File/AddNewFileRequest.cs b/Apps.Crowdin/Models/Request/File/AddNewFileRequest.cs
@@ -1,4 +1,6 @@
-using Blackbird.Applications.Sdk.Common;
+using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
+using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Files;
 
 namespace Apps.Crowdin.Models.Request.File;

diff --git a/Apps.Crowdin/Webhooks/Handlers/Base/ProjectWebhookHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Base/ProjectWebhookHandler.cs
@@ -11,6 +11,7 @@
 using Crowdin.Api.Webhooks;
 using Newtonsoft.Json;
 using RestSharp;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Base;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileAddedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileAddedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileApprovedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileApprovedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileDeletedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileDeletedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileRevertedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileRevertedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileTranslatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileTranslatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/File/FileUpdatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/File/FileUpdatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.File;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectApprovedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectApprovedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Project;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectBuiltHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectBuiltHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Project;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectTranslatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Project/ProjectTranslatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Project;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/String/StringAddedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/String/StringAddedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.String;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/String/StringDeletedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/String/StringDeletedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.String;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/String/StringUpdatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/String/StringUpdatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.String;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentCreatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentCreatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.StringComment;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentDeletedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentDeletedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.StringComment;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentRestoredHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentRestoredHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.StringComment;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentUpdatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/StringComment/StringCommentUpdatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.StringComment;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionAddedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionAddedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Suggestion;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionApprovedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionApprovedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Suggestion;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionDeletedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionDeletedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Suggestion;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionDisapprovedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionDisapprovedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Suggestion;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionUpdatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Suggestion/SuggestionUpdatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Suggestion;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskAddedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskAddedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Task;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskDeletedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskDeletedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Task;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskStatusChangedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Task/TaskStatusChangedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Task;
 

diff --git a/Apps.Crowdin/Webhooks/Handlers/Project/Translation/TranslationUpdatedHandler.cs b/Apps.Crowdin/Webhooks/Handlers/Project/Translation/TranslationUpdatedHandler.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.Webhooks.Handlers.Base;
 using Apps.Crowdin.Webhooks.Models.Inputs;
 using Blackbird.Applications.Sdk.Common.Webhooks;
-using Crowdin.Api.Webhooks;
+using EventType = Crowdin.Api.Webhooks.EventType;
 
 namespace Apps.Crowdin.Webhooks.Handlers.Project.Translation;