aboutsummaryrefslogtreecommitdiff
path: root/internal/route
diff options
context:
space:
mode:
Diffstat (limited to 'internal/route')
-rw-r--r--internal/route/admin/users.go12
-rw-r--r--internal/route/api/v1/admin/user.go12
2 files changed, 9 insertions, 15 deletions
diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go
index 9f71cd1c..8a09690d 100644
--- a/internal/route/admin/users.go
+++ b/internal/route/admin/users.go
@@ -77,17 +77,15 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) {
}
u := &db.User{
- Name: f.UserName,
- Email: f.Email,
- Passwd: f.Password,
- IsActive: true,
- LoginType: db.LoginPlain,
+ Name: f.UserName,
+ Email: f.Email,
+ Passwd: f.Password,
+ IsActive: true,
}
if len(f.LoginType) > 0 {
fields := strings.Split(f.LoginType, "-")
if len(fields) == 2 {
- u.LoginType = db.LoginType(com.StrTo(fields[0]).MustInt())
u.LoginSource = com.StrTo(fields[1]).MustInt64()
u.LoginName = f.LoginName
}
@@ -180,12 +178,10 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
fields := strings.Split(f.LoginType, "-")
if len(fields) == 2 {
- loginType := db.LoginType(com.StrTo(fields[0]).MustInt())
loginSource := com.StrTo(fields[1]).MustInt64()
if u.LoginSource != loginSource {
u.LoginSource = loginSource
- u.LoginType = loginType
}
}
diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go
index 419296af..ef004261 100644
--- a/internal/route/api/v1/admin/user.go
+++ b/internal/route/api/v1/admin/user.go
@@ -32,19 +32,17 @@ func parseLoginSource(c *context.APIContext, u *db.User, sourceID int64, loginNa
return
}
- u.LoginType = source.Type
u.LoginSource = source.ID
u.LoginName = loginName
}
func CreateUser(c *context.APIContext, form api.CreateUserOption) {
u := &db.User{
- Name: form.Username,
- FullName: form.FullName,
- Email: form.Email,
- Passwd: form.Password,
- IsActive: true,
- LoginType: db.LoginPlain,
+ Name: form.Username,
+ FullName: form.FullName,
+ Email: form.Email,
+ Passwd: form.Password,
+ IsActive: true,
}
parseLoginSource(c, u, form.SourceID, form.LoginName)