Fix: New login updates key_access_token

topfreegames · Jun 15, 2017 · 7551627 · 7551627
1 parent a6973e3
commit 7551627
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/api/login_test.go b/api/login_test.go
@@ -109,6 +109,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,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`,
 				gomock.Any(),
@@ -192,6 +193,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,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`,
 				gomock.Any(),

diff --git a/helm/charts/maestro/Chart.yaml b/helm/charts/maestro/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro
 home: https://github.com/topfreegames/maestro
 description: Maestro api and worker
-version: 2.9.0
+version: 2.9.1
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/login/token.go b/login/token.go
@@ -30,6 +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,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`
 	if token.RefreshToken == "" {

diff --git a/login/token_test.go b/login/token_test.go
@@ -45,6 +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,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`, gomock.Any())
 
@@ -57,6 +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,
 				refresh_token = excluded.refresh_token,
 				expiry = excluded.expiry`, gomock.Any()).Return(nil, errors.New("db error"))