A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(plugin): Third-party login to synchronize user avatars
LinkinStars4c38c7301704
diff --git a/internal/controller/connector_controller.go b/internal/controller/connector_controller.goindex 6f978268..c375d5a4 100644--- a/internal/controller/connector_controller.go+++ b/internal/controller/connector_controller.go@@ -80,6 +80,7 @@ func (cc *ConnectorController) ConnectorRedirect(connector plugin.Connector) (fnExternalID: userInfo.ExternalID,Name: userInfo.Name,Email: userInfo.Email,+ Avatar: userInfo.Avatar,MetaInfo: userInfo.MetaInfo,}resp, err := cc.userExternalService.ExternalLogin(ctx, u)diff --git a/internal/schema/user_external_login_schema.go b/internal/schema/user_external_login_schema.goindex 4176b153..674f0c7d 100644--- a/internal/schema/user_external_login_schema.go+++ b/internal/schema/user_external_login_schema.go@@ -43,6 +43,8 @@ type ExternalLoginUserInfoCache struct {Name string// optional. If email exist will bind the existing userEmail string+ // optional. The avatar URL provided by the third-party login platform+ Avatar string// optional. The original user information provided by the third-party login platformMetaInfo string}diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.goindex 0bd28d21..44dffc15 100644--- a/internal/schema/user_schema.go+++ b/internal/schema/user_schema.go@@ -103,6 +103,12 @@ func (r *GetUserToSetShowResp) GetFromUserEntity(userInfo *entity.User) {r.Avatar = avatarInfo}+const (+ AvatarTypeDefault = "default"+ AvatarTypeGravatar = "gravatar"+ AvatarTypeCustom = "custom"+)+func FormatAvatarInfo(avatarJson string) string {if avatarJson == "" {return ""@@ -113,9 +119,9 @@ func FormatAvatarInfo(avatarJson string) string {return ""}switch avatarInfo.Type {- case "gravatar":+ case AvatarTypeGravatar:return avatarInfo.Gravatar- case "custom":+ case AvatarTypeCustom:return avatarInfo.Customdefault:return ""diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.goindex f1676191..af27b753 100644--- a/internal/service/user_external_login/user_external_login_service.go+++ b/internal/service/user_external_login/user_external_login_service.go@@ -2,6 +2,7 @@ package user_external_loginimport ("context"+ "encoding/json""fmt""time"@@ -127,10 +128,22 @@ func (us *UserExternalLoginService) registerNewUser(ctx context.Context,userInfo = &entity.User{}userInfo.EMail = externalUserInfo.EmailuserInfo.DisplayName = externalUserInfo.Name+userInfo.Username, err = us.userCommonService.MakeUsername(ctx, externalUserInfo.Name)if err != nil {+ log.Error(err)userInfo.Username = random.Username()}++ if len(externalUserInfo.Avatar) > 0 {+ avatarInfo := &schema.AvatarInfo{+ Type: schema.AvatarTypeCustom,+ Custom: externalUserInfo.Avatar,+ }+ avatar, _ := json.Marshal(avatarInfo)+ userInfo.Avatar = string(avatar)+ }+userInfo.MailStatus = entity.EmailStatusToBeVerifieduserInfo.Status = entity.UserStatusAvailableuserInfo.LastLoginDate = time.Now()diff --git a/plugin/connector.go b/plugin/connector.goindex 7afe4ff4..db7f797a 100644--- a/plugin/connector.go+++ b/plugin/connector.go@@ -33,6 +33,8 @@ type ExternalLoginUserInfo struct {Name string// optional. If email exist will bind the existing userEmail string+ // optional. The avatar URL provided by the third-party login platform+ Avatar string// optional. The original user information provided by the third-party login platformMetaInfo string}