untested merge conflict resolved

Author: muhammednagy

.circleci/config.yml

@@ -0,0 +1,14 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "packageRules": [
+    {
+      "updateTypes": ["minor", "patch", "digest"],
+      "automerge": true
+    }
+  ],
+  "postUpdateOptions": [
+    "gomodTidy"
+  ]
+}

.github/renovate.json5

@@ -0,0 +1,42 @@
+name: go
+
+on:
+  pull_request:
+    paths:
+      - .github/workflows/go.yaml
+      - '**/*.go'
+      - go.*
+  push:
+    paths:
+      - .github/workflows/go.yaml
+      - '**/*.go'
+      - go.*
+    branches:
+      - master
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.38.0
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: go-linux-amd64-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            go-linux-amd64-
+      - run: go test -v -race ./...

.github/workflows/go.yaml

@@ -1,11 +1,11 @@
-# oauth2cli [![CircleCI](https://circleci.com/gh/int128/oauth2cli.svg?style=shield)](https://circleci.com/gh/int128/oauth2cli) [![GoDoc](https://godoc.org/github.com/int128/oauth2cli?status.svg)](https://godoc.org/github.com/int128/oauth2cli)
+# oauth2cli ![test](https://github.com/int128/oauth2cli/workflows/test/badge.svg) [![GoDoc](https://godoc.org/github.com/int128/oauth2cli?status.svg)](https://godoc.org/github.com/int128/oauth2cli)
 
 This is a Go package for OAuth 2.0 authorization in a command line interface (CLI) tool.
 You can create a CLI tool with the simple authorization flow for better UX.
 
-Take a look at the demo movie running [the example application](example/).
+Take a look at the screencast of [the example application](example/).
 
-<img alt="example" src="https://user-images.githubusercontent.com/321266/67554896-35e02280-f74b-11e9-8d32-392c13b4804a.gif" width="650" height="470">
+<img src="https://user-images.githubusercontent.com/321266/87224372-c2a53c00-c3bf-11ea-8419-74380a9e681e.gif" width="572" height="391">
 
 
 ## Purpose

Makefile

@@ -4,11 +4,11 @@
 package authserver
 
 import (
+	"errors"
+	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
-
-	"golang.org/x/xerrors"
 )
 
 // AuthorizationRequest represents an authorization request described as:
