Skip to content

Commit fe910c3

Browse files
committed
fix: spelling
1 parent 337ef33 commit fe910c3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

http/controller/api/ouath.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
277277
return
278278
}
279279
//绑定, 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)
281281
if err != nil {
282282
c.String(http.StatusInternalServerError, response.TranslateMsg(c, "BindFail"))
283283
return
@@ -295,15 +295,15 @@ func (o *Oauth) OauthCallback(c *gin.Context) {
295295
if !*oa.AutoRegister {
296296
//c.String(http.StatusInternalServerError, "还未绑定用户,请先绑定")
297297

298-
v.ThirdName = userData.PrefferedUsername
298+
v.ThirdName = userData.PreferredUsername
299299
v.ThirdOpenId = userData.Sub
300300
url := global.Config.Rustdesk.ApiServer + "/_admin/#/oauth/bind/" + cacheKey
301301
c.Redirect(http.StatusFound, url)
302302
return
303303
}
304304

305305
//自动注册
306-
u = service.AllService.UserService.RegisterByOidc(userData.PrefferedUsername, userData.Sub)
306+
u = service.AllService.UserService.RegisterByOidc(userData.PreferredUsername, userData.Sub)
307307
if u.Id == 0 {
308308
c.String(http.StatusInternalServerError, response.TranslateMsg(c, "OauthRegisterFailed"))
309309
return

service/oauth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type OidcUserdata struct {
9292
Email string `json:"email"`
9393
VerifiedEmail bool `json:"email_verified"`
9494
Name string `json:"name"`
95-
PrefferedUsername string `json:"preffered_username"`
95+
PreferredUsername string `json:"preferred_username"`
9696
}
9797

9898
type OauthCacheItem struct {

service/user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ func (us *UserService) RegisterByGoogle(name string, email string) *model.User {
224224
return us.RegisterByOauth(model.OauthTypeGoogle, name, email)
225225
}
226226

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)
230230
}
231231

232232
// RegisterByOauth 注册

0 commit comments

Comments
 (0)