fix: creds as args via cmd (#885)

crowdin · Jan 16, 2025 · 4d48fc6 · 4d48fc6
1 parent 5331d62
commit 4d48fc6
Show file tree

Hide file tree

Showing 29 changed files with 235 additions and 175 deletions.
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -90,13 +90,13 @@ NewAction<BaseProperties, ClientTm> tmDownload(
     NewAction<ProjectProperties, ClientTask> taskAdd(
         boolean noProgress, String title, Integer type, String language, List<String> files, String branch, Long workflowStep,
         String description, Boolean skipAssignedStrings, Boolean includePreTranslatedStringsOnly,
-        List<Long> labels, ProjectClient projectClient, boolean plainView);
+        List<Long> labels, boolean plainView);
 
     NewAction<ProjectProperties, ClientDistribution> distributionList(boolean plainView);
 
-    NewAction<ProjectProperties, ClientDistribution> distributionAdd(boolean noProgress, boolean plainView, String name, ExportMode exportMode, List<String> files, List<Integer> bundleIds, String branch, ProjectClient projectClient);
+    NewAction<ProjectProperties, ClientDistribution> distributionAdd(boolean noProgress, boolean plainView, String name, ExportMode exportMode, List<String> files, List<Integer> bundleIds, String branch);
 
-    NewAction<ProjectProperties, ClientDistribution> distributionRelease(boolean noProgress, boolean plainView, String hash, ProjectClient projectClient);
+    NewAction<ProjectProperties, ClientDistribution> distributionRelease(boolean noProgress, boolean plainView, String hash);
 
     NewAction<ProjectProperties, ClientComment> commentList(boolean plainView, boolean isVerbose, String stringId, com.crowdin.client.stringcomments.model.Type type, com.crowdin.client.issues.model.Type issueType, IssueStatus status);
 
@@ -126,7 +126,7 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
 
     NewAction<ProjectProperties, ClientScreenshot> screenshotList(Long stringId, boolean plainView);
 
-    NewAction<ProjectProperties, ClientScreenshot> screenshotUpload(File file, String branchName, List<String> labelNames, String directoryPath, String filePath, boolean autoTag, boolean plainView, boolean noProgress, ProjectClient projectClient);
+    NewAction<ProjectProperties, ClientScreenshot> screenshotUpload(File file, String branchName, List<String> labelNames, String directoryPath, String filePath, boolean autoTag, boolean plainView, boolean noProgress);
 
     NewAction<ProjectProperties, ClientScreenshot> screenshotDelete(Long id);
 

diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -172,9 +172,9 @@ public NewAction<ProjectProperties, ClientTask> taskList(boolean plainView, bool
     @Override
     public NewAction<ProjectProperties, ClientTask> taskAdd(boolean noProgress, String title, Integer type, String language,
         List<String> files, String branch, Long workflowStep, String description, Boolean skipAssignedStrings,
-        Boolean includePreTranslatedStringsOnly, List<Long> labels, ProjectClient projectClient, boolean plainView
+        Boolean includePreTranslatedStringsOnly, List<Long> labels, boolean plainView
     ) {
-        return new TaskAddAction(noProgress, title, type, language, files, branch, workflowStep, description, skipAssignedStrings, includePreTranslatedStringsOnly, labels, projectClient, plainView);
+        return new TaskAddAction(noProgress, title, type, language, files, branch, workflowStep, description, skipAssignedStrings, includePreTranslatedStringsOnly, labels, plainView);
     }
 
     @Override
@@ -183,13 +183,13 @@ public NewAction<ProjectProperties, ClientDistribution> distributionList(boolean
     }
 
     @Override
-    public NewAction<ProjectProperties, ClientDistribution> distributionAdd(boolean noProgress, boolean plainView, String name, ExportMode exportMode, List<String> files, List<Integer> bundleIds, String branch, ProjectClient projectClient) {
-        return new DistributionAddAction(noProgress, plainView, name, exportMode, files, bundleIds, branch, projectClient);
+    public NewAction<ProjectProperties, ClientDistribution> distributionAdd(boolean noProgress, boolean plainView, String name, ExportMode exportMode, List<String> files, List<Integer> bundleIds, String branch) {
+        return new DistributionAddAction(noProgress, plainView, name, exportMode, files, bundleIds, branch);
     }
 
     @Override
-    public NewAction<ProjectProperties, ClientDistribution> distributionRelease(boolean noProgress, boolean plainView, String hash, ProjectClient projectClient) {
-        return new DistributionReleaseAction(noProgress, plainView, hash, projectClient);
+    public NewAction<ProjectProperties, ClientDistribution> distributionRelease(boolean noProgress, boolean plainView, String hash) {
+        return new DistributionReleaseAction(noProgress, plainView, hash);
     }
 
     @Override
@@ -264,8 +264,8 @@ public NewAction<ProjectProperties, ClientScreenshot> screenshotList(Long string
     }
 
     @Override
-    public NewAction<ProjectProperties, ClientScreenshot> screenshotUpload(File file, String branchName, List<String> labelNames, String directoryPath, String filePath, boolean autoTag, boolean plainView, boolean noProgress, ProjectClient projectClient) {
-        return new ScreenshotUploadAction(file, branchName, labelNames, filePath, directoryPath, autoTag, plainView, noProgress, projectClient);
+    public NewAction<ProjectProperties, ClientScreenshot> screenshotUpload(File file, String branchName, List<String> labelNames, String directoryPath, String filePath, boolean autoTag, boolean plainView, boolean noProgress) {
+        return new ScreenshotUploadAction(file, branchName, labelNames, filePath, directoryPath, autoTag, plainView, noProgress);
     }
 
     @Override

diff --git a/src/main/java/com/crowdin/cli/commands/actions/DistributionAddAction.java b/src/main/java/com/crowdin/cli/commands/actions/DistributionAddAction.java
@@ -2,11 +2,11 @@
 
 import com.crowdin.cli.client.ClientDistribution;
 import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.RequestBuilder;
 import com.crowdin.cli.commands.picocli.ExitCodeExceptionMapper;
+import com.crowdin.cli.commands.picocli.GenericActCommand;
 import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
@@ -41,16 +41,15 @@ class DistributionAddAction implements NewAction<ProjectProperties, ClientDistri
     private List<Integer> bundleIds;
     private String branch;
 
-    private ProjectClient projectClient;
-
     @Override
     public void act(Outputter out, ProjectProperties pb, ClientDistribution client) {
+        var projectClient = GenericActCommand.getProjectClient(pb);
         CrowdinProjectFull project = ConsoleSpinner.execute(
                 out,
                 "message.spinner.fetching_project_info", "error.collect_project_info",
                 this.noProgress,
                 this.plainView,
-                () -> this.projectClient.downloadFullProject(this.branch)
+                () -> projectClient.downloadFullProject(this.branch)
         );
         boolean isStringsBasedProject = Objects.equals(project.getType(), Type.STRINGS_BASED);
 
@@ -64,12 +63,12 @@ public void act(Outputter out, ProjectProperties pb, ClientDistribution client)
             List<String> projectFiles = project.getFiles().stream()
                                                .filter(file -> branch == null || file.getBranchId().equals(projectBranches.get(branch)))
                                                .map(FileInfo::getPath)
-                                               .collect(Collectors.toList());
+                                               .toList();
             List<String> notExistingFiles = files.stream()
                                                  .map(file -> branch == null ? file : Paths.get(branch, file).toString())
                                                  .map(Utils::sepAtStart)
                                                  .filter(file -> !projectFiles.contains(file))
-                                                 .collect(Collectors.toList());
+                                                 .toList();
             if (!notExistingFiles.isEmpty()) {
                 throw new ExitCodeExceptionMapper.NotFoundException(notExistingFiles.stream().map(Utils::noSepAtStart)
                      .map(file -> String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), file))

diff --git a/src/main/java/com/crowdin/cli/commands/actions/DistributionReleaseAction.java b/src/main/java/com/crowdin/cli/commands/actions/DistributionReleaseAction.java
@@ -2,9 +2,9 @@
 
 import com.crowdin.cli.client.ClientDistribution;
 import com.crowdin.cli.client.CrowdinProjectInfo;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.picocli.GenericActCommand;
 import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.distributions.model.DistributionRelease;
@@ -24,16 +24,16 @@ class DistributionReleaseAction implements NewAction<ProjectProperties, ClientDi
     private boolean plainView;
     private String hash;
 
-    private ProjectClient projectClient;
-
     @Override
     public void act(Outputter out, ProjectProperties pb, ClientDistribution client) {
+        var projectClient = GenericActCommand.getProjectClient(pb);
+
         CrowdinProjectInfo project = ConsoleSpinner.execute(
             out,
             "message.spinner.fetching_project_info", "error.collect_project_info",
             this.noProgress,
             this.plainView,
-            () -> this.projectClient.downloadProjectInfo()
+            projectClient::downloadProjectInfo
         );
         boolean isStringsBasedProject = Objects.equals(project.getType(), Type.STRINGS_BASED);
 

diff --git a/src/main/java/com/crowdin/cli/commands/actions/ScreenshotUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/ScreenshotUploadAction.java
@@ -8,6 +8,7 @@
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.RequestBuilder;
 import com.crowdin.cli.commands.picocli.ExitCodeExceptionMapper;
+import com.crowdin.cli.commands.picocli.GenericActCommand;
 import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
@@ -46,16 +47,15 @@ class ScreenshotUploadAction implements NewAction<ProjectProperties, ClientScree
     private final boolean plainView;
     private final boolean noProgress;
 
-    private ProjectClient projectClient;
-
     @Override
     public void act(Outputter out, ProjectProperties properties, ClientScreenshot client) {
+        var projectClient = GenericActCommand.getProjectClient(properties);
         CrowdinProjectFull project = ConsoleSpinner.execute(
                 out,
                 "message.spinner.fetching_project_info", "error.collect_project_info",
                 this.noProgress,
                 this.plainView,
-                () -> this.projectClient.downloadFullProject());
+                projectClient::downloadFullProject);
 
         Long branchId = null;
         if (nonNull(branchName)) {
@@ -84,7 +84,7 @@ public void act(Outputter out, ProjectProperties properties, ClientScreenshot cl
         Optional<Screenshot> existingScreenshot = screenshotList.stream().findFirst();
         if (existingScreenshot.isPresent()) {
             UpdateScreenshotRequest request = new UpdateScreenshotRequest();
-            request.setStorageId(uploadToStorage(file));
+            request.setStorageId(uploadToStorage(projectClient, file));
             request.setName(file.getName());
             request.setUsePreviousTags(!autoTag);
             try {
@@ -111,13 +111,13 @@ public void act(Outputter out, ProjectProperties properties, ClientScreenshot cl
 
         AddScreenshotRequest request = new AddScreenshotRequest();
         if (nonNull(labelNames) && !labelNames.isEmpty()) {
-            request.setLabelIds(prepareLabelIds());
+            request.setLabelIds(prepareLabelIds(projectClient));
         }
 
         request.setBranchId(branchId);
         request.setDirectoryId(directoryId);
         request.setFileId(fileId);
-        request.setStorageId(uploadToStorage(file));
+        request.setStorageId(uploadToStorage(projectClient, file));
         request.setName(file.getName());
         request.setAutoTag(autoTag);
 
@@ -140,17 +140,17 @@ public void act(Outputter out, ProjectProperties properties, ClientScreenshot cl
         }
     }
 
-    private Long uploadToStorage(File fileToUpload) {
+    private Long uploadToStorage(ProjectClient projectClient, File fileToUpload) {
         Long storageId;
         try (InputStream fileStream = Files.newInputStream(fileToUpload.toPath())) {
-            storageId = this.projectClient.uploadStorage(fileToUpload.getName(), fileStream);
+            storageId = projectClient.uploadStorage(fileToUpload.getName(), fileStream);
         } catch (Exception e) {
             throw ExitCodeExceptionMapper.remap(e, String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), fileToUpload.getName()));
         }
         return storageId;
     }
 
-    private Long[] prepareLabelIds() {
+    private Long[] prepareLabelIds(ProjectClient projectClient) {
         Map<String, Long> labels = projectClient.listLabels().stream()
                 .collect(Collectors.toMap(Label::getTitle, Label::getId));
         labelNames.stream()

diff --git a/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java b/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
@@ -2,13 +2,13 @@
 
 import com.crowdin.cli.client.ClientTask;
 import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 
 import com.crowdin.cli.commands.functionality.ProjectFilesUtils;
 import com.crowdin.cli.commands.functionality.PropertiesBeanUtils;
 import com.crowdin.cli.commands.picocli.ExitCodeExceptionMapper;
+import com.crowdin.cli.commands.picocli.GenericActCommand;
 import com.crowdin.cli.properties.ProjectProperties;
 
 import com.crowdin.cli.utils.Utils;
@@ -38,16 +38,16 @@ class TaskAddAction implements NewAction<ProjectProperties, ClientTask> {
     private Boolean skipAssignedStrings;
     private Boolean includePreTranslatedStringsOnly;
     private List<Long> labels;
-    private ProjectClient projectClient;
     private boolean plainView;
 
     @Override
     public void act(Outputter out, ProjectProperties pb, ClientTask client) {
+        var projectClient = GenericActCommand.getProjectClient(pb);
         boolean isOrganization = PropertiesBeanUtils.isOrganization(pb.getBaseUrl());
         Task task;
         AddTaskRequest addTaskRequest;
         CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-            this.noProgress, this.plainView, () -> this.projectClient.downloadFullProject(this.branch));
+            this.noProgress, this.plainView, () -> projectClient.downloadFullProject(this.branch));
 
         List<Long> fileIds = new ArrayList<>();
         Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandBundle.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandBundle.java
@@ -1,8 +1,6 @@
 package com.crowdin.cli.commands.picocli;
 
 import com.crowdin.cli.client.ClientBundle;
-import com.crowdin.cli.client.Clients;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectParams;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -24,6 +22,6 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
 
     @Override
     protected ClientBundle getClient(ProjectProperties properties) {
-        return Clients.getClientBundle(properties.getApiToken(), properties.getBaseUrl(), properties.getProjectId());
+        return GenericActCommand.getBundleClient(properties);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandComment.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandComment.java
@@ -1,7 +1,6 @@
 package com.crowdin.cli.commands.picocli;
 
 import com.crowdin.cli.client.ClientComment;
-import com.crowdin.cli.client.Clients;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectParams;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -23,6 +22,6 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
 
     @Override
     protected ClientComment getClient(ProjectProperties properties) {
-        return Clients.getClientComment(properties.getApiToken(), properties.getBaseUrl(), properties.getProjectId());
+        return GenericActCommand.getCommentClient(properties);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandDistribution.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandDistribution.java
@@ -2,7 +2,6 @@
 
 import com.crowdin.cli.client.ClientDistribution;
 import com.crowdin.cli.client.Clients;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectParams;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -26,8 +25,4 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
     protected ClientDistribution getClient(ProjectProperties properties) {
         return Clients.getClientDistribution(properties.getApiToken(), properties.getBaseUrl(), properties.getProjectId());
     }
-
-    protected ProjectClient getProjectClient(ProjectProperties properties) {
-        return Clients.getProjectClient(properties.getApiToken(), properties.getBaseUrl(), Long.parseLong(properties.getProjectId()));
-    }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandGlossary.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandGlossary.java
@@ -1,13 +1,12 @@
 package com.crowdin.cli.commands.picocli;
 
 import com.crowdin.cli.client.ClientGlossary;
-import com.crowdin.cli.client.Clients;
 import com.crowdin.cli.properties.BaseProperties;
 
 public abstract class ActCommandGlossary extends ActCommand<ClientGlossary> {
 
     @Override
     protected ClientGlossary getClient(BaseProperties properties) {
-        return Clients.getClientGlossary(properties.getApiToken(), properties.getBaseUrl());
+        return GenericActCommand.getGlossaryClient(properties);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandLabel.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandLabel.java
@@ -1,9 +1,6 @@
 package com.crowdin.cli.commands.picocli;
 
 import com.crowdin.cli.client.ClientLabel;
-import com.crowdin.cli.client.ClientScreenshot;
-import com.crowdin.cli.client.Clients;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectParams;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -25,6 +22,6 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
 
     @Override
     protected ClientLabel getClient(ProjectProperties properties) {
-        return Clients.getClientLabel(properties.getApiToken(), properties.getBaseUrl(), properties.getProjectId());
+        return GenericActCommand.getLabelClient(properties);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandProject.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandProject.java
@@ -1,6 +1,5 @@
 package com.crowdin.cli.commands.picocli;
 
-import com.crowdin.cli.client.Clients;
 import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -23,6 +22,6 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
 
     @Override
     protected ProjectClient getClient(ProjectProperties properties) {
-        return Clients.getProjectClient(properties.getApiToken(), properties.getBaseUrl(), Long.parseLong(properties.getProjectId()));
+        return GenericActCommand.getProjectClient(properties);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/ActCommandScreenshot.java b/src/main/java/com/crowdin/cli/commands/picocli/ActCommandScreenshot.java
@@ -2,7 +2,6 @@
 
 import com.crowdin.cli.client.ClientScreenshot;
 import com.crowdin.cli.client.Clients;
-import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.properties.ProjectParams;
 import com.crowdin.cli.properties.ProjectProperties;
@@ -26,8 +25,4 @@ protected ProjectProperties getProperties(PropertiesBuilders propertiesBuilders,
     protected ClientScreenshot getClient(ProjectProperties properties) {
         return Clients.getClientScreenshot(properties.getApiToken(), properties.getBaseUrl(), properties.getProjectId());
     }
-
-    protected ProjectClient getProjectClient(ProjectProperties properties) {
-        return Clients.getProjectClient(properties.getApiToken(), properties.getBaseUrl(), Long.parseLong(properties.getProjectId()));
-    }
 }