Skip to content

armgit / ente

Public Imported from GitHub
0

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

Return Cast device ID when pairing

Neeraj Guptad5feb8f03795
diff --git a/server/pkg/api/cast.go b/server/pkg/api/cast.go
index d5c984476c..8cc8bf4878 100644
--- a/server/pkg/api/cast.go
+++ b/server/pkg/api/cast.go
@@ -88,12 +88,14 @@ func (h *CastHandler) InsertCastData(c *gin.Context) {
handler.Error(c, stacktrace.Propagate(err, "failed to bind"))
return
}
- err := h.Ctrl.InsertCastData(c, &request)
+ deviceID, err := h.Ctrl.InsertCastData(c, &request)
if err != nil {
handler.Error(c, stacktrace.Propagate(err, "failed to start cast"))
return
}
- c.JSON(http.StatusOK, gin.H{})
+ c.JSON(http.StatusOK, gin.H{
+ "deviceID": deviceID.String(),
+ })
}
// RevokeAllToken disable all active cast token for a user
diff --git a/server/pkg/controller/cast/controller.go b/server/pkg/controller/cast/controller.go
index bdfc00b5e2..0ad4ed86d9 100644
--- a/server/pkg/controller/cast/controller.go
+++ b/server/pkg/controller/cast/controller.go
@@ -77,14 +77,14 @@ func (c *Controller) GetEncCastData(ctx context.Context, deviceCode string) (*st
return c.CastRepo.GetEncCastData(ctx, deviceCode)
}
-func (c *Controller) InsertCastData(ctx *gin.Context, request *cast.CastRequest) error {
+func (c *Controller) InsertCastData(ctx *gin.Context, request *cast.CastRequest) (uuid.UUID, error) {
userID := auth.GetUserID(ctx.Request.Header)
devices, err := c.CastRepo.GetAllDevices(ctx, userID)
if err != nil {
- return stacktrace.Propagate(err, "failed to get existing devices")
+ return uuid.Nil, stacktrace.Propagate(err, "failed to get existing devices")
}
if len(devices) >= 50 {
- return stacktrace.NewError("device limit reached")
+ return uuid.Nil, stacktrace.NewError("device limit reached")
}
return c.CastRepo.InsertCastData(ctx, userID, request.DeviceCode, request.CollectionID, request.CastToken, request.EncPayload)
}
diff --git a/server/pkg/repo/cast/repo.go b/server/pkg/repo/cast/repo.go
index 509e7b43cc..6542cb0a8b 100644
--- a/server/pkg/repo/cast/repo.go
+++ b/server/pkg/repo/cast/repo.go
@@ -50,11 +50,20 @@ func (r *Repository) GetAllDevices(ctx context.Context, userID int64) ([]cast.Ca
return devices, nil
}
-// InsertCastData insert collection_id, cast_user, token and encrypted_payload for given code if collection_id is not null
-func (r *Repository) InsertCastData(ctx context.Context, castUserID int64, code string, collectionID int64, castToken string, encryptedPayload string) error {
+// InsertCastData inserts the cast payload and returns the paired device ID.
+func (r *Repository) InsertCastData(ctx context.Context, castUserID int64, code string, collectionID int64, castToken string, encryptedPayload string) (uuid.UUID, error) {
code = strings.ToUpper(code)
- _, err := r.DB.ExecContext(ctx, "UPDATE casting SET collection_id = $1, cast_user = $2, token = $3, encrypted_payload = $4 WHERE code = $5 and is_deleted=false", collectionID, castUserID, castToken, encryptedPayload, code)
- return err
+ var deviceID uuid.UUID
+ err := r.DB.QueryRowContext(
+ ctx,
+ "UPDATE casting SET collection_id = $1, cast_user = $2, token = $3, encrypted_payload = $4 WHERE code = $5 and is_deleted=false RETURNING id",
+ collectionID,
+ castUserID,
+ castToken,
+ encryptedPayload,
+ code,
+ ).Scan(&deviceID)
+ return deviceID, err
}
func (r *Repository) GetPubKeyAndIp(ctx context.Context, code string) (string, string, error) {
diff --git a/server/pkg/repo/cast/repo_test.go b/server/pkg/repo/cast/repo_test.go
index 58226643dc..9cc3c90539 100644
--- a/server/pkg/repo/cast/repo_test.go
+++ b/server/pkg/repo/cast/repo_test.go
@@ -44,6 +44,42 @@ func TestRevokeForGivenDeviceIDOnlyDeletesUserDevice(t *testing.T) {
}
}
+func TestInsertCastDataReturnsDeviceID(t *testing.T) {
+ testutil.WithServerRoot(t)
+ db := testutil.RequireTestDB(t)
+ testutil.ResetTables(t, db)
+ t.Cleanup(func() {
+ testutil.ResetTables(t, db)
+ })
+ repository := &Repository{DB: db}
+ deviceID := uuid.New()
+ _, err := db.Exec(
+ `INSERT INTO casting (id, code, public_key, ip) VALUES ($1, $2, $3, $4)`,
+ deviceID,
+ "ABC123",
+ "public-key",
+ "127.0.0.1",
+ )
+ if err != nil {
+ t.Fatalf("failed to insert casting row: %v", err)
+ }
+
+ gotDeviceID, err := repository.InsertCastData(
+ t.Context(),
+ 1,
+ "abc123",
+ 42,
+ "cast-token",
+ "encrypted-payload",
+ )
+ if err != nil {
+ t.Fatalf("InsertCastData() error = %v", err)
+ }
+ if gotDeviceID != deviceID {
+ t.Fatalf("InsertCastData() device ID = %s, want %s", gotDeviceID, deviceID)
+ }
+}
+
func getCastDeviceIsDeleted(t *testing.T, db *sql.DB, deviceID uuid.UUID) bool {
t.Helper()
var isDeleted bool