Merge branch 'release/0.2.1'

classmethod · Feb 24, 2015 · 4733ac5 · 4733ac5
2 parents 208f1c5 + 4ea51f5
commit 4733ac5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/oauth2.go b/oauth2.go
@@ -67,9 +67,9 @@ func authorizationCodeFlow(oauth2Conf *oauth2.Config) (*oauth2.Token, bool, erro
 
 	reader := bufio.NewReader(os.Stdin)
 	fmt.Fprint(os.Stderr, "Enter code: ")
-	if code, err := reader.ReadString('\n'); err != nil {
+	if code, _, err := reader.ReadLine(); err != nil {
 		return &oauth2.Token{}, true, err
-	} else if tok, err := oauth2Conf.Exchange(oauth2.NoContext, trimSuffix(code, "\n")); err != nil {
+	} else if tok, err := oauth2Conf.Exchange(oauth2.NoContext, string(code)); err != nil {
 		return &oauth2.Token{}, true, err
 	} else {
 		return tok, true, nil
@@ -131,13 +131,6 @@ func random() string {
 	return strconv.FormatUint(n, 36)
 }
 
-func trimSuffix(s, suffix string) string {
-	if strings.HasSuffix(s, suffix) {
-		s = s[:len(s)-len(suffix)]
-	}
-	return s
-}
-
 func condVal(v string) []string {
 	if v == "" {
 		return nil

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const Version string = "0.2"
+const Version string = "0.2.1"