Merge pull request #1975 from walt-id/fix/restore-main-before-mobile-prs

fix: restore main before accidental mobile PR merge

Author: szijpeter

waltid-applications/waltid-wallet-demo-compose/androidApp/src/main/AndroidManifest.xml

@@ -34,13 +34,6 @@
                 <data android:scheme="openid-credential-offer" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="openid" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

waltid-applications/waltid-wallet-demo-compose/iosApp/iosApp/Info-Debug.plist

@@ -15,7 +15,6 @@
 			<string>id.walt.walletdemo</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>openid</string>
 				<string>openid-credential-offer</string>
 				<string>openid4vp</string>
 			</array>

waltid-applications/waltid-wallet-demo-compose/iosApp/iosApp/Info.plist

@@ -15,7 +15,6 @@
 			<string>id.walt.walletdemo</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>openid</string>
 				<string>openid-credential-offer</string>
 				<string>openid4vp</string>
 			</array>

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/DemoWallet.kt

@@ -3,17 +3,9 @@ package id.walt.walletdemo.compose.logic
 interface DemoWallet {
     suspend fun bootstrap(): WalletDemoBootstrapResult
     suspend fun listCredentials(): List<WalletDemoCredential>
-    suspend fun startIssuance(offerUrl: String, redirectUri: String, did: String?): WalletDemoIssuanceSession
-    suspend fun continuePreAuthorizedIssuance(
-        sessionId: String,
-        transactionCode: String?,
-    ): WalletDemoIssuanceOutcome
-    suspend fun continueAuthorizationIssuance(
-        sessionId: String,
-        callbackUri: String,
-    ): WalletDemoIssuanceOutcome
-    suspend fun cancelIssuance(sessionId: String): WalletDemoIssuanceOutcome
-    suspend fun resumeDeferredIssuance(deferredCredentialId: String): WalletDemoIssuanceOutcome
+    suspend fun resolveOffer(offerUrl: String): WalletDemoOfferPreview
+    suspend fun receive(previewHandle: WalletDemoIssuancePreviewHandle, txCode: String? = null): List<String>
+    suspend fun discardIssuancePreview(previewHandle: WalletDemoIssuancePreviewHandle)
     suspend fun present(requestUrl: String, did: String? = null): WalletDemoOperationResult
     suspend fun previewPresentation(requestUrl: String): WalletDemoPresentationPreviewResult
     suspend fun submitPresentation(

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/LazyDemoWallet.kt

@@ -20,19 +20,16 @@ internal class LazyDemoWallet(
     override suspend fun listCredentials(): List<WalletDemoCredential> =
         wallet().listCredentials()
 
-    override suspend fun startIssuance(offerUrl: String, redirectUri: String, did: String?) =
-        wallet().startIssuance(offerUrl, redirectUri, did)
+    override suspend fun resolveOffer(offerUrl: String): WalletDemoOfferPreview =
+        wallet().resolveOffer(offerUrl)
 
-    override suspend fun continuePreAuthorizedIssuance(sessionId: String, transactionCode: String?) =
-        wallet().continuePreAuthorizedIssuance(sessionId, transactionCode)
+    override suspend fun receive(
+        previewHandle: WalletDemoIssuancePreviewHandle,
+        txCode: String?,
+    ): List<String> = wallet().receive(previewHandle, txCode)
 
-    override suspend fun continueAuthorizationIssuance(sessionId: String, callbackUri: String) =
-        wallet().continueAuthorizationIssuance(sessionId, callbackUri)
-
-    override suspend fun cancelIssuance(sessionId: String) = wallet().cancelIssuance(sessionId)
-
-    override suspend fun resumeDeferredIssuance(deferredCredentialId: String) =
-        wallet().resumeDeferredIssuance(deferredCredentialId)
+    override suspend fun discardIssuancePreview(previewHandle: WalletDemoIssuancePreviewHandle) =
+        wallet().discardIssuancePreview(previewHandle)
 
     override suspend fun present(requestUrl: String, did: String?): WalletDemoOperationResult =
         wallet().present(requestUrl, did)