Merge pull request #258 from MichaelMure/fixes

Michael Muré created 6 years ago

Bridges fixes

Change summary

bridge/core/token.go    | 2 +-
bridge/github/config.go | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

Detailed changes

bridge/core/token.go

@@ -43,7 +43,7 @@ func NewToken(value, target string) *Token {
 }
 
 func (t *Token) ID() entity.Id {
-	sum := sha256.Sum256([]byte(t.Value))
+	sum := sha256.Sum256([]byte(t.Target + t.Value))
 	return entity.Id(fmt.Sprintf("%x", sum))
 }
 

bridge/github/config.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"syscall"
@@ -471,6 +472,8 @@ func getValidGithubRemoteURLs(remotes map[string]string) []string {
 		}
 	}
 
+	sort.Strings(urls)
+
 	return urls
 }