close #240 prerunperm should not auth because

Author: groenborg

cmd/cmdperm/prerunperm.go

@@ -5,24 +5,9 @@ import (
 	"os"
 
 	"github.com/praqma/git-phlow/githandler"
-	"github.com/praqma/git-phlow/ui"
-	"github.com/praqma/git-phlow/setting"
 	"github.com/praqma/git-phlow/executor"
 )
 
-//RequiredAuthentication ...
-//Validates if the user has logged in before running the command
-func RequiredAuthentication() {
-	stg := setting.NewToolStg()
-	token := stg.Token
-	user := stg.User
-
-	if token == "" || user == "" {
-		fmt.Printf("Please run %s to connect to github \n", ui.Format.Bold("auth"))
-		os.Exit(0)
-	}
-}
-
 //RequiredCurDirRepository ...
 //Validates if the command is runnign in a git repository
 func RequiredCurDirRepository() {

cmd/issues.go

@@ -19,7 +19,6 @@ var issueCmd = &cobra.Command{
 `, ui.Format.Bold("issues")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
-		cmdperm.RequiredAuthentication()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.Issues()

cmd/web.go

@@ -23,7 +23,6 @@ If no argument is given, it tries to find the issue of the currently checked out
 `, ui.Format.Bold("web")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
-		cmdperm.RequiredAuthentication()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 {

cmd/workon.go

@@ -20,7 +20,6 @@ A new branch will be created, based on your remote default branch and named afte
 `, ui.Format.Bold("workon")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
-		cmdperm.RequiredAuthentication()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 

phlow/workon.go

@@ -87,7 +87,12 @@ func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 	}
 
 	name, err := update(keyOrID, conf)
+	if err != nil {
 
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	//ERROR CHECK HERE
 	_, err = git.CheckOut("-b", name, conf.Remote+"/"+conf.IntegrationBranch)
 	if err != nil {
 		fmt.Println(err)

plugins/github.go

@@ -107,6 +107,10 @@ func GetIssueGitHub(URL, org, repo, key, token string) (*Issue, error) {
 	}
 	defer res.Body.Close()
 
+	if res.StatusCode == 401 {
+		return nil, errors.New("Not Authorized \nVerify that you are authorized by running 'git phlow auth' with the same configuration")
+	}
+
 	if res.StatusCode == 404 && (org == "" || repo == "") {
 		return nil, errors.New("Could not reach GitHub API - Malformed URL \nVerify 'Remote' field is correct in configuration" +
 			"\ntry 'git ls-remote --get <Remote from config>' should return: [email protected]:org/repo.git")
@@ -188,4 +192,4 @@ func SetAssigneeGitHub(URL, org, repo, token, issue, assignee string, ) (err err
 	}
 	defer res.Body.Close()
 	return nil
-}
+}

plugins/jira.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"fmt"
 	"bytes"
+	"strings"
 )
 
 //AuthenticateJIRA ...
@@ -48,6 +49,8 @@ func AuthorizeJIRA(URL, user, pass string) (token string, err error) {
 //GetJiraIssue ...
 func GetJiraIssue(URL, key, user, pass string) (*JiraIssue, error) {
 
+	pass = strings.TrimSpace(pass)
+
 	issueURL := "/rest/api/latest/issue/"
 	req, _ := http.NewRequest("GET", URL+issueURL+key, nil)
 	req.Header.Set("Content-Type", "application/json")
@@ -60,7 +63,17 @@ func GetJiraIssue(URL, key, user, pass string) (*JiraIssue, error) {
 	}
 	defer res.Body.Close()
 
-	body, err := ioutil.ReadAll(res.Body);
+	if res.StatusCode == 401 {
+		return nil, errors.New("Not Authorized \nVerify that you are authorized by running 'git phlow auth' with the same configuration")
+	}
+
+	if res.StatusCode == 404 {
+		return nil, errors.New("Could not find issue with ID " + key +
+			" \nCheck you have permissions or that the issue exists \nVerify the configuration 'issue_url' is correct")
+
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}

plugins/plugin.go

@@ -18,8 +18,6 @@ type Authentication func(URL, user, pass string) (authenticated bool, err error)
 //interface for getting the default branch of the external service
 type DefaultBranch func(URL, org, repo, token string) (defaultBranch string, err error)
 
-
-
 //PhlowLabels ...
 //Map of labels in the phlow
 var PhlowLabels map[string]*PhlowLabel