Refactor auth

Gopkg.toml

@@ -58,3 +58,8 @@
 [[constraint]]
   branch = "master"
   name = "github.com/utahta/go-openuri"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/google/uuid"
+

auth.go → auth/auth.go

@@ -1,43 +1,48 @@
-package linenotify
+package auth
 
 import (
-	"crypto/rand"
-	"encoding/base64"
 	"net/http"
 	"net/url"
 
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 )
 
-type AuthorizationClient struct {
-	ClientID     string
-	RedirectURI  string
-	ResponseMode string
-	State        string
-}
+type (
+	// Client represents LINE Notify authorization
+	Client struct {
+		ClientID     string
+		RedirectURI  string
+		ResponseMode string
+		State        string
+	}
 
-type AuthorizationResponse struct {
-	Code             string
-	State            string
-	Error            string
-	ErrorDescription string
-}
+	// AuthorizeResponse represents LINE Notify authorize response
+	AuthorizeResponse struct {
+		Code             string
+		State            string
+		Error            string
+		ErrorDescription string
+	}
+)
 
-func NewAuthorization(clientID, redirectURI string) (*AuthorizationClient, error) {
-	state, err := generateHash()
+// New returns Client
+func New(clientID, redirectURI string) (*Client, error) {
+	randomID, err := uuid.NewRandom()
 	if err != nil {
 		return nil, err
 	}
 
-	return &AuthorizationClient{
+	return &Client{
 		ClientID:     clientID,
 		RedirectURI:  redirectURI,
 		ResponseMode: "form_post",
-		State:        state,
+		State:        randomID.String(),
 	}, nil
 }
 
-func (c *AuthorizationClient) RequestURL() (string, error) {
+// RequestURL builds request url with parameters
+func (c *Client) RequestURL() (string, error) {
 	u, err := url.Parse("https://notify-bot.line.me/oauth/authorize")
 	if err != nil {
 		return "", err
@@ -55,7 +60,8 @@ func (c *AuthorizationClient) RequestURL() (string, error) {
 	return u.String(), nil
 }
 
-func (c *AuthorizationClient) Redirect(w http.ResponseWriter, req *http.Request) error {
+// Redirect redirect to request url
+func (c *Client) Redirect(w http.ResponseWriter, req *http.Request) error {
 	urlStr, err := c.RequestURL()
 	if err != nil {
 		return err
@@ -64,17 +70,9 @@ func (c *AuthorizationClient) Redirect(w http.ResponseWriter, req *http.Request)
 	return nil
 }
 
-func generateHash() (string, error) {
-	b := make([]byte, 32)
-	_, err := rand.Read(b)
-	if err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(b), nil
-}
-
-func ParseAuthorization(r *http.Request) (*AuthorizationResponse, error) {
-	resp := &AuthorizationResponse{
+// ParseAuthorize parses authorize request
+func ParseAuthorize(r *http.Request) (*AuthorizeResponse, error) {
+	resp := &AuthorizeResponse{
 		Code:             r.FormValue("code"),
 		State:            r.FormValue("state"),
 		Error:            r.FormValue("error"),

auth_test.go → auth/auth_test.go

@@ -1,13 +1,13 @@
-package linenotify
+package auth
 
 import (
 	"net/http"
 	"net/url"
 	"testing"
 )
 
-func TestNewAuthorization(t *testing.T) {
-	req, err := NewAuthorization("id", "http://localhost")
+func TestNew(t *testing.T) {
+	req, err := New("id", "http://localhost")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -16,13 +16,13 @@ func TestNewAuthorization(t *testing.T) {
 		t.Errorf("Expect form_post, got %v", req.ResponseMode)
 	}
 
-	if len(req.State) != 44 {
+	if len(req.State) != 36 {
 		t.Errorf("Expect state length 44, got %v", len(req.State))
 	}
 }
 
-func TestAuthorization_RequestURL(t *testing.T) {
-	req, err := NewAuthorization("id", "http://localhost/linenotify_test")
+func TestClient_RequestURL(t *testing.T) {
+	req, err := New("id", "http://localhost/linenotify_test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -57,7 +57,7 @@ func TestAuthorization_RequestURL(t *testing.T) {
 	}
 }
 
-func TestParseAuthorization(t *testing.T) {
+func TestParseAuthorize(t *testing.T) {
 
 	tests := []struct {
 		urlValues   url.Values
@@ -80,7 +80,7 @@ func TestParseAuthorization(t *testing.T) {
 
 	for _, test := range tests {
 		req := &http.Request{Form: test.urlValues}
-		resp, err := ParseAuthorization(req)
+		resp, err := ParseAuthorize(req)
 
 		if test.expectError {
 			if err == nil {

notify.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 )
 
@@ -100,12 +101,12 @@ func (c *Client) requestBodyWithImage(message string, image io.Reader) (io.Reade
 		return nil, "", err
 	}
 
-	filename, err := generateHash()
+	randomID, err := uuid.NewRandom()
 	if err != nil {
 		return nil, "", err
 	}
 
-	fw, err := w.CreateFormFile("imageFile", filename)
+	fw, err := w.CreateFormFile("imageFile", randomID.String())
 	if err != nil {
 		return nil, "", err
 	}