diff --git a/object/user.go b/object/user.go
index ed7a8c7b..1e8fc845 100644
--- a/object/user.go
+++ b/object/user.go
@@ -79,7 +79,7 @@ type User struct {
PreHash string `xorm:"varchar(100)" json:"preHash"`
Groups []string `xorm:"varchar(1000)" json:"groups"`
AccessKey string `xorm:"varchar(100)" json:"accessKey"`
- SecretKey string `xorm:"varchar(100)" json:"secretKey"`
+ AccessSecret string `xorm:"varchar(100)" json:"accessSecret"`
CreatedIp string `xorm:"varchar(100)" json:"createdIp"`
LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"`
@@ -508,7 +508,7 @@ func UpdateUser(id string, user *User, columns []string, isAdmin bool) (bool, er
"owner", "display_name", "avatar",
"location", "address", "country_code", "region", "language", "affiliation", "title", "homepage", "bio", "tag", "language", "gender", "birthday", "education", "score", "karma", "ranking", "signup_application",
"is_admin", "is_global_admin", "is_forbidden", "is_deleted", "hash", "is_default_avatar", "properties", "webauthnCredentials", "managedAccounts",
- "signin_wrong_times", "last_signin_wrong_time", "groups", "access_key", "secret_key",
+ "signin_wrong_times", "last_signin_wrong_time", "groups", "access_key", "access_secret",
"github", "google", "qq", "wechat", "facebook", "dingtalk", "weibo", "gitee", "linkedin", "wecom", "lark", "gitlab", "adfs",
"baidu", "alipay", "casdoor", "infoflow", "apple", "azuread", "slack", "steam", "bilibili", "okta", "douyin", "line", "amazon",
"auth0", "battlenet", "bitbucket", "box", "cloudfoundry", "dailymotion", "deezer", "digitalocean", "discord", "dropbox",
@@ -922,7 +922,7 @@ func AddUserkeys(user *User, isAdmin bool) (bool, error) {
}
user.AccessKey = util.GenerateId()
- user.SecretKey = util.GenerateId()
+ user.AccessSecret = util.GenerateId()
return UpdateUser(user.GetId(), user, []string{}, isAdmin)
}
diff --git a/routers/authz_filter.go b/routers/authz_filter.go
index 80139f07..dc245f1f 100644
--- a/routers/authz_filter.go
+++ b/routers/authz_filter.go
@@ -26,10 +26,10 @@ import (
)
type Object struct {
- Owner string `json:"owner"`
- Name string `json:"name"`
- AccessKey string `json:"accessKey"`
- SecretKey string `json:"secretKey"`
+ Owner string `json:"owner"`
+ Name string `json:"name"`
+ AccessKey string `json:"accessKey"`
+ AccessSecret string `json:"accessSecret"`
}
func getUsername(ctx *context.Context) (username string) {
@@ -107,14 +107,14 @@ func getKeys(ctx *context.Context) (string, string) {
method := ctx.Request.Method
if method == http.MethodGet {
- accessKey := ctx.Input.Query("accesskey")
- secretKey := ctx.Input.Query("secretkey")
- return accessKey, secretKey
+ accessKey := ctx.Input.Query("accessKey")
+ accessSecret := ctx.Input.Query("accessSecret")
+ return accessKey, accessSecret
} else {
body := ctx.Input.RequestBody
if len(body) == 0 {
- return ctx.Request.Form.Get("accesskey"), ctx.Request.Form.Get("secretkey")
+ return ctx.Request.Form.Get("accessKey"), ctx.Request.Form.Get("accessSecret")
}
var obj Object
@@ -123,7 +123,7 @@ func getKeys(ctx *context.Context) (string, string) {
return "", ""
}
- return obj.AccessKey, obj.SecretKey
+ return obj.AccessKey, obj.AccessSecret
}
}
diff --git a/routers/base.go b/routers/base.go
index 3b2b649a..cee34bb3 100644
--- a/routers/base.go
+++ b/routers/base.go
@@ -85,12 +85,13 @@ func getUsernameByClientIdSecret(ctx *context.Context) string {
}
func getUsernameByKeys(ctx *context.Context) string {
- accessKey, secretKey := getKeys(ctx)
+ accessKey, accessSecret := getKeys(ctx)
user, err := object.GetUserByAccessKey(accessKey)
if err != nil {
panic(err)
}
- if user != nil && secretKey == user.SecretKey {
+
+ if user != nil && accessSecret == user.AccessSecret {
return user.GetId()
}
return ""
diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js
index 2a907f41..8e538a18 100644
--- a/web/src/UserEditPage.js
+++ b/web/src/UserEditPage.js
@@ -724,10 +724,10 @@ class UserEditPage extends React.Component {
- {Setting.getLabel(i18next.t("general:Secret key"), i18next.t("general:Secret key - Tooltip"))} :
+ {Setting.getLabel(i18next.t("general:Access secret"), i18next.t("general:Access secret - Tooltip"))} :
-
+
diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json
index c4c31147..d6a0b310 100644
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -162,6 +162,12 @@
"Verify": "überprüfen"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Aktion",
"Adapter": "Adapter",
"Adapter - Tooltip": "Tabellenname des Policy Stores",
diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json
index 093be9c4..b0387043 100644
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -162,6 +162,12 @@
"Verify": "Verify"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Action",
"Adapter": "Adapter",
"Adapter - Tooltip": "Table name of the policy store",
diff --git a/web/src/locales/es/data.json b/web/src/locales/es/data.json
index e01e0d7d..e7944d18 100644
--- a/web/src/locales/es/data.json
+++ b/web/src/locales/es/data.json
@@ -162,6 +162,12 @@
"Verify": "Verificar"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Acción",
"Adapter": "Adaptador",
"Adapter - Tooltip": "Nombre de la tabla de la tienda de políticas",
diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json
index 4d4e5c5f..f7d3c044 100644
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -162,6 +162,12 @@
"Verify": "Vérifier"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Action",
"Adapter": "S'adapter",
"Adapter - Tooltip": "Nom de la table du magasin de politique",
diff --git a/web/src/locales/id/data.json b/web/src/locales/id/data.json
index da624d11..81efc9b1 100644
--- a/web/src/locales/id/data.json
+++ b/web/src/locales/id/data.json
@@ -162,6 +162,12 @@
"Verify": "Memverifikasi"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Aksi",
"Adapter": "Adapter",
"Adapter - Tooltip": "Nama tabel dari penyimpanan kebijakan",
diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json
index 27eda2e7..fca4a421 100644
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -162,6 +162,12 @@
"Verify": "検証"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "アクション",
"Adapter": "アダプター",
"Adapter - Tooltip": "ポリシー・ストアのテーブル名",
diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json
index 96d84d58..4cf225e7 100644
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -162,6 +162,12 @@
"Verify": "검증하다"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "동작",
"Adapter": "어댑터",
"Adapter - Tooltip": "정책 저장소의 테이블 이름",
diff --git a/web/src/locales/pt/data.json b/web/src/locales/pt/data.json
index 84721f9e..fcb57e5e 100644
--- a/web/src/locales/pt/data.json
+++ b/web/src/locales/pt/data.json
@@ -162,6 +162,12 @@
"Verify": "Verificar"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Ação",
"Adapter": "Adaptador",
"Adapter - Tooltip": "Nome da tabela do armazenamento de políticas",
diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json
index e5d35eaa..6106c36b 100644
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -162,6 +162,12 @@
"Verify": "Проверить"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Действие",
"Adapter": "Адаптер",
"Adapter - Tooltip": "Имя таблицы хранилища политик",
diff --git a/web/src/locales/vi/data.json b/web/src/locales/vi/data.json
index 4124c096..951e8c67 100644
--- a/web/src/locales/vi/data.json
+++ b/web/src/locales/vi/data.json
@@ -162,6 +162,12 @@
"Verify": "Xác thực"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "Hành động",
"Adapter": "Bộ chuyển đổi",
"Adapter - Tooltip": "Tên bảng của kho lưu trữ chính sách",
diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json
index a612d201..54c3addc 100644
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -162,6 +162,12 @@
"Verify": "验证"
},
"general": {
+ "API key": "API key",
+ "API key - Tooltip": "API key - Tooltip",
+ "Access key": "Access key",
+ "Access key - Tooltip": "Access key - Tooltip",
+ "Access secret": "Access secret",
+ "Access secret - Tooltip": "Access secret - Tooltip",
"Action": "操作",
"Adapter": "适配器",
"Adapter - Tooltip": "策略存储的表名",