Skip to content

MS-617 commcare session id fix #889

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
luhmirin-s merged 2 commits into from
Sep 2, 2024
Merged

MS-617 commcare session id fix #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3372f46
MS-617 Align intent filters across integrations
luhmirin-s Sep 2, 2024
10d63a1
MS-617 Inject last known session ID into intent extras if CommCare do…
luhmirin-s Sep 2, 2024
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
31 changes: 20 additions & 11 deletions ...api/src/main/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.simprints.infra.config.store.models.Project
import com.simprints.infra.config.store.tokenization.TokenizationProcessor
import com.simprints.infra.orchestration.data.ActionRequest
import com.simprints.infra.orchestration.data.ActionRequestIdentifier
import com.simprints.libsimprints.Constants
import javax.inject.Inject

internal class IntentToActionMapper @Inject constructor(
Expand Down Expand Up @@ -125,24 +126,32 @@ internal class IntentToActionMapper @Inject constructor(
extractor = IdentifyRequestExtractor(extras),
project = project
)
ActionConstants.ACTION_ENROL_LAST_BIOMETRICS -> ensureExtrasHaveSessionId(extras).let {
enrolLastBiometricsBuilder(
actionIdentifier = actionIdentifier,
extractor = EnrolLastBiometricsRequestExtractor(it),
project = project
)
}

ActionConstants.ACTION_ENROL_LAST_BIOMETRICS -> enrolLastBiometricsBuilder(
actionIdentifier = actionIdentifier,
extractor = EnrolLastBiometricsRequestExtractor(extras),
project = project
)

ActionConstants.ACTION_CONFIRM_IDENTITY -> confirmIdentifyBuilder(
actionIdentifier = actionIdentifier,
extractor = ConfirmIdentityRequestExtractor(extras),
project = project
)
ActionConstants.ACTION_CONFIRM_IDENTITY -> ensureExtrasHaveSessionId(extras).let {
confirmIdentifyBuilder(
actionIdentifier = actionIdentifier,
extractor = ConfirmIdentityRequestExtractor(it),
project = project
)
}

else -> throw InvalidRequestException(
"Invalid CommCare action", ClientApiError.INVALID_STATE_FOR_INTENT_ACTION
)
}.build()

// CommCare is not able to provide session ID so we assume that the last available session ID is correct
private suspend fun ensureExtrasHaveSessionId(map: Map<String, Any>) =
if (map.containsKey(Constants.SIMPRINTS_SESSION_ID)) map
else map.toMutableMap().also { it.put(Constants.SIMPRINTS_SESSION_ID, getCurrentSessionId()) }

private suspend fun mapLibSimprintsAction(
actionIdentifier: ActionRequestIdentifier,
extras: Map<String, Any>,
Expand Down
18 changes: 18 additions & 0 deletions ...src/test/java/com/simprints/feature/clientapi/mappers/request/IntentToActionMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,16 @@ class IntentToActionMapperTest {
}
}

@Test
fun `correctly handles CommCare intent without session ID`() = runTest {
mapOf(
"com.simprints.commcare.CONFIRM_IDENTITY" to ActionRequest.ConfirmIdentityActionRequest::class,
"com.simprints.commcare.REGISTER_LAST_BIOMETRICS" to ActionRequest.EnrolLastBiometricActionRequest::class,
).forEach { (action, expectedClass) ->
assertThat(mapper(action, noSessionExtras, any())).isInstanceOf(expectedClass.java)
}
}

@Test
fun `throws exception for invalid CommCare intent actions`() = runTest {
assertThrows<InvalidRequestException> {
Expand Down Expand Up @@ -146,6 +156,14 @@ class IntentToActionMapperTest {
SIMPRINTS_SELECTED_GUID to SESSION_ID,
SIMPRINTS_VERIFY_GUID to SESSION_ID,
)

private val noSessionExtras = mapOf(
SIMPRINTS_PROJECT_ID to "projectId-1111111111",
SIMPRINTS_USER_ID to "userId",
SIMPRINTS_MODULE_ID to "moduleId",
SIMPRINTS_SELECTED_GUID to SESSION_ID,
SIMPRINTS_VERIFY_GUID to SESSION_ID,
)
}
}

9 changes: 4 additions & 5 deletions feature/orchestrator/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<intent-filter>
<action android:name="com.simprints.simodkadapter.REGISTER" />
<action android:name="com.simprints.simodkadapter.IDENTIFY" />
<action android:name="com.simprints.simodkadapter.UPDATE" />
<action android:name="com.simprints.simodkadapter.VERIFY" />
<action android:name="com.simprints.simodkadapter.CONFIRM_IDENTITY" />
<action android:name="com.simprints.simodkadapter.REGISTER_LAST_BIOMETRICS" />
Expand All @@ -23,9 +22,9 @@
<intent-filter>
<action android:name="com.simprints.simodkadapter.REGISTER" />
<action android:name="com.simprints.simodkadapter.IDENTIFY" />
<action android:name="com.simprints.simodkadapter.UPDATE" />
<action android:name="com.simprints.simodkadapter.VERIFY" />
<action android:name="com.simprints.simodkadapter.CONFIRM_IDENTITY" />
<action android:name="com.simprints.simodkadapter.REGISTER_LAST_BIOMETRICS" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -47,9 +46,9 @@
<intent-filter>
<action android:name="com.simprints.id.REGISTER" />
<action android:name="com.simprints.id.IDENTIFY" />
<action android:name="com.simprints.id.UPDATE" />
<action android:name="com.simprints.id.VERIFY" />
<action android:name="com.simprints.id.CONFIRM_IDENTITY" />
<action android:name="com.simprints.id.REGISTER_LAST_BIOMETRICS" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -61,19 +60,19 @@
<intent-filter>
<action android:name="com.simprints.commcare.REGISTER" />
<action android:name="com.simprints.commcare.IDENTIFY" />
<action android:name="com.simprints.commcare.UPDATE" />
<action android:name="com.simprints.commcare.VERIFY" />
<action android:name="com.simprints.commcare.CONFIRM_IDENTITY" />
<action android:name="com.simprints.commcare.REGISTER_LAST_BIOMETRICS" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="com.simprints.commcare.REGISTER" />
<action android:name="com.simprints.commcare.IDENTIFY" />
<action android:name="com.simprints.commcare.UPDATE" />
<action android:name="com.simprints.commcare.VERIFY" />
<action android:name="com.simprints.commcare.CONFIRM_IDENTITY" />
<action android:name="com.simprints.commcare.REGISTER_LAST_BIOMETRICS" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down