llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support "+" in syncer column name (#752)

Browse Source 
* feat: support + in syncer column name

Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com>

* feat: trim

Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com>
This commit is contained in:
Yixiang Zhao
2022-05-13 20:24:46 +08:00
committed by GitHub
parent 3ad4b7a43c
commit e5b71a08ae
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
object/syncer_util.go
View File

@ -173,7 +173,18 @@ func (syncer *Syncer) getOriginalUsersFromMap(results []map[string]string) []*Or
} }
for _, tableColumn := range syncer.TableColumns { for _, tableColumn := range syncer.TableColumns {
syncer.setUserByKeyValue(originalUser, tableColumn.CasdoorName, result[tableColumn.Name]) value := ""
if strings.Contains(tableColumn.Name, "+") {
names := strings.Split(tableColumn.Name, "+")
var values []string
for _, name := range names {
values = append(values, result[strings.Trim(name, " ")])
}
value = strings.Join(values, " ")
} else {
value = result[tableColumn.Name]
}
syncer.setUserByKeyValue(originalUser, tableColumn.CasdoorName, value)
} }
if syncer.Type == "Keycloak" { if syncer.Type == "Keycloak" {

2
web/src/Setting.js
View File

@ -836,7 +836,7 @@ export function getSyncerTableColumns(syncer) {
] ]
}, },
{ {
"name":"USERNAME", "name":"LAST_NAME+FIRST_NAME",
"type":"string", "type":"string",
"casdoorName":"DisplayName", "casdoorName":"DisplayName",
"isHashed":true, "isHashed":true,