Skip to content

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): add display name and username for connector

LinkinStars2ebf057d538d
diff --git a/internal/controller/connector_controller.go b/internal/controller/connector_controller.go
index c375d5a4..7e75add9 100644
--- a/internal/controller/connector_controller.go
+++ b/internal/controller/connector_controller.go
@@ -74,14 +74,15 @@ func (cc *ConnectorController) ConnectorRedirect(connector plugin.Connector) (fn
ctx.Redirect(http.StatusFound, "/50x")
return
}
- log.Debugf("connector received: %+v", userInfo)
+ log.Infof("connector received: %+v", userInfo)
u := &schema.ExternalLoginUserInfoCache{
- Provider: connector.ConnectorSlugName(),
- ExternalID: userInfo.ExternalID,
- Name: userInfo.Name,
- Email: userInfo.Email,
- Avatar: userInfo.Avatar,
- MetaInfo: userInfo.MetaInfo,
+ Provider: connector.ConnectorSlugName(),
+ ExternalID: userInfo.ExternalID,
+ DisplayName: userInfo.DisplayName,
+ Username: userInfo.Username,
+ Email: userInfo.Email,
+ Avatar: userInfo.Avatar,
+ MetaInfo: userInfo.MetaInfo,
}
resp, err := cc.userExternalService.ExternalLogin(ctx, u)
if err != nil {
diff --git a/internal/schema/user_external_login_schema.go b/internal/schema/user_external_login_schema.go
index 674f0c7d..f0351c18 100644
--- a/internal/schema/user_external_login_schema.go
+++ b/internal/schema/user_external_login_schema.go
@@ -40,7 +40,9 @@ type ExternalLoginUserInfoCache struct {
// required. The unique user ID provided by the third-party login
ExternalID string
// optional. This name is used preferentially during registration
- Name string
+ DisplayName string
+ // optional. This username is used preferentially during registration
+ Username string
// optional. If email exist will bind the existing user
Email string
// optional. The avatar URL provided by the third-party login platform
diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.go
index 9e1c272d..523acccb 100644
--- a/internal/service/user_external_login/user_external_login_service.go
+++ b/internal/service/user_external_login/user_external_login_service.go
@@ -127,9 +127,9 @@ func (us *UserExternalLoginService) registerNewUser(ctx context.Context,
externalUserInfo *schema.ExternalLoginUserInfoCache) (userInfo *entity.User, err error) {
userInfo = &entity.User{}
userInfo.EMail = externalUserInfo.Email
- userInfo.DisplayName = externalUserInfo.Name
+ userInfo.DisplayName = externalUserInfo.DisplayName
- userInfo.Username, err = us.userCommonService.MakeUsername(ctx, externalUserInfo.Name)
+ userInfo.Username, err = us.userCommonService.MakeUsername(ctx, externalUserInfo.Username)
if err != nil {
log.Error(err)
userInfo.Username = random.Username()
@@ -183,14 +183,15 @@ func (us *UserExternalLoginService) activeUser(ctx context.Context, oldUserInfo
oldUserInfo.ID, oldUserInfo.MailStatus)
// try to active user email
- if oldUserInfo.MailStatus == entity.EmailStatusAvailable {
- return oldUserInfo.MailStatus, nil
- }
- err = us.userRepo.UpdateEmailStatus(ctx, oldUserInfo.ID, entity.EmailStatusAvailable)
- if err != nil {
- return oldUserInfo.MailStatus, err
+ if oldUserInfo.MailStatus == entity.EmailStatusToBeVerified {
+ err = us.userRepo.UpdateEmailStatus(ctx, oldUserInfo.ID, entity.EmailStatusAvailable)
+ if err != nil {
+ return oldUserInfo.MailStatus, err
+ }
}
+ log.Warn(len(externalUserInfo.Avatar), len(schema.FormatAvatarInfo(oldUserInfo.Avatar)))
+
// try to update user avatar
if len(externalUserInfo.Avatar) > 0 && len(schema.FormatAvatarInfo(oldUserInfo.Avatar)) == 0 {
avatarInfo := &schema.AvatarInfo{
diff --git a/plugin/connector.go b/plugin/connector.go
index db7f797a..f6b89e46 100644
--- a/plugin/connector.go
+++ b/plugin/connector.go
@@ -30,7 +30,9 @@ type ExternalLoginUserInfo struct {
// required. The unique user ID provided by the third-party login
ExternalID string
// optional. This name is used preferentially during registration
- Name string
+ DisplayName string
+ // optional. This username is used preferentially during registration
+ Username string
// optional. If email exist will bind the existing user
Email string
// optional. The avatar URL provided by the third-party login platform