diff --git a/src/console/angular.json b/src/console/angular.json
index eda50a2..6993dac 100644
--- a/src/console/angular.json
+++ b/src/console/angular.json
@@ -84,7 +84,8 @@
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.local.ts"
}
- ]
+ ],
+ "baseHref": "/"
},
"cluster-dev": {
"buildOptimizer": false,
@@ -98,7 +99,8 @@
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.cluster-dev.ts"
}
- ]
+ ],
+ "baseHref": "/"
}
},
"defaultConfiguration": "production"
diff --git a/src/console/src/app/components/dashboard/admin/admin.component.html b/src/console/src/app/components/dashboard/admin/admin.component.html
index 9fd1a47..52e83cd 100644
--- a/src/console/src/app/components/dashboard/admin/admin.component.html
+++ b/src/console/src/app/components/dashboard/admin/admin.component.html
@@ -1,4 +1,5 @@
diff --git a/src/console/src/environments/environment.local.ts b/src/console/src/environments/environment.local.ts
index 4395409..5529c58 100644
--- a/src/console/src/environments/environment.local.ts
+++ b/src/console/src/environments/environment.local.ts
@@ -1,6 +1,6 @@
export const environment = {
production: false,
- restURL: 'https://localhost:8080',
+ restURL: 'http://localhost:8080',
apiVersion: 'v1',
jwtToken: 'token',
languages: ['en', 'it'],
diff --git a/src/server/authentication/login.go b/src/server/authentication/login.go
index 57a41a3..ee08c7e 100644
--- a/src/server/authentication/login.go
+++ b/src/server/authentication/login.go
@@ -40,7 +40,7 @@ func LoginCheck(auth models.Auth) (string, error) {
return "", errors.New("password is not correct")
}
- token, err := GenerateToken(user.Name)
+ token, err := GenerateToken(user)
if err != nil {
return "", err
diff --git a/src/server/authentication/token.go b/src/server/authentication/token.go
index f86c0a2..177d15c 100644
--- a/src/server/authentication/token.go
+++ b/src/server/authentication/token.go
@@ -19,7 +19,7 @@ import (
var tokenSecret = utils.IfNull(os.Getenv("API_SECRET"), "francesco")
var tokenExpiration = utils.IfNull(os.Getenv("API_TOKEN_EXPIRATION"), "24")
-func GenerateToken(username string) (string, error) {
+func GenerateToken(user models.User) (string, error) {
token_lifespan, err := strconv.Atoi(tokenExpiration)
@@ -29,7 +29,15 @@ func GenerateToken(username string) (string, error) {
claims := jwt.MapClaims{}
claims["authorized"] = true
- claims["username"] = username
+ claims["id"] = user.Id
+ claims["username"] = user.Name
+
+ if user.IsAdmin {
+ claims["role"] = "Admin"
+ } else {
+ claims["role"] = "User"
+ }
+
claims["exp"] = time.Now().Add(time.Hour * time.Duration(token_lifespan)).Unix()
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)