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.
add default notification config for users registered by third party connector
hgaol72ff929fab0d
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.goindex cef3f985..2f01bae6 100644--- a/cmd/wire_gen.go+++ b/cmd/wire_gen.go@@ -149,9 +149,9 @@ func initApplication(debug bool, serverConf *conf.Server, dbConf *data.Database,userRoleRelService := role2.NewUserRoleRelService(userRoleRelRepo, roleService)userCommon := usercommon.NewUserCommon(userRepo, userRoleRelService, authService, siteInfoCommonService)userExternalLoginRepo := user_external_login.NewUserExternalLoginRepo(dataData)- userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo)userNotificationConfigRepo := user_notification_config.NewUserNotificationConfigRepo(dataData)userNotificationConfigService := user_notification_config2.NewUserNotificationConfigService(userRepo, userNotificationConfigRepo)+ userExternalLoginService := user_external_login2.NewUserExternalLoginService(userRepo, userCommon, userExternalLoginRepo, emailService, siteInfoCommonService, userActiveActivityRepo, userNotificationConfigService)userService := service.NewUserService(userRepo, userActiveActivityRepo, activityRepo, emailService, authService, siteInfoCommonService, userRoleRelService, userCommon, userExternalLoginService, userNotificationConfigRepo, userNotificationConfigService)captchaRepo := captcha.NewCaptchaRepo(dataData)captchaService := action.NewCaptchaService(captchaRepo)diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.goindex db2fb75e..6672936b 100644--- a/internal/service/user_external_login/user_external_login_service.go+++ b/internal/service/user_external_login/user_external_login_service.go@@ -23,6 +23,7 @@ import ("context""encoding/json""fmt"+ "github.com/apache/incubator-answer/internal/service/user_notification_config""time""github.com/apache/incubator-answer/internal/base/constant"@@ -56,12 +57,13 @@ type UserExternalLoginRepo interface {// UserExternalLoginService user external login servicetype UserExternalLoginService struct {- userRepo usercommon.UserRepo- userExternalLoginRepo UserExternalLoginRepo- userCommonService *usercommon.UserCommon- emailService *export.EmailService- siteInfoCommonService siteinfo_common.SiteInfoCommonService- userActivity activity.UserActiveActivityRepo+ userRepo usercommon.UserRepo+ userExternalLoginRepo UserExternalLoginRepo+ userCommonService *usercommon.UserCommon+ emailService *export.EmailService+ siteInfoCommonService siteinfo_common.SiteInfoCommonService+ userActivity activity.UserActiveActivityRepo+ userNotificationConfigService *user_notification_config.UserNotificationConfigService}// NewUserExternalLoginService new user external login service@@ -72,14 +74,16 @@ func NewUserExternalLoginService(emailService *export.EmailService,siteInfoCommonService siteinfo_common.SiteInfoCommonService,userActivity activity.UserActiveActivityRepo,+ userNotificationConfigService *user_notification_config.UserNotificationConfigService,) *UserExternalLoginService {return &UserExternalLoginService{- userRepo: userRepo,- userCommonService: userCommonService,- userExternalLoginRepo: userExternalLoginRepo,- emailService: emailService,- siteInfoCommonService: siteInfoCommonService,- userActivity: userActivity,+ userRepo: userRepo,+ userCommonService: userCommonService,+ userExternalLoginRepo: userExternalLoginRepo,+ emailService: emailService,+ siteInfoCommonService: siteInfoCommonService,+ userActivity: userActivity,+ userNotificationConfigService: userNotificationConfigService,}}@@ -165,6 +169,11 @@ func (us *UserExternalLoginService) ExternalLogin(log.Error(err)}+ // set default user notification config for external user+ if err := us.userNotificationConfigService.SetDefaultUserNotificationConfig(ctx, []string{oldUserInfo.ID}); err != nil {+ log.Errorf("set default user notification config failed, err: %v", err)+ }+accessToken, _, err := us.userCommonService.CacheLoginUserInfo(ctx, oldUserInfo.ID, newMailStatus, oldUserInfo.Status, oldExternalLoginUserInfo.ExternalID)return &schema.UserExternalLoginResp{AccessToken: accessToken}, err