From 977a472f403a879e72c4efe9d1f77031f99dfd73 Mon Sep 17 00:00:00 2001
From: Rodrigo Brito <rodrigo-brito@users.noreply.github.com>
Date: Fri, 10 Jun 2022 20:57:28 -0300
Subject: [PATCH 1/2] fix(auth): set JWT token for user/password method

---
 plugin/impl.go | 87 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 18 deletions(-)

diff --git a/plugin/impl.go b/plugin/impl.go
index 4eafe63..5f920f5 100644
--- a/plugin/impl.go
+++ b/plugin/impl.go
@@ -6,10 +6,11 @@
 package plugin
 
 import (
-	"encoding/base64"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"net"
+	"net/http"
 	"net/url"
 	"os"
 	"os/exec"
@@ -46,6 +47,17 @@ type (
 	npmConfig struct {
 		Registry string `json:"registry"`
 	}
+
+	authPaylaod struct {
+		Name     string `json:"name"`
+		Password string `json:"password"`
+		Email    string `json:"email"`
+	}
+
+	authResult struct {
+		Error string `json:"error"`
+		Token string `json:"token"`
+	}
 )
 
 // globalRegistry defines the default NPM registry.
@@ -124,18 +136,68 @@ func (p *Plugin) Execute() error {
 	return nil
 }
 
+// npmGetToken get a new auth token from NPM registry
+func npmGetToken(config *Settings) (string, error) {
+	payload, err := json.Marshal(authPaylaod{
+		Name:     config.Username,
+		Password: config.Password,
+		Email:    config.Email,
+	})
+	if err != nil {
+		return "", err
+	}
+
+	url := fmt.Sprintf(
+		"%s/-/user/org.couchdb.user:%s",
+		strings.TrimSuffix(config.Registry, "/"),
+		config.Username,
+	)
+
+	req, err := http.NewRequest(http.MethodPut, url, bytes.NewReader(payload))
+	if err != nil {
+		return "", err
+	}
+
+	req.Header.Set("Accept", "application/json")
+	req.Header.Set("Content-Type", "application/json")
+	req.SetBasicAuth(config.Username, config.Password)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode >= http.StatusBadRequest {
+		return "", fmt.Errorf("could not get token: %d - %s", resp.StatusCode, resp.Status)
+	}
+
+	var result authResult
+	err = json.NewDecoder(resp.Body).Decode(&result)
+	if err != nil {
+		return "", err
+	}
+
+	if result.Error != "" {
+		return "", fmt.Errorf("could not get token: %d - %s", resp.StatusCode, result.Error)
+	}
+
+	return result.Token, nil
+}
+
 /// writeNpmrc creates a .npmrc in the folder for authentication
 func (p *Plugin) writeNpmrc() error {
-	var f func(settings *Settings) string
 	if p.settings.Token == "" {
 		logrus.WithFields(logrus.Fields{
 			"username": p.settings.Username,
 			"email":    p.settings.Email,
 		}).Info("Specified credentials")
-		f = npmrcContentsUsernamePassword
-	} else {
-		logrus.Info("Token credentials being used")
-		f = npmrcContentsToken
+
+		token, err := npmGetToken(&p.settings)
+		if err != nil {
+			return err
+		}
+		p.settings.Token = token
 	}
 
 	// write npmrc file
@@ -148,7 +210,7 @@ func (p *Plugin) writeNpmrc() error {
 
 	logrus.WithField("path", npmrcPath).Info("Writing npmrc")
 
-	return os.WriteFile(npmrcPath, []byte(f(&p.settings)), 0644) //nolint:gomnd
+	return os.WriteFile(npmrcPath, []byte(npmrcContentsToken(&p.settings)), 0644) //nolint:gomnd
 }
 
 /// shouldPublishPackage determines if the package should be published
@@ -282,17 +344,6 @@ func readPackageFile(folder string) (*npmPackage, error) {
 	return &npm, nil
 }
 
-// npmrcContentsUsernamePassword creates the contents from a username and
-// password
-func npmrcContentsUsernamePassword(config *Settings) string {
-	// get the base64 encoded string
-	authString := fmt.Sprintf("%s:%s", config.Username, config.Password)
-	encoded := base64.StdEncoding.EncodeToString([]byte(authString))
-
-	// create the file contents
-	return fmt.Sprintf("_auth = %s\nemail = %s", encoded, config.Email)
-}
-
 /// Writes npmrc contents when using a token
 func npmrcContentsToken(config *Settings) string {
 	registry, _ := url.Parse(config.Registry)

From b20b1b775f9b5457767215fb3298beede9e9ee59 Mon Sep 17 00:00:00 2001
From: Rodrigo Brito <rodrigo-brito@users.noreply.github.com>
Date: Tue, 14 Jun 2022 22:21:35 -0300
Subject: [PATCH 2/2] fix: linter

---
 plugin/impl.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin/impl.go b/plugin/impl.go
index 5f920f5..21129b2 100644
--- a/plugin/impl.go
+++ b/plugin/impl.go
@@ -7,6 +7,7 @@ package plugin
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -147,13 +148,13 @@ func npmGetToken(config *Settings) (string, error) {
 		return "", err
 	}
 
-	url := fmt.Sprintf(
+	loginURL := fmt.Sprintf(
 		"%s/-/user/org.couchdb.user:%s",
 		strings.TrimSuffix(config.Registry, "/"),
 		config.Username,
 	)
 
-	req, err := http.NewRequest(http.MethodPut, url, bytes.NewReader(payload))
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodPut, loginURL, bytes.NewReader(payload))
 	if err != nil {
 		return "", err
 	}