From 640d3018c9a75e7c85da55c3483396e31a6de994 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Wed, 20 Jan 2016 08:56:09 -0600
Subject: PLT-7 adding loc db calls for oauth table

---
 api/oauth.go | 24 +++++++++++++-----------
 api/team.go  |  2 +-
 api/user.go  |  6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'api')

diff --git a/api/oauth.go b/api/oauth.go
index eb5e0e496..64848d0ce 100644
--- a/api/oauth.go
+++ b/api/oauth.go
@@ -5,12 +5,14 @@ package api
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
+
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
-	"net/http"
-	"net/url"
+	goi18n "github.com/nicksnyder/go-i18n/i18n"
 )
 
 func InitOAuth(r *mux.Router) {
@@ -41,7 +43,7 @@ func registerOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
 	app.ClientSecret = secret
 	app.CreatorId = c.Session.UserId
 
-	if result := <-Srv.Store.OAuth().SaveApp(app); result.Err != nil {
+	if result := <-Srv.Store.OAuth().SaveApp(c.T, app); result.Err != nil {
 		c.Err = result.Err
 		return
 	} else {
@@ -90,7 +92,7 @@ func allowOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 	state := r.URL.Query().Get("state")
 
 	var app *model.OAuthApp
-	if result := <-Srv.Store.OAuth().GetApp(clientId); result.Err != nil {
+	if result := <-Srv.Store.OAuth().GetApp(c.T, clientId); result.Err != nil {
 		c.Err = model.NewAppError("allowOAuth", "server_error: Error accessing the database", "")
 		return
 	} else {
@@ -112,7 +114,7 @@ func allowOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 	authData := &model.AuthData{UserId: c.Session.UserId, ClientId: clientId, CreateAt: model.GetMillis(), RedirectUri: redirectUri, State: state, Scope: scope}
 	authData.Code = model.HashPassword(fmt.Sprintf("%v:%v:%v:%v", clientId, redirectUri, authData.CreateAt, c.Session.UserId))
 
-	if result := <-Srv.Store.OAuth().SaveAuthData(authData); result.Err != nil {
+	if result := <-Srv.Store.OAuth().SaveAuthData(c.T, authData); result.Err != nil {
 		responseData["redirect"] = redirectUri + "?error=server_error&state=" + state
 		w.Write([]byte(model.MapToJson(responseData)))
 		return
@@ -125,20 +127,20 @@ func allowOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(model.MapToJson(responseData)))
 }
 
-func RevokeAccessToken(token string) *model.AppError {
+func RevokeAccessToken(T goi18n.TranslateFunc, token string) *model.AppError {
 
 	schan := Srv.Store.Session().Remove(token)
 	sessionCache.Remove(token)
 
 	var accessData *model.AccessData
-	if result := <-Srv.Store.OAuth().GetAccessData(token); result.Err != nil {
+	if result := <-Srv.Store.OAuth().GetAccessData(T, token); result.Err != nil {
 		return model.NewAppError("RevokeAccessToken", "Error getting access token from DB before deletion", "")
 	} else {
 		accessData = result.Data.(*model.AccessData)
 	}
 
-	tchan := Srv.Store.OAuth().RemoveAccessData(token)
-	cchan := Srv.Store.OAuth().RemoveAuthData(accessData.AuthCode)
+	tchan := Srv.Store.OAuth().RemoveAccessData(T, token)
+	cchan := Srv.Store.OAuth().RemoveAuthData(T, accessData.AuthCode)
 
 	if result := <-tchan; result.Err != nil {
 		return model.NewAppError("RevokeAccessToken", "Error deleting access token from DB", "")
@@ -155,8 +157,8 @@ func RevokeAccessToken(token string) *model.AppError {
 	return nil
 }
 
-func GetAuthData(code string) *model.AuthData {
-	if result := <-Srv.Store.OAuth().GetAuthData(code); result.Err != nil {
+func GetAuthData(T goi18n.TranslateFunc, code string) *model.AuthData {
+	if result := <-Srv.Store.OAuth().GetAuthData(T, code); result.Err != nil {
 		l4g.Error("Couldn't find auth code for code=%s", code)
 		return nil
 	} else {
diff --git a/api/team.go b/api/team.go
index 7ee7b41c9..e55d454e0 100644
--- a/api/team.go
+++ b/api/team.go
@@ -340,7 +340,7 @@ func revokeAllSessions(c *Context, w http.ResponseWriter, r *http.Request) {
 		c.LogAudit("revoked_all=" + id)
 
 		if session.IsOAuth {
-			RevokeAccessToken(session.Token)
+			RevokeAccessToken(c.T, session.Token)
 		} else {
 			sessionCache.Remove(session.Token)
 
diff --git a/api/user.go b/api/user.go
index 66125d242..71426acaa 100644
--- a/api/user.go
+++ b/api/user.go
@@ -713,7 +713,7 @@ func RevokeSessionById(c *Context, sessionId string) {
 		c.LogAudit("session_id=" + session.Id)
 
 		if session.IsOAuth {
-			RevokeAccessToken(session.Token)
+			RevokeAccessToken(c.T, session.Token)
 		} else {
 			sessionCache.Remove(session.Token)
 
@@ -734,7 +734,7 @@ func RevokeAllSession(c *Context, userId string) {
 		for _, session := range sessions {
 			c.LogAuditWithUserId(userId, "session_id="+session.Id)
 			if session.IsOAuth {
-				RevokeAccessToken(session.Token)
+				RevokeAccessToken(c.T, session.Token)
 			} else {
 				sessionCache.Remove(session.Token)
 				if result := <-Srv.Store.Session().Remove(session.Id); result.Err != nil {
@@ -1440,7 +1440,7 @@ func PermanentDeleteUser(c *Context, user *model.User) *model.AppError {
 		return result.Err
 	}
 
-	if result := <-Srv.Store.OAuth().PermanentDeleteAuthDataByUser(user.Id); result.Err != nil {
+	if result := <-Srv.Store.OAuth().PermanentDeleteAuthDataByUser(c.T, user.Id); result.Err != nil {
 		return result.Err
 	}
 
-- 
cgit v1.2.3-1-g7c22