Skip to content

armgit / ente

Public Imported from GitHub
0

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

Allow album pushes without a stored APNs token

AmanRajSinghMourya66385a0d7f66
diff --git a/server/pkg/repo/push.go b/server/pkg/repo/push.go
index 96bdb3eff0..4cbd65d0ed 100644
--- a/server/pkg/repo/push.go
+++ b/server/pkg/repo/push.go
@@ -66,7 +66,7 @@ func (repo *PushTokenRepository) GetTokensForAlbumShare(ctx context.Context, use
rows, err := repo.DB.QueryContext(ctx, `SELECT p.fcm_token, p.notification_public_key FROM push_tokens p
JOIN tokens t ON t.token_hash = p.session_token_hash AND t.user_id = p.user_id AND t.is_deleted = false AND t.app = $3
JOIN remote_store r ON r.user_id = p.user_id AND r.key_name = $2 AND r.key_value = 'true'
- WHERE p.user_id = ANY($1) AND p.platform = 'ios' AND p.apns_token <> '' AND p.notification_public_key IS NOT NULL`,
+ WHERE p.user_id = ANY($1) AND p.platform = 'ios' AND p.notification_public_key IS NOT NULL`,
pq.Array(userIDs), string(ente.IsInternalUser), string(ente.Photos))
if err != nil {
return nil, stacktrace.Propagate(err, "")
diff --git a/server/pkg/repo/push_test.go b/server/pkg/repo/push_test.go
index e3135b45a5..ad42991e68 100644
--- a/server/pkg/repo/push_test.go
+++ b/server/pkg/repo/push_test.go
@@ -235,6 +235,14 @@ func TestAlbumShareTokensRequireInternalIOSAndActiveSession(t *testing.T) {
require.Len(t, tokens, 1)
require.Equal(t, "eligible", tokens[0].FCMToken)
require.Equal(t, key, tokens[0].NotificationPublicKey)
+ for _, apnsToken := range []any{"", nil} {
+ _, err := db.Exec(`UPDATE push_tokens SET apns_token=$1 WHERE fcm_token='eligible'`, apnsToken)
+ require.NoError(t, err)
+ tokens, err := r.GetTokensForAlbumShare(context.Background(), []int64{1})
+ require.NoError(t, err)
+ require.Len(t, tokens, 1)
+ require.Equal(t, "eligible", tokens[0].FCMToken)
+ }
tokens, err = r.GetTokensForAlbumShare(context.Background(), []int64{2})
require.NoError(t, err)
require.Empty(t, tokens)