diff --git a/MultipazCodelab/Holder/androidApp/src/main/AndroidManifest.xml b/MultipazCodelab/Holder/androidApp/src/main/AndroidManifest.xml index d0b1c769..efa985aa 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/AndroidManifest.xml +++ b/MultipazCodelab/Holder/androidApp/src/main/AndroidManifest.xml @@ -120,19 +120,7 @@ requests on the lock screen because there is no PII. For an app with real user data it might be a privacy problem to show PII on the lock screen. --> - - - - - - - + diff --git a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/MainActivity.kt b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/MainActivity.kt index ce3387a2..e02979c4 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/MainActivity.kt +++ b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/MainActivity.kt @@ -52,13 +52,8 @@ class MainActivity : FragmentActivity() { /** * Handle a link (either a app link, universal link, or custom URL schema link). */ + //TODO: implement HandleUrl for Android fun handleUrl(url: String) { - handleUrl( - url = url, - credentialOffers = credentialOffers, - provisioningModel = provisioningModel, - provisioningSupport = provisioningSupport, - ) } companion object { diff --git a/MultipazCodelab/Holder/androidApp/src/main/res/xml/nfc_ndef_service.xml b/MultipazCodelab/Holder/androidApp/src/main/res/xml/nfc_ndef_service.xml index 7aead670..ee5cfc17 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/res/xml/nfc_ndef_service.xml +++ b/MultipazCodelab/Holder/androidApp/src/main/res/xml/nfc_ndef_service.xml @@ -11,9 +11,6 @@ android:requireDeviceScreenOn="false" tools:ignore="UnusedAttribute"> - - - - + \ No newline at end of file diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/AccountScreen.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/AccountScreen.kt index c84f17aa..36725ae2 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/AccountScreen.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/AccountScreen.kt @@ -1,12 +1,10 @@ package org.multipaz.samples.wallet.cmp.ui -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -28,7 +26,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -42,15 +39,10 @@ import org.multipaz.compose.presentment.MdocProximityQrPresentment import org.multipaz.compose.presentment.MdocProximityQrSettings import org.multipaz.compose.prompt.PromptDialogs import org.multipaz.compose.qrcode.generateQrCode -import org.multipaz.mdoc.connectionmethod.MdocConnectionMethod -import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodBle -import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodNfc -import org.multipaz.mdoc.transport.MdocTransportOptions import org.multipaz.presentment.PresentmentSource import org.multipaz.prompt.PromptModel import org.multipaz.samples.wallet.cmp.util.AppSettingsModel import org.multipaz.util.Logger -import org.multipaz.util.UUID import kotlin.time.Duration.Companion.seconds private const val TAG = "AccountScreen" @@ -243,58 +235,7 @@ private fun ShowQrButton( ) { when (hasCredentials) { true -> { - Button(onClick = { - val connectionMethods = mutableListOf() - val bleUuid = UUID.randomUUID() - if (bleCentralClientEnabled) { - connectionMethods.add( - MdocConnectionMethodBle( - supportsPeripheralServerMode = false, - supportsCentralClientMode = true, - peripheralServerModeUuid = null, - centralClientModeUuid = bleUuid, - ), - ) - } - if (blePeripheralServerEnabled) { - connectionMethods.add( - MdocConnectionMethodBle( - supportsPeripheralServerMode = true, - supportsCentralClientMode = false, - peripheralServerModeUuid = bleUuid, - centralClientModeUuid = null, - ), - ) - } - if (nfcDataTransferEnabled) { - connectionMethods.add( - MdocConnectionMethodNfc( - commandDataFieldMaxLength = 0xffff, - responseDataFieldMaxLength = 0x10000, - ), - ) - } - onGenerateQrCode( - MdocProximityQrSettings( - availableConnectionMethods = connectionMethods, - createTransportOptions = - MdocTransportOptions( - bleUseL2CAP = bleL2CapEnabled, - bleUseL2CAPInEngagement = bleL2CapInEngagementEnabled, - ), - ), - ) - }) { - Text("Present mDL via QR") - } - Spacer(modifier = Modifier.height(16.dp)) - Text( - text = - "The mDL is also available\n" + - "via NFC engagement and W3C DC API\n" + - "(Android-only right now)", - textAlign = TextAlign.Center, - ) + // TODO: show qr button when credentials are available } false -> { @@ -332,12 +273,7 @@ private fun ShowQrCode( horizontalAlignment = Alignment.CenterHorizontally, ) { Text(text = "Present QR code to mdoc reader") - Image( - modifier = Modifier.fillMaxWidth(), - bitmap = qrCodeBitmap, - contentDescription = null, - contentScale = ContentScale.FillWidth, - ) + // TODO: show QR code Button(onClick = { onReset() }) { Text("Cancel") } diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/ProvisioningTestScreen.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/ProvisioningTestScreen.kt index 11719cd9..28ef16b2 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/ProvisioningTestScreen.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/ui/ProvisioningTestScreen.kt @@ -21,7 +21,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import org.koin.compose.koinInject import org.multipaz.provisioning.AuthorizationChallenge -import org.multipaz.provisioning.AuthorizationResponse import org.multipaz.provisioning.ProvisioningModel import org.multipaz.samples.wallet.cmp.util.ProvisioningSupport import org.multipaz.util.Logger @@ -92,26 +91,7 @@ fun ProvisioningTestScreen( } else -> { - val text = - when (provisioningState) { - ProvisioningModel.Idle -> "Initializing..." - ProvisioningModel.Initial -> "Starting provisioning..." - ProvisioningModel.Connected -> "Connected to the back-end" - ProvisioningModel.ProcessingAuthorization -> "Processing authorization..." - ProvisioningModel.Authorized -> "Authorized" - ProvisioningModel.RequestingCredentials -> "Requesting credentials..." - is ProvisioningModel.CredentialsIssued -> "Credentials issued" - is ProvisioningModel.Error -> throw IllegalStateException() - is ProvisioningModel.Authorizing -> throw IllegalStateException() - } - Text( - modifier = - Modifier - .align(Alignment.CenterHorizontally) - .padding(8.dp), - style = MaterialTheme.typography.titleLarge, - text = text, - ) + // TODO: update text depends on provisioningState } } } @@ -130,11 +110,7 @@ private fun Authorize( EVIDENCE_REQUEST_WEB_VIEW, "Authorize: Rendering EvidenceRequestWebView for OAuth challenge", ) - EvidenceRequestWebView( - evidenceRequest = challenge, - provisioningModel = provisioningModel, - provisioningSupport = provisioningSupport, - ) + // TODO: init EvidenceRequestWebView } is AuthorizationChallenge.SecretText -> TODO() @@ -178,9 +154,7 @@ fun EvidenceRequestWebView( EVIDENCE_REQUEST_WEB_VIEW, "EvidenceRequestWebView LaunchedEffect invokedUrl: $invokedUrl", ) - provisioningModel.provideAuthorizationResponse( - AuthorizationResponse.OAuth(stableEvidenceRequest.id, invokedUrl), - ) + // TODO: add provideAuthorizationResponse } val uriHandler = LocalUriHandler.current LaunchedEffect(stableEvidenceRequest.url) { diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/OpenID4VCILocalBackend.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/OpenID4VCILocalBackend.kt index 6b2357d7..18da2b77 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/OpenID4VCILocalBackend.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/OpenID4VCILocalBackend.kt @@ -10,11 +10,8 @@ class OpenID4VCILocalBackend : OpenID4VCIBackend { override suspend fun getClientId(): String = CLIENT_ID override suspend fun createJwtClientAssertion(authorizationServerIdentifier: String): String = - OpenID4VCIBackendUtil.createJwtClientAssertion( - signingKey = clientAssertionKey, - clientId = CLIENT_ID, - authorizationServerIdentifier = authorizationServerIdentifier, - ) + // TODO: create and assign JWT client assertion string + TODO() override suspend fun createJwtWalletAttestation(keyAttestation: KeyAttestation): String = OpenID4VCIBackendUtil.createWalletAttestation( diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/ProvisioningSupport.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/ProvisioningSupport.kt index 7b3f20eb..6f586fcc 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/ProvisioningSupport.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/ProvisioningSupport.kt @@ -41,9 +41,7 @@ class ProvisioningSupport( suspend fun processAppLinkInvocation(url: String) { val state = Url(url).parameters["state"] ?: "" - lock.withLock { - pendingLinksByState.remove(state)?.send(url) - } + // TODO: process app link invocation } suspend fun waitForAppLinkInvocation(state: String): String { diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/UrlHandler.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/UrlHandler.kt index 5be79d91..44c1f01c 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/UrlHandler.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/UrlHandler.kt @@ -1,11 +1,7 @@ package org.multipaz.samples.wallet.cmp.util -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.launch import org.multipaz.provisioning.ProvisioningModel -import org.multipaz.util.Logger private const val TAG = "UrlHandler" private const val OID4VCI_CREDENTIAL_OFFER_URL_SCHEME = "openid-credential-offer://" @@ -26,42 +22,5 @@ fun handleUrl( provisioningModel: ProvisioningModel, provisioningSupport: ProvisioningSupport, ) { - Logger.i(TAG, "handleUrl called with: $url") - Logger.i(TAG, "handleUrl provisioningModel state: ${provisioningModel.state.value}") - - if (url.startsWith(OID4VCI_CREDENTIAL_OFFER_URL_SCHEME) || - url.startsWith(HAIP_URL_SCHEME) - ) { - val queryIndex = url.indexOf('?') - if (queryIndex >= 0) { - Logger.i(TAG, "Starting OpenID4VCI provisioning with: $url") - Logger.i( - TAG, - "OID4VCI_CREDENTIAL_OFFER_URL_SCHEME provisioningModel: $provisioningModel", - ) - Logger.i(TAG, "handleUrl: Sending credential offer to channel...") - CoroutineScope(Dispatchers.Default).launch { - Logger.i(TAG, "handleUrl: About to send to credentialOffers channel") - credentialOffers.send(url) - Logger.i(TAG, "handleUrl: Successfully sent to credentialOffers channel") - } - Logger.i( - TAG, - "handleUrl: Credential offer sent to channel, LaunchedEffect should process it", - ) - } - } else if (url.startsWith(ProvisioningSupport.APP_LINK_BASE_URL)) { - Logger.i(TAG, "APP_LINK_BASE_URL provisioningModel: $provisioningModel") - Logger.i(TAG, "Processing app link invocation: $url") - - CoroutineScope(Dispatchers.Default).launch { - try { - Logger.i(TAG, "handleUrl: About to process app link invocation") - provisioningSupport.processAppLinkInvocation(url) - Logger.i(TAG, "handleUrl: App link invocation processed successfully") - } catch (e: Exception) { - Logger.e(TAG, "Error processing app link: ${e.message}", e) - } - } - } + // TODO: Implement URL handling and validation } diff --git a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/MainViewController.kt b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/MainViewController.kt index 28ade4b2..3e833b3b 100644 --- a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/MainViewController.kt +++ b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/MainViewController.kt @@ -94,26 +94,7 @@ fun MainViewController() = */ @Suppress("FunctionName") // Swift interop: follows Swift naming convention for exported functions fun HandleUrl(url: String) { - val credentialOffers = globalCredentialOffers - if (credentialOffers == null) { - Logger.w(TAG, "HandleUrl: credentialOffers channel not yet initialized, URL will be ignored: $url") - return - } - - try { - val koinHelper = object : KoinComponent { } - val provisioningModel = koinHelper.get() - val provisioningSupport = koinHelper.get() - - org.multipaz.samples.wallet.cmp.util.handleUrl( - url = url, - credentialOffers = credentialOffers, - provisioningModel = provisioningModel, - provisioningSupport = provisioningSupport, - ) - } catch (e: Exception) { - Logger.e(TAG, "Error in HandleUrl: ${e.message}", e) - } + // TODO: implement HandleUrl for iOS } @Suppress("FunctionName") // Swift interop naming diff --git a/MultipazCodelab/Holder/iosApp/iosApp.xcodeproj/project.pbxproj b/MultipazCodelab/Holder/iosApp/iosApp.xcodeproj/project.pbxproj index 213c669a..18447645 100644 --- a/MultipazCodelab/Holder/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/MultipazCodelab/Holder/iosApp/iosApp.xcodeproj/project.pbxproj @@ -420,7 +420,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = 4G3ATA5MLV; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -461,7 +460,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = 4G3ATA5MLV; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -499,7 +497,6 @@ CODE_SIGN_ENTITLEMENTS = IdentityDocumentProviderExtension/IdentityDocumentProviderExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4G3ATA5MLV; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -537,7 +534,6 @@ CODE_SIGN_ENTITLEMENTS = IdentityDocumentProviderExtension/IdentityDocumentProviderExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 4G3ATA5MLV; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)",