Add mocks and unit tests to http and msgraph packages

Makefile

@@ -79,6 +79,15 @@ golint:
 	$(GOPATH)/bin/golint -set_exit_status ./...
 	@echo lint success
 
+## Generates mock golang interfaces for testing
+mock:
+ifneq ($(HAS_SERVER),)
+	go install github.com/golang/mock/mockgen
+	mockgen -destination server/user/mock_user/mock_oauth2_store.go github.com/mattermost/mattermost-plugin-msoffice/server/user OAuth2StateStore
+	mockgen -destination server/utils/mock_utils/mock_bot_poster.go github.com/mattermost/mattermost-plugin-msoffice/server/utils BotPoster
+	mockgen -destination server/kvstore/mock_kvstore/mock_kvstore.go github.com/mattermost/mattermost-plugin-msoffice/server/kvstore KVStore
+endif
+
 ## Builds the server, if it exists, including support for multiple architectures.
 .PHONY: server
 server:

go.mod

@@ -3,7 +3,9 @@ module github.com/mattermost/mattermost-plugin-msoffice
 go 1.13
 
 require (
+	github.com/golang/mock v1.2.0
 	github.com/gorilla/mux v1.7.3
+	github.com/jarcoal/httpmock v1.0.4
 	github.com/jkrecek/msgraph-go v0.0.0-20190328140430-9f7466d8cb1f
 	github.com/mattermost/mattermost-server v0.0.0-20190927121038-340287890a78
 	github.com/pkg/errors v0.8.1

server/http/http.go

@@ -21,6 +21,7 @@ type Handler struct {
 	Config            *config.Config
 	UserStore         user.Store
 	API               plugin.API
+	OAuth2StateStore  user.OAuth2StateStore
 	BotPoster         utils.BotPoster
 	IsAuthorizedAdmin func(userId string) (bool, error)
 	root              *mux.Router
@@ -35,8 +36,8 @@ func (h *Handler) InitRouter() {
 
 	oauth2 := h.root.PathPrefix("/oauth2").Subrouter()
 	oauth2.Use(authorizationRequired)
-	oauth2.HandleFunc("/connect", h.oauth2Connect).Methods("GET")
-	oauth2.HandleFunc("/complete", h.oauth2Complete).Methods("GET")
+	oauth2.HandleFunc("/connect", h.OAuth2Connect).Methods("GET")
+	oauth2.HandleFunc("/complete", h.OAuth2Complete).Methods("GET")
 
 	h.root.Handle("{anything:.*}", http.NotFoundHandler())
 	return

server/http/oauth2_complete.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mattermost/mattermost-plugin-msoffice/server/user"
 )
 
-func (h *Handler) oauth2Complete(w http.ResponseWriter, r *http.Request) {
+func (h *Handler) OAuth2Complete(w http.ResponseWriter, r *http.Request) {
 	authedUserID := r.Header.Get("Mattermost-User-ID")
 	if authedUserID == "" {
 		http.Error(w, "Not authorized", http.StatusUnauthorized)
@@ -31,8 +31,7 @@ func (h *Handler) oauth2Complete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	state := r.URL.Query().Get("state")
-	stateStore := user.NewOAuth2StateStore(h.API)
-	err := stateStore.Verify(state)
+	err := h.OAuth2StateStore.Verify(state)
 	if err != nil {
 		http.Error(w, "missing stored state: "+err.Error(), http.StatusBadRequest)
 		return

server/http/oauth2_connect.go

@@ -12,10 +12,9 @@ import (
 	"github.com/mattermost/mattermost-server/model"
 
 	"github.com/mattermost/mattermost-plugin-msoffice/server/msgraph"
-	"github.com/mattermost/mattermost-plugin-msoffice/server/user"
 )
 
-func (h *Handler) oauth2Connect(w http.ResponseWriter, r *http.Request) {
+func (h *Handler) OAuth2Connect(w http.ResponseWriter, r *http.Request) {
 	userID := r.Header.Get("Mattermost-User-ID")
 	if userID == "" {
 		http.Error(w, "Not authorized", http.StatusUnauthorized)
@@ -24,8 +23,7 @@ func (h *Handler) oauth2Connect(w http.ResponseWriter, r *http.Request) {
 
 	conf := msgraph.GetOAuth2Config(h.Config)
 	state := fmt.Sprintf("%v_%v", model.NewId()[0:15], userID)
-	stateStore := user.NewOAuth2StateStore(h.API)
-	err := stateStore.Store(state)
+	err := h.OAuth2StateStore.Store(state)
 	if err != nil {
 		h.jsonError(w, err)
 		return

server/http/testhttp/mock_response_writer.go

@@ -0,0 +1,41 @@
+package testhttp
+
+import "net/http"
+
+var (
+	_ http.ResponseWriter = &mockResponseWriter{}
+)
+
+func defaultMockResponseWriter() *mockResponseWriter {
+	return &mockResponseWriter{
+		HeaderMap:  make(http.Header),
+		Bytes:      make([]byte, 0),
+		Err:        nil,
+		StatusCode: http.StatusOK,
+	}
+}
+
+type mockResponseWriter struct {
+	HeaderMap  http.Header
+	Bytes      []byte
+	Err        error
+	StatusCode int
+}
+
+func (rw *mockResponseWriter) Header() http.Header {
+	return rw.HeaderMap
+}
+
+func (rw *mockResponseWriter) Write(bytes []byte) (int, error) {
+	if rw.Err != nil {
+		return 0, rw.Err
+	}
+
+	rw.Bytes = append(rw.Bytes, bytes...)
+
+	return len(rw.Bytes), nil
+}
+
+func (rw *mockResponseWriter) WriteHeader(statusCode int) {
+	rw.StatusCode = statusCode
+}