@@ -55,13 +55,13 @@ func (h *Handler) serveHTTP(w http.ResponseWriter, r *http.Request) error {
 		q := r.URL.Query()
 		scope, state, redirectURI := q.Get("scope"), q.Get("state"), q.Get("redirect_uri")
 		if scope == "" {
-			return xerrors.New("scope is missing")
+			return errors.New("scope is missing")
 		}
 		if state == "" {
-			return xerrors.New("state is missing")
+			return errors.New("state is missing")
 		}
 		if redirectURI == "" {
-			return xerrors.New("redirect_uri is missing")
+			return errors.New("redirect_uri is missing")
 		}
 		to := h.NewAuthorizationResponse(AuthorizationRequest{
 			Scope:       scope,
@@ -73,14 +73,14 @@ func (h *Handler) serveHTTP(w http.ResponseWriter, r *http.Request) error {
 
 	case r.Method == "POST" && r.URL.Path == "/token":
 		if err := r.ParseForm(); err != nil {
-			return xerrors.Errorf("error while parsing form: %w", err)
+			return fmt.Errorf("error while parsing form: %w", err)
 		}
 		code, redirectURI := r.Form.Get("code"), r.Form.Get("redirect_uri")
 		if code == "" {
-			return xerrors.New("code is missing")
+			return errors.New("code is missing")
 		}
 		if redirectURI == "" {
-			return xerrors.New("redirect_uri is missing")
+			return errors.New("redirect_uri is missing")
 		}
 		status, b := h.NewTokenResponse(TokenRequest{
 			Code: code,
@@ -89,7 +89,7 @@ func (h *Handler) serveHTTP(w http.ResponseWriter, r *http.Request) error {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(status)
 		if _, err := w.Write([]byte(b)); err != nil {
-			return xerrors.Errorf("error while writing response body: %w", err)
+			return fmt.Errorf("error while writing response body: %w", err)
 		}
 
 	default:

README.md

@@ -0,0 +1,52 @@
+package client
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+var certPool = x509.NewCertPool()
+
+func init() {
+	data, err := ioutil.ReadFile("testdata/ca.crt")
+	if err != nil {
+		panic(err)
+	}
+	if !certPool.AppendCertsFromPEM(data) {
+		panic("could not append certificate data")
+	}
+}
+
+func Get(url string) (int, string, error) {
+	client := http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{RootCAs: certPool}}}
+	resp, err := client.Get(url)
+	if err != nil {
+		return 0, "", fmt.Errorf("could not send a request: %w", err)
+	}
+	defer resp.Body.Close()
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return resp.StatusCode, "", fmt.Errorf("could not read response body: %w", err)
+	}
+	return resp.StatusCode, string(b), nil
+}
+
+func GetAndVerify(t *testing.T, url string, code int, body string) {
+	gotCode, gotBody, err := Get(url)
+	if err != nil {
+		t.Errorf("could not open browser request: %s", err)
+		return
+	}
+	if gotCode != code {
+		t.Errorf("status wants %d but %d", code, gotCode)
+	}
+	if gotBody != body {
+		t.Errorf("response body did not match: %s", cmp.Diff(gotBody, body))
+	}
+}

e2e_test/authserver/handler.go

@@ -0,0 +1,87 @@
+package e2e_test
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/int128/oauth2cli"
+	"github.com/int128/oauth2cli/e2e_test/authserver"
+	"golang.org/x/oauth2"
+)
+
+func TestContextCancelOnWaitingForBrowser(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.TODO(), 100*time.Millisecond)
+	defer cancel()
+	s := httptest.NewServer(&authserver.Handler{
+		T: t,
+		NewAuthorizationResponse: func(r authserver.AuthorizationRequest) string {
+			return fmt.Sprintf("%s?error=server_error", r.RedirectURI)
+		},
+		NewTokenResponse: func(r authserver.TokenRequest) (int, string) {
+			return 500, "should not reach here"
+		},
+	})
+	defer s.Close()
+	cfg := oauth2cli.Config{
+		OAuth2Config: oauth2.Config{
+			ClientID:     "YOUR_CLIENT_ID",
+			ClientSecret: "YOUR_CLIENT_SECRET",
+			Scopes:       []string{"email", "profile"},
+			Endpoint: oauth2.Endpoint{
+				AuthURL:  s.URL + "/auth",
+				TokenURL: s.URL + "/token",
+			},
+		},
+		Logf: t.Logf,
+	}
+	_, err := oauth2cli.GetToken(ctx, cfg)
+	if err == nil {
+		t.Errorf("GetToken wants error but was nil")
+		return
+	}
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Errorf("err wants DeadlineExceeded but %+v", err)
+	}
+}
+
+func TestContextCancelOnLocalServerReadyChan(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.TODO(), 100*time.Millisecond)
+	defer cancel()
+	openBrowserCh := make(chan string)
+	defer close(openBrowserCh)
+	s := httptest.NewServer(&authserver.Handler{
+		T: t,
+		NewAuthorizationResponse: func(r authserver.AuthorizationRequest) string {
+			return fmt.Sprintf("%s?error=server_error", r.RedirectURI)
+		},
+		NewTokenResponse: func(r authserver.TokenRequest) (int, string) {
+			return 500, "should not reach here"
+		},
+	})
+	defer s.Close()
+	cfg := oauth2cli.Config{
+		OAuth2Config: oauth2.Config{
+			ClientID:     "YOUR_CLIENT_ID",
+			ClientSecret: "YOUR_CLIENT_SECRET",
+			Scopes:       []string{"email", "profile"},
+			Endpoint: oauth2.Endpoint{
+				AuthURL:  s.URL + "/auth",
+				TokenURL: s.URL + "/token",
+			},
+		},
+		LocalServerReadyChan: openBrowserCh,
+		Logf:                 t.Logf,
+	}
+	_, err := oauth2cli.GetToken(ctx, cfg)
+	if err == nil {
+		t.Errorf("GetToken wants error but was nil")
+		return
+	}
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Errorf("err wants DeadlineExceeded but %+v", err)
+	}
+}