Skip to content

SDKS-4716: Fix for Push Notification E2E test #168

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

Closed
vibhorgoswami wants to merge 1 commit into from
Closed

SDKS-4716: Fix for Push Notification E2E test #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 27 additions & 9 deletions ...-migration/src/main/kotlin/com/pingidentity/auth/migration/AuthenticatorMigrationSteps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,9 @@ val step3 = MigrationStep(

val pushNotification = PushNotification(
id = notificationId,
credentialId = notificationData["credentialId"]?.jsonPrimitive?.content ?: "",
credentialId = notificationData["credentialId"]?.jsonPrimitive?.content
?: notificationData["mechanismUID"]?.jsonPrimitive?.content
?: "",
Copy link
Copy Markdown
Contributor

@witrisna witrisna Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we try to get credentialId first, if not exist we get the mechanismUID, any reason for this scenario? Do you see the legacy set the id either in this 2 attributes?

Similar for other attributes mapping, we try to find if data exist on one attribute, if not found try another, not sure if this is correct.

ttl = notificationData["ttl"]?.jsonPrimitive?.content?.toIntOrNull() ?: 120,
messageId = notificationData["messageId"]?.jsonPrimitive?.content ?: notificationId,
messageText = notificationData["messageText"]?.jsonPrimitive?.content
Expand Down Expand Up @@ -368,14 +370,30 @@ val step4 = MigrationStep(
try {
val tokenData = json.parseToJsonElement(tokenJson).jsonObject

val pushDeviceToken = PushDeviceToken(
id = tokenData["id"]?.jsonPrimitive?.content ?: "",
tokenId = tokenData["deviceToken"]?.jsonPrimitive?.content
?: tokenData["token"]?.jsonPrimitive?.content
?: tokenData["tokenId"]?.jsonPrimitive?.content
?: "",
createdAt = Date(tokenData["timeAdded"]?.jsonPrimitive?.content?.toLongOrNull() ?: System.currentTimeMillis()),
)
// Extract id if present, otherwise let PushDeviceToken generate a UUID
val tokenId = tokenData["id"]?.jsonPrimitive?.content

val pushDeviceToken = if (tokenId != null && tokenId.isNotBlank()) {
PushDeviceToken(
id = tokenId,
tokenId = tokenData["deviceToken"]?.jsonPrimitive?.content
?: tokenData["token"]?.jsonPrimitive?.content
?: tokenData["tokenId"]?.jsonPrimitive?.content
?: "",
createdAt = Date(tokenData["timeAdded"]?.jsonPrimitive?.content?.toLongOrNull()
?: System.currentTimeMillis()),
)
} else {
// Let PushDeviceToken generate a UUID for id (default parameter)
PushDeviceToken(
tokenId = tokenData["deviceToken"]?.jsonPrimitive?.content
?: tokenData["token"]?.jsonPrimitive?.content
?: tokenData["tokenId"]?.jsonPrimitive?.content
?: "",
createdAt = Date(tokenData["timeAdded"]?.jsonPrimitive?.content?.toLongOrNull()
?: System.currentTimeMillis()),
)
}

pushStorage.storePushDeviceToken(pushDeviceToken)
logger.i("Migrated device token successfully")
Expand Down
Loading