Skip to content

Fix/external id notification #1465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LinkinStars merged 4 commits into from
Dec 29, 2025
+21 −1
Merged

Fix/external id notification #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3000e3a
Fix/translation (#1460)
LinkinStars Dec 15, 2025
a9ade92
fix(notification): use SSO provider for external_id lookup in notific…
IfDougelseSa Dec 24, 2025
c843ccf
fix(review): notifications from the specific external system will tak…
IfDougelseSa Dec 26, 2025
c87b4bf
Merge branch 'dev' into fix/external-id-notification
IfDougelseSa Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/repo/user_external_login/user_external_login_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (ur *userExternalLoginRepo) GetByUserID(ctx context.Context, provider, user
func (ur *userExternalLoginRepo) GetUserExternalLoginList(ctx context.Context, userID string) (
resp []*entity.UserExternalLogin, err error) {
resp = make([]*entity.UserExternalLogin, 0)
err = ur.data.DB.Context(ctx).Where("user_id = ?", userID).Find(&resp)
err = ur.data.DB.Context(ctx).Where("user_id = ?", userID).OrderBy("updated_at DESC").Find(&resp)
if err != nil {
err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
}
Expand Down
13 changes: 13 additions & 0 deletions internal/service/notification/new_question_notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,19 @@ func (ns *ExternalNotificationService) syncNewQuestionNotificationToPlugin(ctx c
}
}

// Get all external logins as fallback
externalLogins, err := ns.userExternalLoginRepo.GetUserExternalLoginList(ctx, subscriberUserID)
if err != nil {
log.Errorf("get user external login list failed for user %s: %v", subscriberUserID, err)
} else if len(externalLogins) > 0 {
newMsg.ReceiverExternalID = externalLogins[0].ExternalID
if len(externalLogins) > 1 {
log.Debugf("user %s has %d SSO logins, using most recent: provider=%s",
subscriberUserID, len(externalLogins), externalLogins[0].Provider)
}
}

// Try to get external login specific to this plugin (takes precedence over fallback)
userInfo, exist, err := ns.userExternalLoginRepo.GetByUserID(ctx, fn.Info().SlugName, subscriberUserID)
if err != nil {
log.Errorf("get user external login info failed: %v", err)
Expand Down
7 changes: 7 additions & 0 deletions internal/service/notification_common/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,13 @@ func (ns *NotificationCommon) syncNotificationToPlugin(ctx context.Context, objI
}
}

externalLogins, err := ns.userExternalLoginRepo.GetUserExternalLoginList(ctx, msg.ReceiverUserID)
if err != nil {
log.Errorf("get user external login list failed for user %s: %v", msg.ReceiverUserID, err)
} else if len(externalLogins) > 0 {
pluginNotificationMsg.ReceiverExternalID = externalLogins[0].ExternalID
}

_ = plugin.CallNotification(func(fn plugin.Notification) error {
userInfo, exist, err := ns.userExternalLoginRepo.GetByUserID(ctx, fn.Info().SlugName, msg.ReceiverUserID)
if err != nil {
Expand Down