Merge pull request #15 from SkynetLabs/skynetpro-fix

Adjust options to pass JWT to Client, not upload method
SkynetLabs · Jan 28, 2022 · 4f9491c · 4f9491c
2 parents 9662df1 + f986500
commit 4f9491c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -17,6 +17,17 @@ function outputAxiosErrorMessage(error) {
   }
 }
 
+function prepareClientOptions() {
+  const options = {};
+
+  if (core.getInput("skynet-jwt")) {
+    // transform skynet-jwt into a cookie accepted format
+    options.customCookie = `skynet-jwt=${core.getInput("skynet-jwt")}`;
+  }
+
+  return options;
+}
+
 function prepareUploadOptions() {
   const options = {};
 
@@ -32,18 +43,16 @@ function prepareUploadOptions() {
     options.errorPages = { 404: core.getInput("not-found-page") };
   }
 
-  if (core.getInput("skynet-jwt")) {
-    // transform skynet-jwt into a cookie accepted format
-    options.customCookie = `skynet-jwt=${core.getInput("skynet-jwt")}`;
-  }
-
   return options;
 }
 
 (async () => {
   try {
     // upload to skynet
-    const skynetClient = new SkynetClient(core.getInput("portal-url"));
+    const skynetClient = new SkynetClient(
+      core.getInput("portal-url"),
+      prepareClientOptions()
+    );
     const skylink = await skynetClient.uploadDirectory(
       core.getInput("upload-dir"),
       prepareUploadOptions()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deploy-to-skynet-action",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "",
   "main": "index.js",
   "scripts": {