close #72 token must contain machine id in name

Author: groenborg

README.md

@@ -6,7 +6,7 @@ maintainer: groenborg
 
 | build | goreport |
 | ------------- | ----------------- |
-| [build status](https://concourse.code.praqma.com/api/v1/teams/main/pipelines/git-phlow/jobs/integration/badge) | [![Go Report Card](https://goreportcard.com/badge/github.com/Praqma/git-phlow)](https://goreportcard.com/report/github.com/Praqma/git-phlow)       |
+| ![build status](https://concourse.kubernetes.praqma.cloud/api/v1/teams/main/pipelines/git-phlow/jobs/integration-tests/badge) | [![Go Report Card](https://goreportcard.com/badge/github.com/Praqma/git-phlow)](https://goreportcard.com/report/github.com/Praqma/git-phlow)       |
 
 
 git-phlow (pronounced _"git flow"_), is a CLI extension for git, which provides an extra set of commands to easily use our pragmatic workflow called **the phlow**.  It has an automatic branching model, which compliant CI/CD services can use for full automation.  It also provides automatic issue tracking using [github](https://github.com) issues with [waffle](https://waffle.io/).

ci/notes/CHANGELOG.md

@@ -1,7 +1,7 @@
-The release brings much needed features to the phlow. Requests for opening GitHub issues in your browser have been heard, and here it is.
-We have also tried to address the issues with the workon command, where in some cases it was unable to locate the issues on github.
-As always we strive for perfection and try to make the code pretty as a butterfly.
-git-phlow can still not keep the coffey hot, but we are working hard on it. 
+Last release brought some unexpected problems with our authentication og permissions to github, whoops.
+We have made a fix for theses problems, so just go ahead and get the update and these problems should be a part of the past.
+To re-authenticate you need to delete the old 'git phlow' token on github.com and delete your phlow settings in your global .gitconfig file.
+
 
 #### Features
 - web command #63 (Browser can be started from phlow) @groenborg

cmd/issues.go

@@ -16,6 +16,7 @@ List all the open issues on GitHub with it's ID. Helps you locate what needs to
 `,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		checks.IsRepository()
+		checks.IsAuthenticated()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		phlow.IssueList()

cmd/web.go

@@ -23,6 +23,7 @@ if that fails it will simply open GitHubs issue list in your default browser
 `,
 	PreRun: func(cmd *cobra.Command, args []string) {
 		checks.IsRepository()
+		checks.IsAuthenticated()
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 {

main.go

@@ -1,9 +1,8 @@
 package main
 
-import (
-	"github.com/praqma/git-phlow/cmd"
-)
+import "github.com/praqma/git-phlow/cmd"
 
 func main() {
 	cmd.Execute()
+
 }

plugins/github.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
+	"os"
 )
 
 //GitHub ...
@@ -122,16 +123,50 @@ func (i *IssueRequest) Get() ([]Issues, error) {
 	return nil, err
 }
 
+//Permissions ...
+//data struct for permissions
+type Permissions struct {
+	Scopes []string `json:"scopes"`
+	Note   string   `json:"note"`
+}
+
+//createPermissions ...
+func createPermissions() (string, error) {
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "", err
+	}
+
+	note := "git phlow " + hostname
+	if options.GlobalFlagVerbose {
+		fmt.Println("github plugin: " + note)
+	}
+
+	perm := Permissions{
+		Scopes: []string{"public_repo", "repo", "repo_deployment"},
+		Note:   note,
+	}
+	b2b, err := json.Marshal(&perm)
+	if err != nil {
+		return "", err
+	}
+	return string(b2b), nil
+}
+
 //Auth ...
 //Auth request to github
 func (a *AuthRequest) Auth(user, pass string) (string, error) {
 	var auth Auth
-	var authBody = `{"scopes": ["public_repo"],"note": "git phlow"}`
+
+	perm, err := createPermissions()
+	if err != nil {
+		return "", err
+	}
 
 	if options.GlobalFlagVerbose {
 		fmt.Println(a.URL)
 	}
-	req, err := http.NewRequest("POST", a.URL, bytes.NewBuffer([]byte(authBody)))
+	req, err := http.NewRequest("POST", a.URL, bytes.NewBuffer([]byte(perm)))
 	if err != nil {
 		return "", err
 	}

plugins/github_test.go

@@ -34,6 +34,19 @@ func TestAuthorize(t *testing.T) {
 	})
 }
 
+func TestCreatePermissions(t *testing.T) {
+	Convey("Running tests on 'createPermissions' function", t, func() {
+		Convey("should return json permissions as string", func() {
+			str, err := createPermissions()
+
+			t.Log(str)
+			So(str, ShouldContainSubstring, "repo")
+			So(err, ShouldBeNil)
+
+		})
+	})
+}
+
 func TestGetDefaultBranch(t *testing.T) {
 	Convey("Runnign tests on 'GetDefaultBranch' request", t, func() {
 		Convey("GetDefaultBranch should return master", func() {