immutable user.KeyAccessToken

topfreegames · Oct 4, 2017 · e77c2be · e77c2be
1 parent 415f997
commit e77c2be
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/api/login.go b/api/login.go
@@ -108,7 +108,9 @@ func (l *LoginAccessHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	body := fmt.Sprintf(`{"token": "%s"}`, token.AccessToken)
+	keyAccessToken, err := login.GetKeyAccessToken(email, l.App.DB)
+
+	body := fmt.Sprintf(`{"token": "%s"}`, keyAccessToken)
 
 	Write(w, http.StatusOK, body)
 	logger.Debug("Returning access token")

diff --git a/api/login_test.go b/api/login_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/topfreegames/maestro/login"
 )
 
 var _ = Describe("Login", func() {
@@ -109,11 +110,18 @@ var _ = Describe("Login", func() {
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`,
 				gomock.Any(),
 			)
+			mockDb.EXPECT().Query(
+				gomock.Any(),
+				"SELECT key_access_token FROM users WHERE email = ?",
+				gomock.Any(),
+			).Do(func(user *login.User, query string, modifier string) {
+				user.KeyAccessToken = token.AccessToken
+			})
 
 			app.Router.ServeHTTP(recorder, request)
 			Expect(recorder.Code).To(Equal(http.StatusOK))
@@ -193,7 +201,7 @@ var _ = Describe("Login", func() {
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`,
 				gomock.Any(),
@@ -233,11 +241,18 @@ var _ = Describe("Login", func() {
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`,
 				gomock.Any(),
 			)
+			mockDb.EXPECT().Query(
+				gomock.Any(),
+				"SELECT key_access_token FROM users WHERE email = ?",
+				gomock.Any(),
+			).Do(func(user *login.User, query string, modifier string) {
+				user.KeyAccessToken = token.AccessToken
+			})
 
 			app.Router.ServeHTTP(recorder, request)
 			Expect(recorder.Code).To(Equal(http.StatusOK))

diff --git a/login/token.go b/login/token.go
@@ -30,7 +30,7 @@ func SaveToken(token *oauth2.Token, email, keyAccessToken string, db interfaces.
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`
 	if token.RefreshToken == "" {
@@ -61,6 +61,14 @@ type DestinationToken struct {
 	TokenType    string    `db:"token_type"`
 }
 
+// GetKeyAccessToken returns key_access_token for a users' email in DB
+func GetKeyAccessToken(email string, db interfaces.DB) (string, error) {
+	user := &User{}
+	query := "SELECT key_access_token FROM users WHERE email = ?"
+	_, err := db.Query(user, query, email)
+	return user.KeyAccessToken, err
+}
+
 //GetToken reads token from DB
 func GetToken(accessToken string, db interfaces.DB) (*oauth2.Token, error) {
 	query := `SELECT access_token, refresh_token, expiry, token_type

diff --git a/login/token_test.go b/login/token_test.go
@@ -45,7 +45,7 @@ var _ = Describe("Token", func() {
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`, gomock.Any())
 
@@ -58,7 +58,7 @@ var _ = Describe("Token", func() {
 	VALUES(?key_access_token, ?access_token, ?refresh_token, ?expiry, ?token_type, ?email)
 	ON CONFLICT(email) DO UPDATE
 		SET access_token = excluded.access_token,
-				key_access_token = excluded.access_token,
+				key_access_token = users.key_access_token,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`, gomock.Any()).Return(nil, errors.New("db error"))