Tao Chen 1 год назад
Родитель
Сommit
fe910c37cf
3 измененных файлов с 7 добавлено и 7 удалено
  1. 3 3
      http/controller/api/ouath.go
  2. 1 1
      service/oauth.go
  3. 3 3
      service/user.go

+ 3 - 3
http/controller/api/ouath.go

@@ -277,7 +277,7 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
277
 				return
277
 				return
278
 			}
278
 			}
279
 			//绑定, user preffered_username as username
279
 			//绑定, user preffered_username as username
280
-			err = service.AllService.OauthService.BindOidcUser(userData.Sub, userData.PrefferedUsername, v.UserId)
280
+			err = service.AllService.OauthService.BindOidcUser(userData.Sub, userData.PreferredUsername, v.UserId)
281
 			if err != nil {
281
 			if err != nil {
282
 				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
282
 				c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
283
 				return
283
 				return
@@ -295,7 +295,7 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
295
 				if !*oa.AutoRegister {
295
 				if !*oa.AutoRegister {
296
 					//c.String(http.StatusInternalServerError, "还未绑定用户,请先绑定")
296
 					//c.String(http.StatusInternalServerError, "还未绑定用户,请先绑定")
297
 
297
 
298
-					v.ThirdName = userData.PrefferedUsername
298
+					v.ThirdName = userData.PreferredUsername
299
 					v.ThirdOpenId = userData.Sub
299
 					v.ThirdOpenId = userData.Sub
300
 					url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
300
 					url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
301
 					c.Redirect(http.StatusFound, url)
301
 					c.Redirect(http.StatusFound, url)
@@ -303,7 +303,7 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
303
 				}
303
 				}
304
 
304
 
305
 				//自动注册
305
 				//自动注册
306
-				u = service.AllService.UserService.RegisterByOidc(userData.PrefferedUsername, userData.Sub)
306
+				u = service.AllService.UserService.RegisterByOidc(userData.PreferredUsername, userData.Sub)
307
 				if u.Id == 0 {
307
 				if u.Id == 0 {
308
 					c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthRegisterFailed"))
308
 					c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthRegisterFailed"))
309
 					return
309
 					return

+ 1 - 1
service/oauth.go

@@ -92,7 +92,7 @@ type OidcUserdata struct {
92
 	Email         string `json:"email"`
92
 	Email         string `json:"email"`
93
 	VerifiedEmail bool   `json:"email_verified"`
93
 	VerifiedEmail bool   `json:"email_verified"`
94
 	Name          string `json:"name"`
94
 	Name          string `json:"name"`
95
-	PrefferedUsername string `json:"preffered_username"`
95
+	PreferredUsername string `json:"preferred_username"`
96
 }
96
 }
97
 
97
 
98
 type OauthCacheItem struct {
98
 type OauthCacheItem struct {

+ 3 - 3
service/user.go

@@ -224,9 +224,9 @@ func (us *UserService) RegisterByGoogle(name string, email string) *model.User {
224
 	return us.RegisterByOauth(model.OauthTypeGoogle, name, email)
224
 	return us.RegisterByOauth(model.OauthTypeGoogle, name, email)
225
 }
225
 }
226
 
226
 
227
-// RegisterByOidc 注册, use prefferedUsername as username, sub as openid
228
-func (us *UserService) RegisterByOidc(prefferedUsername string, sub string) *model.User {
229
-	return us.RegisterByOauth(model.OauthTypeOidc, prefferedUsername, sub)
227
+// RegisterByOidc 注册, use PreferredUsername as username, sub as openid
228
+func (us *UserService) RegisterByOidc(PreferredUsername string, sub string) *model.User {
229
+	return us.RegisterByOauth(model.OauthTypeOidc, PreferredUsername, sub)
230
 }
230
 }
231
 
231
 
232
 // RegisterByOauth 注册
232
 // RegisterByOauth 注册