Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Simplify Space push subscription lookup

Neeraj Gupta62ad77362c18
diff --git a/server/space/controller/notifications.go b/server/space/controller/notifications.go
index 9ea1c694d6..7d8cc2c0af 100644
--- a/server/space/controller/notifications.go
+++ b/server/space/controller/notifications.go
@@ -154,7 +154,7 @@ func (n *SpaceWebPushSender) sendAccountActivity(
}
subscriptions, err := n.WebPushRepo.ListActiveAccountSubscriptions(
context.Background(),
- []int64{recipientUserID},
+ recipientUserID,
)
if err != nil {
log.WithField("event", event).WithError(err).
@@ -253,8 +253,8 @@ func (n *SpaceWebPushSender) sendSubscription(
}, options)
if err != nil {
log.WithFields(log.Fields{
- "event": event,
- "user_id": subscription.UserID,
+ "event": event,
+ "target_id": subscription.TargetID,
}).WithError(err).Error("Failed to send Space web push")
return
}
@@ -268,9 +268,9 @@ func (n *SpaceWebPushSender) sendSubscription(
}
if response.StatusCode < http.StatusOK || response.StatusCode >= http.StatusMultipleChoices {
log.WithFields(log.Fields{
- "event": event,
- "status": response.StatusCode,
- "user_id": subscription.UserID,
+ "event": event,
+ "status": response.StatusCode,
+ "target_id": subscription.TargetID,
}).Warn("Space web push provider rejected notification")
}
}
diff --git a/server/space/repo/module.go b/server/space/repo/module.go
index 4332d61ca0..2f8ae19b16 100644
--- a/server/space/repo/module.go
+++ b/server/space/repo/module.go
@@ -256,7 +256,6 @@ type SpaceWebPushSubscriptionRecord struct {
Endpoint string
P256dh string
Auth string
- UserID int64
Public bool
}
diff --git a/server/space/repo/web_push.go b/server/space/repo/web_push.go
index 5efc1023ec..83a71e5325 100644
--- a/server/space/repo/web_push.go
+++ b/server/space/repo/web_push.go
@@ -2,12 +2,12 @@ package repo
import (
"context"
+ "database/sql"
"errors"
"github.com/ente/museum/ente/base"
timeutil "github.com/ente/museum/pkg/utils/time"
"github.com/ente/stacktrace"
- "github.com/lib/pq"
)
const spaceWebPushLinkSubscriptionLimit = 10000
@@ -164,13 +164,10 @@ func (r *WebPushRepository) DeleteEndpoint(ctx context.Context, endpoint string)
func (r *WebPushRepository) ListActiveAccountSubscriptions(
ctx context.Context,
- userIDs []int64,
+ userID int64,
) ([]SpaceWebPushSubscriptionRecord, error) {
- if len(userIDs) == 0 {
- return nil, nil
- }
rows, err := r.DB.QueryContext(ctx, `
- SELECT push.target_id, push.endpoint, push.p256dh, push.auth, session.user_id
+ SELECT push.target_id, push.endpoint, push.p256dh, push.auth, FALSE
FROM space_web_push_subscriptions push
JOIN space_browser_sessions session
ON session.token_hash = push.session_token_hash
@@ -178,28 +175,13 @@ func (r *WebPushRepository) ListActiveAccountSubscriptions(
JOIN users active_user
ON active_user.user_id = session.user_id
AND active_user.encrypted_email IS NOT NULL
- WHERE session.user_id = ANY($1)
- `, pq.Array(userIDs), timeutil.Microseconds())
+ WHERE session.user_id = $1
+ `, userID, timeutil.Microseconds())
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
defer rows.Close()
-
- var subscriptions []SpaceWebPushSubscriptionRecord
- for rows.Next() {
- var subscription SpaceWebPushSubscriptionRecord
- if err := rows.Scan(
- &subscription.TargetID,
- &subscription.Endpoint,
- &subscription.P256dh,
- &subscription.Auth,
- &subscription.UserID,
- ); err != nil {
- return nil, stacktrace.Propagate(err, "")
- }
- subscriptions = append(subscriptions, subscription)
- }
- return subscriptions, stacktrace.Propagate(rows.Err(), "")
+ return scanWebPushSubscriptions(rows)
}
func (r *WebPushRepository) ListPostSubscriptions(
@@ -207,8 +189,7 @@ func (r *WebPushRepository) ListPostSubscriptions(
spaceID string,
) ([]SpaceWebPushSubscriptionRecord, error) {
rows, err := r.DB.QueryContext(ctx, `
- SELECT push.target_id, push.endpoint, push.p256dh, push.auth,
- session.user_id, FALSE
+ SELECT push.target_id, push.endpoint, push.p256dh, push.auth, FALSE
FROM space_web_push_subscriptions push
JOIN space_browser_sessions session
ON session.token_hash = push.session_token_hash
@@ -227,8 +208,7 @@ func (r *WebPushRepository) ListPostSubscriptions(
UNION ALL
- SELECT push.target_id, push.endpoint, push.p256dh, push.auth,
- 0, TRUE
+ SELECT push.target_id, push.endpoint, push.p256dh, push.auth, TRUE
FROM space_web_push_subscriptions push
JOIN space_links link
ON link.link_id = push.link_id
@@ -244,7 +224,10 @@ func (r *WebPushRepository) ListPostSubscriptions(
return nil, stacktrace.Propagate(err, "")
}
defer rows.Close()
+ return scanWebPushSubscriptions(rows)
+}
+func scanWebPushSubscriptions(rows *sql.Rows) ([]SpaceWebPushSubscriptionRecord, error) {
var subscriptions []SpaceWebPushSubscriptionRecord
for rows.Next() {
var subscription SpaceWebPushSubscriptionRecord
@@ -253,7 +236,6 @@ func (r *WebPushRepository) ListPostSubscriptions(
&subscription.Endpoint,
&subscription.P256dh,
&subscription.Auth,
- &subscription.UserID,
&subscription.Public,
); err != nil {
return nil, stacktrace.Propagate(err, "")
diff --git a/server/space/repo/web_push_test.go b/server/space/repo/web_push_test.go
index 3673868023..94c7d1ad95 100644
--- a/server/space/repo/web_push_test.go
+++ b/server/space/repo/web_push_test.go
@@ -81,11 +81,10 @@ func TestWebPushSubscriptionsFollowTargetsAndActiveSessions(t *testing.T) {
require.NoError(t, err)
require.NotEqual(t, accountTargetID, publicTargetID)
- accountSubscriptions, err := module.WebPush.ListActiveAccountSubscriptions(ctx, []int64{friendID})
+ accountSubscriptions, err := module.WebPush.ListActiveAccountSubscriptions(ctx, friendID)
require.NoError(t, err)
require.Len(t, accountSubscriptions, 1)
require.Equal(t, "https://push.example/replaced", accountSubscriptions[0].Endpoint)
- require.Equal(t, friendID, accountSubscriptions[0].UserID)
postSubscriptions, err := module.WebPush.ListPostSubscriptions(ctx, space.SpaceID)
require.NoError(t, err)
@@ -95,7 +94,6 @@ func TestWebPushSubscriptionsFollowTargetsAndActiveSessions(t *testing.T) {
Endpoint: "https://push.example/replaced",
P256dh: "replaced-p256dh",
Auth: "replaced-auth",
- UserID: friendID,
},
{
TargetID: publicTargetID,