Merge branch '114-authentication-should-return-username-in-token' int…

…o 'main'

Resolve "Authentication should return username in token"

Closes #114

See merge request isard/isardvdi!328

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.1.1] - 2021-09-07
+
+### Fixed
+
+- Authentication user name in token and role in oauth
+
 ## [3.1.0] - 2021-09-01
 
 ### Added

authentication/authentication/authentication.go

@@ -86,6 +86,7 @@ type ClaimsData struct {
 	RoleID     string `json:"role_id"`
 	CategoryID string `json:"category_id"`
 	GroupID    string `json:"group_id"`
+	Name       string `json:"name"`
 }
 
 func (a *Authentication) signToken(u *model.User) (string, error) {
@@ -102,6 +103,7 @@ func (a *Authentication) signToken(u *model.User) (string, error) {
 			u.Role,
 			u.Category,
 			u.Group,
+			u.Name,
 		},
 	})
 
@@ -265,6 +267,10 @@ func (a *Authentication) Callback(ctx context.Context, args map[string]string) (
 	}
 
 	if exists {
+		if err := u.Load(ctx, a.DB); err != nil {
+			return "", "", fmt.Errorf("load user from DB: %w", err)
+		}
+
 		ss, err = a.signToken(u)
 		if err != nil {
 			return "", "", err

frontend/src/components/NewNavBar.vue

@@ -24,7 +24,7 @@
 
           <!-- Right aligned nav items -->
           <b-navbar-nav class="ml-auto">
-            <b-nav-item href="#"><span class="text-white">{{ getUser.username }} [{{ getUser.role_id }}]</span></b-nav-item>
+            <b-nav-item href="#"><span class="text-white">{{ getUser.name }} [{{ getUser.role_id }}]</span></b-nav-item>
 
             <b-nav-item href="#" @click="logout()"
               ><b-icon

frontend/src/store/modules/auth.js

@@ -6,17 +6,7 @@ import * as cookies from 'tiny-cookie'
 
 export default {
   state: {
-    user: {
-      UID: '',
-      Username: '',
-      Provider: '',
-      Category: '',
-      role: '',
-      group: '',
-      name: '',
-      email: '',
-      photo: ''
-    },
+    user: {},
     token: '',
     registerToken: '',
     expirationDate: ''