From f7dbdeda1d16780495c8813e2ed85ee70703a5e9 Mon Sep 17 00:00:00 2001 From: VishnuSanal Date: Thu, 5 Nov 2026 13:30:31 +0530 Subject: [PATCH] main branch migration after v0.102.0 migration Signed-off-by: VishnuSanal --- .github/workflows/build-terminal-apps.yml | 294 ++++++++++ .../workflows/deploy-terminal-backends.yml | 203 +++++++ .../Holder/androidApp/build.gradle.kts | 1 + .../samples/wallet/cmp/CredmanActivity.kt | 1 + .../samples/wallet/cmp/NdefService.kt | 12 +- .../samples/wallet/cmp/UtopiaNfcService.kt | 10 +- .../Holder/composeApp/build.gradle.kts | 3 +- .../PlatformDigitalCredentials.android.kt | 7 + .../wallet/cmp/util/AppSettingsModel.kt | 3 +- .../DigitalCredentialsRegistrationManager.kt | 3 +- .../cmp/util/PlatformDigitalCredentials.kt | 4 + .../util/PlatformDigitalCredentials.ios.kt | 7 + .../wallet/cmp/util/PlatformStorage.ios.kt | 5 +- .../Holder/gradle/libs.versions.toml | 5 +- .../composeApp/build.gradle.kts | 4 + .../getstarted/GetStartedNfcService.kt | 10 +- .../org/multipaz/getstarted/NdefService.kt | 3 +- .../core/build.gradle.kts | 2 + .../org/multipaz/getstarted/core/Platform.kt | 6 + .../getstarted/core/AppContainerImpl.kt | 23 +- .../org/multipaz/getstarted/core/Platform.kt | 3 + .../org/multipaz/getstarted/core/Platform.kt | 6 + .../biometrics/SelfieCheckSection.kt | 2 + .../feature/verification/build.gradle.kts | 6 + .../W3CDCCredentialsRequestButton.kt | 3 +- .../gradle/libs.versions.toml | 5 +- MultipazTransitTerminal/.gitignore | 297 ++++++++++ MultipazTransitTerminal/README.md | 241 ++++++++ .../androidApp/build.gradle.kts | 87 +++ .../androidApp/proguard-rules.pro | 21 + .../androidApp/src/debug/AndroidManifest.xml | 5 + .../androidApp/src/main/AndroidManifest.xml | 33 ++ .../org/multipaz/transit/MainActivity.kt | 19 + .../res/drawable/ic_launcher_foreground.xml | 30 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 974 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2360 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 798 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1526 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1192 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3272 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 1730 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 4856 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 2392 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7044 bytes .../res/values/ic_launcher_background.xml | 4 + .../src/main/res/values/strings.xml | 3 + MultipazTransitTerminal/build.gradle.kts | 0 MultipazTransitTerminal/gradle.properties | 12 + .../gradle/gradle-daemon-jvm.properties | 13 + .../gradle/libs.versions.toml | 77 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes .../gradle/wrapper/gradle-wrapper.properties | 8 + MultipazTransitTerminal/gradlew | 248 ++++++++ MultipazTransitTerminal/gradlew.bat | 93 +++ .../iosApp/Configuration/Config.xcconfig | 7 + .../iosApp/iosApp.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 7 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 36 ++ .../AppIcon.appiconset/app-icon-1024.png | Bin 0 -> 67285 bytes .../iosApp/Assets.xcassets/Contents.json | 0 .../iosApp/iosApp/ContentView.swift | 18 + .../iosApp/iosApp/Info.plist | 10 + .../Preview Assets.xcassets/Contents.json | 6 + .../iosApp/iosApp/iOSApp.swift | 10 + .../iosApp/iosApp/iosApp.entitlements | 10 + MultipazTransitTerminal/settings.gradle.kts | 0 .../shared/build.gradle.kts | 98 ++++ .../transit/SharedLogicAndroidHostTest.kt | 12 + .../org/multipaz/transit/Platform.android.kt | 35 ++ .../drawable/compose-multiplatform.xml | 44 ++ .../kotlin/org/multipaz/transit/App.kt | 311 ++++++++++ .../kotlin/org/multipaz/transit/Constants.kt | 19 + .../kotlin/org/multipaz/transit/Platform.kt | 14 + .../transit/journey/DeviceInstanceId.kt | 41 ++ .../transit/journey/JourneyService.kt | 57 ++ .../transit/journey/RpcJourneyStore.kt | 68 +++ .../transit/payment/PaymentCardClaims.kt | 173 ++++++ .../transit/payment/PaymentProcessor.kt | 72 +++ .../transit/payment/RpcPaymentSettler.kt | 71 +++ .../multipaz/transit/payment/Settlement.kt | 24 + .../transit/payment/SettlementResult.kt | 32 + .../transit/proximity/ProximityReaderFlow.kt | 111 ++++ .../transit/proximity/ProximityReaderModel.kt | 181 ++++++ .../proximity/ProximityReaderOutcome.kt | 57 ++ .../proximity/ProximityReaderSession.kt | 74 +++ .../transit/proximity/ProximityUtils.kt | 81 +++ .../VerificationProximityTransferScreen.kt | 550 ++++++++++++++++++ .../org/multipaz/transit/ui/AppState.kt | 121 ++++ .../org/multipaz/transit/ui/Controls.kt | 58 ++ .../kotlin/org/multipaz/transit/ui/Motion.kt | 44 ++ .../org/multipaz/transit/ui/OutcomeScreen.kt | 171 ++++++ .../transit/ui/SettlementFailureScreen.kt | 30 + .../transit/ui/SettlementSuccessScreen.kt | 52 ++ .../transit/ui/StationSelectionScreen.kt | 115 ++++ .../org/multipaz/transit/ui/Stations.kt | 64 ++ .../kotlin/org/multipaz/transit/ui/Theme.kt | 181 ++++++ .../multipaz/transit/ui/TransitScaffold.kt | 259 +++++++++ .../org/multipaz/transit/SharedCommonTest.kt | 12 + .../multipaz/transit/MainViewController.kt | 5 + .../org/multipaz/transit/Platform.ios.kt | 14 + .../multipaz/transit/SharedLogicIOSTest.kt | 12 + .../transitBackend/.gitignore | 2 + .../transitBackend/Dockerfile | 20 + .../transitBackend/build.gradle.kts | 66 +++ .../transit/backend/BackendJourneyService.kt | 53 ++ .../java/org/multipaz/transit/backend/Main.kt | 67 +++ .../transit/backend/TerminalJourneyService.kt | 199 +++++++ .../backend/TerminalPaymentProcessor.kt | 65 +++ .../resources/default_configuration.json | 32 + MultipazWholesalePOS/README.md | 71 ++- .../androidApp/build.gradle.kts | 32 +- MultipazWholesalePOS/build.gradle.kts | 3 + .../gradle/libs.versions.toml | 2 +- .../iosApp/iosApp.xcodeproj/project.pbxproj | 150 ++++- .../Preview Assets.xcassets/Contents.json | 2 +- MultipazWholesalePOS/settings.gradle.kts | 34 ++ .../kotlin/org/multipaz/pos/Constants.kt | 7 +- .../VerificationProximityTransferScreen.kt | 46 +- .../terminalBackend/Dockerfile | 17 + .../terminalBackend/build.gradle.kts | 19 + .../resources/default_configuration.json | 6 +- keys/.gitignore | 3 + 125 files changed, 6024 insertions(+), 82 deletions(-) create mode 100644 .github/workflows/build-terminal-apps.yml create mode 100644 .github/workflows/deploy-terminal-backends.yml create mode 100644 MultipazTransitTerminal/.gitignore create mode 100644 MultipazTransitTerminal/README.md create mode 100644 MultipazTransitTerminal/androidApp/build.gradle.kts create mode 100644 MultipazTransitTerminal/androidApp/proguard-rules.pro create mode 100644 MultipazTransitTerminal/androidApp/src/debug/AndroidManifest.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/AndroidManifest.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/kotlin/org/multipaz/transit/MainActivity.kt create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/values/ic_launcher_background.xml create mode 100644 MultipazTransitTerminal/androidApp/src/main/res/values/strings.xml create mode 100644 MultipazTransitTerminal/build.gradle.kts create mode 100644 MultipazTransitTerminal/gradle.properties create mode 100644 MultipazTransitTerminal/gradle/gradle-daemon-jvm.properties create mode 100644 MultipazTransitTerminal/gradle/libs.versions.toml create mode 100644 MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.jar create mode 100644 MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.properties create mode 100755 MultipazTransitTerminal/gradlew create mode 100644 MultipazTransitTerminal/gradlew.bat create mode 100644 MultipazTransitTerminal/iosApp/Configuration/Config.xcconfig create mode 100644 MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj create mode 100644 MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/Contents.json create mode 100644 MultipazTransitTerminal/iosApp/iosApp/ContentView.swift create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Info.plist create mode 100644 MultipazTransitTerminal/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json create mode 100644 MultipazTransitTerminal/iosApp/iosApp/iOSApp.swift create mode 100644 MultipazTransitTerminal/iosApp/iosApp/iosApp.entitlements create mode 100644 MultipazTransitTerminal/settings.gradle.kts create mode 100644 MultipazTransitTerminal/shared/build.gradle.kts create mode 100644 MultipazTransitTerminal/shared/src/androidHostTest/kotlin/org/multipaz/transit/SharedLogicAndroidHostTest.kt create mode 100644 MultipazTransitTerminal/shared/src/androidMain/kotlin/org/multipaz/transit/Platform.android.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/App.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Platform.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/DeviceInstanceId.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/JourneyService.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/RpcJourneyStore.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentCardClaims.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentProcessor.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/RpcPaymentSettler.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/Settlement.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/SettlementResult.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderFlow.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderModel.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderOutcome.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderSession.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityUtils.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/VerificationProximityTransferScreen.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/AppState.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Controls.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Motion.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/OutcomeScreen.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementFailureScreen.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementSuccessScreen.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/StationSelectionScreen.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Stations.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Theme.kt create mode 100644 MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/TransitScaffold.kt create mode 100644 MultipazTransitTerminal/shared/src/commonTest/kotlin/org/multipaz/transit/SharedCommonTest.kt create mode 100644 MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/MainViewController.kt create mode 100644 MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/Platform.ios.kt create mode 100644 MultipazTransitTerminal/shared/src/iosTest/kotlin/org/multipaz/transit/SharedLogicIOSTest.kt create mode 100644 MultipazTransitTerminal/transitBackend/.gitignore create mode 100644 MultipazTransitTerminal/transitBackend/Dockerfile create mode 100644 MultipazTransitTerminal/transitBackend/build.gradle.kts create mode 100644 MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/BackendJourneyService.kt create mode 100644 MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/Main.kt create mode 100644 MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalJourneyService.kt create mode 100644 MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalPaymentProcessor.kt create mode 100644 MultipazTransitTerminal/transitBackend/src/main/resources/resources/default_configuration.json create mode 100644 MultipazWholesalePOS/terminalBackend/Dockerfile create mode 100644 keys/.gitignore diff --git a/.github/workflows/build-terminal-apps.yml b/.github/workflows/build-terminal-apps.yml new file mode 100644 index 00000000..356896fe --- /dev/null +++ b/.github/workflows/build-terminal-apps.yml @@ -0,0 +1,294 @@ +name: Build terminal apps + +on: + workflow_dispatch: + push: + branches: [main] + +permissions: + contents: read + id-token: write + +env: + GCP_PROJECT_ID: utopia-multipaz + GCP_ZONE: us-central1-c + GCP_INSTANCE: utopia-multipaz-server + GCP_WORKLOAD_IDENTITY_PROVIDER: projects/873069027544/locations/global/workloadIdentityPools/github/providers/github-actions + GCP_DEPLOY_SERVICE_ACCOUNT: utopia-github-deployer@utopia-multipaz.iam.gserviceaccount.com + UTOPIA_DOWNLOADS_DIR: /opt/utopia/downloads + +jobs: + wholesale-pos: + name: Wholesale POS + runs-on: ubuntu-latest + defaults: + run: + working-directory: MultipazWholesalePOS + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "17" + + - name: Restore signing keystore + env: + KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} + KEYSTORE_PROPERTIES_B64: ${{ secrets.ANDROID_KEYSTORE_PROPERTIES_B64 }} + run: | + test -n "$KEYSTORE_B64" || { echo "Missing ANDROID_KEYSTORE_B64 secret."; exit 1; } + test -n "$KEYSTORE_PROPERTIES_B64" || { echo "Missing ANDROID_KEYSTORE_PROPERTIES_B64 secret."; exit 1; } + printf '%s' "$KEYSTORE_B64" | base64 --decode > ../keys/keystore.jks + printf '%s' "$KEYSTORE_PROPERTIES_B64" | base64 --decode > ../keys/keystore.properties + chmod 600 ../keys/keystore.jks ../keys/keystore.properties + + - name: Build signed release APK + run: | + ./gradlew :androidApp:assembleRelease \ + -PreleaseVersionCode="${GITHUB_RUN_NUMBER}" \ + -PreleaseVersionName="${GITHUB_SHA::7}" + + - uses: actions/upload-artifact@v4 + with: + name: multipaz-wholesale-pos + path: MultipazWholesalePOS/androidApp/build/outputs/apk/release/*.apk + + transit-terminal: + name: Transit terminal + runs-on: ubuntu-latest + defaults: + run: + working-directory: MultipazTransitTerminal + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "17" + + - name: Restore signing keystore + env: + KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} + KEYSTORE_PROPERTIES_B64: ${{ secrets.ANDROID_KEYSTORE_PROPERTIES_B64 }} + run: | + test -n "$KEYSTORE_B64" || { echo "Missing ANDROID_KEYSTORE_B64 secret."; exit 1; } + test -n "$KEYSTORE_PROPERTIES_B64" || { echo "Missing ANDROID_KEYSTORE_PROPERTIES_B64 secret."; exit 1; } + printf '%s' "$KEYSTORE_B64" | base64 --decode > ../keys/keystore.jks + printf '%s' "$KEYSTORE_PROPERTIES_B64" | base64 --decode > ../keys/keystore.properties + chmod 600 ../keys/keystore.jks ../keys/keystore.properties + + - name: Build signed release APK + run: | + ./gradlew :androidApp:assembleRelease \ + -PreleaseVersionCode="${GITHUB_RUN_NUMBER}" \ + -PreleaseVersionName="${GITHUB_SHA::7}" + + - uses: actions/upload-artifact@v4 + with: + name: multipaz-transit-terminal + path: MultipazTransitTerminal/androidApp/build/outputs/apk/release/*.apk + + publish-utopia-catalog: + name: Publish terminal APKs to Utopia + needs: [wholesale-pos, transit-terminal] + # Pull requests may build APKs, but only the main branch publishes public + # artifacts. Manual dispatch is deliberately allowed for a recovery run. + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + timeout-minutes: 20 + + steps: + - name: Download Transit APK + uses: actions/download-artifact@v4 + with: + name: multipaz-transit-terminal + path: artifacts/transit + + - name: Download POS APK + uses: actions/download-artifact@v4 + with: + name: multipaz-wholesale-pos + path: artifacts/pos + + - name: Verify APKs and prepare release metadata + id: release + run: | + set -euo pipefail + release_version="${GITHUB_SHA::7}" + + apksigner="$(find "$ANDROID_HOME/build-tools" -type f -name apksigner | sort -V | tail -n 1)" + aapt="$(find "$ANDROID_HOME/build-tools" -type f -name aapt | sort -V | tail -n 1)" + test -n "$apksigner" && test -x "$apksigner" + test -n "$aapt" && test -x "$aapt" + + transit_apk="$(find artifacts/transit -type f -name '*.apk' -print -quit)" + pos_apk="$(find artifacts/pos -type f -name '*.apk' -print -quit)" + test -n "$transit_apk" && test -n "$pos_apk" + + verify_apk() { + apk="$1" + expected_package="$2" + "$apksigner" verify --verbose --print-certs "$apk" + badging="$($aapt dump badging "$apk")" + package_name="$(printf '%s\n' "$badging" | sed -n "s/^package: name='\([^']*\)'.*/\1/p")" + version_code="$(printf '%s\n' "$badging" | sed -n "s/^package:.*versionCode='\([^']*\)'.*/\1/p")" + test "$package_name" = "$expected_package" + test "$version_code" = "$GITHUB_RUN_NUMBER" + } + + verify_apk "$transit_apk" org.multipaz.transit + verify_apk "$pos_apk" org.multipaz.pos + + apk_version() { + "$aapt" dump badging "$1" | sed -n "s/^package:.*versionName='\([^']*\)'.*/\1/p" + } + transit_version="$(apk_version "$transit_apk")" + pos_version="$(apk_version "$pos_apk")" + test "$transit_version" = "$release_version" || { + echo "Transit versionName does not match commit $release_version." >&2 + exit 1 + } + test "$pos_version" = "$release_version" || { + echo "POS versionName does not match commit $release_version." >&2 + exit 1 + } + + transit_sha="$(sha256sum "$transit_apk" | awk '{print $1}')" + pos_sha="$(sha256sum "$pos_apk" | awk '{print $1}')" + transit_cert="$($apksigner verify --print-certs "$transit_apk" | sed -n 's/^Signer #1 certificate SHA-256 digest: //p')" + pos_cert="$($apksigner verify --print-certs "$pos_apk" | sed -n 's/^Signer #1 certificate SHA-256 digest: //p')" + test -n "$transit_cert" && test -n "$pos_cert" + + cp "$transit_apk" "$RUNNER_TEMP/utopia-transit.apk" + cp "$pos_apk" "$RUNNER_TEMP/utopia-pos.apk" + printf '%s utopia-transit.apk\n' "$transit_sha" > "$RUNNER_TEMP/utopia-transit.apk.sha256" + printf '%s utopia-pos.apk\n' "$pos_sha" > "$RUNNER_TEMP/utopia-pos.apk.sha256" + + { + echo "version=$release_version" + echo "transit_sha=$transit_sha" + echo "pos_sha=$pos_sha" + echo "transit_cert=$transit_cert" + echo "pos_cert=$pos_cert" + } >> "$GITHUB_OUTPUT" + + - name: Authenticate to Google Cloud + uses: google-github-actions/auth@v2 + with: + workload_identity_provider: ${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }} + service_account: ${{ env.GCP_DEPLOY_SERVICE_ACCOUNT }} + + - name: Set up gcloud + uses: google-github-actions/setup-gcloud@v2 + + - name: Fetch the current Utopia catalog + run: | + set -euo pipefail + gcloud compute scp \ + "${GCP_INSTANCE}:${UTOPIA_DOWNLOADS_DIR}/releases.json" \ + "${RUNNER_TEMP}/releases.json" \ + --project="$GCP_PROJECT_ID" \ + --zone="$GCP_ZONE" \ + --tunnel-through-iap \ + --quiet + + - name: Update the catalog manifest + env: + RELEASE_VERSION: ${{ steps.release.outputs.version }} + TRANSIT_SHA: ${{ steps.release.outputs.transit_sha }} + POS_SHA: ${{ steps.release.outputs.pos_sha }} + TRANSIT_CERT: ${{ steps.release.outputs.transit_cert }} + POS_CERT: ${{ steps.release.outputs.pos_cert }} + run: | + set -euo pipefail + command -v jq >/dev/null + release_date="$(date -u +%F)" + transit_size="$(stat --printf='%s' "$RUNNER_TEMP/utopia-transit.apk") bytes" + pos_size="$(stat --printf='%s' "$RUNNER_TEMP/utopia-pos.apk") bytes" + + jq \ + --arg version "$RELEASE_VERSION" \ + --arg released_at "$release_date" \ + --arg transit_sha "$TRANSIT_SHA" \ + --arg pos_sha "$POS_SHA" \ + --arg transit_cert "$TRANSIT_CERT" \ + --arg pos_cert "$POS_CERT" \ + --arg transit_size "$transit_size" \ + --arg pos_size "$pos_size" \ + ' + def update_app($id; $sha; $cert; $size): + if any(.apps[]; .id == $id) then + .apps |= map( + if .id == $id then + . + { + version: $version, + releasedAt: $released_at, + minAndroid: 29, + size: $size, + apkUrl: ("/downloads/" + $id + "/" + $version + "/" + $id + ".apk"), + sha256: $sha, + signingCertificate: $cert + } | del(.status) + else . end + ) + else error("Catalog is missing " + $id) + end; + if (.apps | type) != "array" then error("Catalog manifest is missing apps") else . end + | update_app("utopia-transit"; $transit_sha; $transit_cert; $transit_size) + | update_app("utopia-pos"; $pos_sha; $pos_cert; $pos_size) + ' "$RUNNER_TEMP/releases.json" > "$RUNNER_TEMP/releases.next.json" + + - name: Upload immutable APKs and atomically publish the catalog + env: + RELEASE_VERSION: ${{ steps.release.outputs.version }} + TRANSIT_SHA: ${{ steps.release.outputs.transit_sha }} + POS_SHA: ${{ steps.release.outputs.pos_sha }} + run: | + set -euo pipefail + remote_staging="/tmp/utopia-app-release-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}" + gcloud compute ssh "$GCP_INSTANCE" \ + --project="$GCP_PROJECT_ID" --zone="$GCP_ZONE" --tunnel-through-iap --quiet \ + --command="mkdir -p '$remote_staging'" + gcloud compute scp \ + "$RUNNER_TEMP/utopia-transit.apk" \ + "$RUNNER_TEMP/utopia-transit.apk.sha256" \ + "$RUNNER_TEMP/utopia-pos.apk" \ + "$RUNNER_TEMP/utopia-pos.apk.sha256" \ + "$RUNNER_TEMP/releases.next.json" \ + "${GCP_INSTANCE}:${remote_staging}/" \ + --project="$GCP_PROJECT_ID" --zone="$GCP_ZONE" --tunnel-through-iap --quiet + gcloud compute ssh "$GCP_INSTANCE" \ + --project="$GCP_PROJECT_ID" --zone="$GCP_ZONE" --tunnel-through-iap --quiet \ + --command="sudo bash -s -- '$remote_staging' '$UTOPIA_DOWNLOADS_DIR' '$RELEASE_VERSION' '$TRANSIT_SHA' '$POS_SHA'" <<'REMOTE_SCRIPT' + set -euo pipefail + staging_dir="$1" + downloads_dir="$2" + version="$3" + transit_sha="$4" + pos_sha="$5" + + install -d -m 0755 "$downloads_dir" + publish() { + app_id="$1" + filename="$2" + expected_sha="$3" + target_dir="$downloads_dir/$app_id/$version" + target="$target_dir/$filename" + install -d -m 0755 "$target_dir" + if [ -e "$target" ]; then + actual_sha="$(sha256sum "$target" | awk '{print $1}')" + test "$actual_sha" = "$expected_sha" || { echo "Refusing to overwrite $target" >&2; exit 1; } + else + install -m 0644 "$staging_dir/$filename" "$target" + actual_sha="$(sha256sum "$target" | awk '{print $1}')" + test "$actual_sha" = "$expected_sha" + fi + install -m 0644 "$staging_dir/$filename.sha256" "$target.sha256" + } + + publish utopia-transit utopia-transit.apk "$transit_sha" + publish utopia-pos utopia-pos.apk "$pos_sha" + install -m 0644 "$staging_dir/releases.next.json" "$downloads_dir/releases.json.next" + mv -f "$downloads_dir/releases.json.next" "$downloads_dir/releases.json" + rm -rf "$staging_dir" + REMOTE_SCRIPT diff --git a/.github/workflows/deploy-terminal-backends.yml b/.github/workflows/deploy-terminal-backends.yml new file mode 100644 index 00000000..62a111b5 --- /dev/null +++ b/.github/workflows/deploy-terminal-backends.yml @@ -0,0 +1,203 @@ +name: Deploy terminal backends to production + +on: + push: + branches: [main] + paths: + - MultipazTransitTerminal/** + - MultipazWholesalePOS/** + - .github/workflows/deploy-terminal-backends.yml + workflow_dispatch: + +permissions: + contents: read + id-token: write + +env: + GCP_PROJECT_ID: utopia-multipaz + GCP_ZONE: us-central1-c + GCP_INSTANCE: utopia-multipaz-server + GCP_WORKLOAD_IDENTITY_PROVIDER: projects/873069027544/locations/global/workloadIdentityPools/github/providers/github-actions + GCP_DEPLOY_SERVICE_ACCOUNT: utopia-github-deployer@utopia-multipaz.iam.gserviceaccount.com + ARTIFACT_REGISTRY_REPOSITORY: us-central1-docker.pkg.dev/utopia-multipaz/multipaz-images + +jobs: + deploy: + name: Build and deploy Transit and POS backends + runs-on: ubuntu-latest + timeout-minutes: 45 + env: + IMAGE_TAG: ${{ github.sha }} + + steps: + - name: Check out the deployment revision + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "17" + cache: gradle + + # Gradle configures the Android modules while selecting either backend + # task, so their signing properties must exist even though this workflow + # builds only the backend Docker images. + - name: Restore signing keystore for Gradle configuration + env: + KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} + KEYSTORE_PROPERTIES_B64: ${{ secrets.ANDROID_KEYSTORE_PROPERTIES_B64 }} + run: | + set -euo pipefail + test -n "$KEYSTORE_B64" || { echo "Missing ANDROID_KEYSTORE_B64 secret."; exit 1; } + test -n "$KEYSTORE_PROPERTIES_B64" || { echo "Missing ANDROID_KEYSTORE_PROPERTIES_B64 secret."; exit 1; } + mkdir -p keys + printf '%s' "$KEYSTORE_B64" | base64 --decode > keys/keystore.jks + printf '%s' "$KEYSTORE_PROPERTIES_B64" | base64 --decode > keys/keystore.properties + chmod 600 keys/keystore.jks keys/keystore.properties + + - name: Build Linux AMD64 terminal images + run: | + set -euo pipefail + ( + cd MultipazTransitTerminal + ./gradlew :transitBackend:buildDockerImageAmd64 -PimageTag="$IMAGE_TAG" + ) + ( + cd MultipazWholesalePOS + ./gradlew :terminalBackend:buildDockerImageAmd64 -PimageTag="$IMAGE_TAG" + ) + docker image inspect "multipaz-transit-terminal:$IMAGE_TAG" >/dev/null + docker image inspect "multipaz-pos-terminal:$IMAGE_TAG" >/dev/null + + - name: Tag images with immutable Artifact Registry names + id: images + run: | + set -euo pipefail + transit_image="${ARTIFACT_REGISTRY_REPOSITORY}/transit-terminal:${IMAGE_TAG}" + pos_image="${ARTIFACT_REGISTRY_REPOSITORY}/pos-terminal:${IMAGE_TAG}" + docker tag "multipaz-transit-terminal:$IMAGE_TAG" "$transit_image" + docker tag "multipaz-pos-terminal:$IMAGE_TAG" "$pos_image" + printf 'transit=%s\n' "$transit_image" >> "$GITHUB_OUTPUT" + printf 'pos=%s\n' "$pos_image" >> "$GITHUB_OUTPUT" + + - name: Authenticate to Google Cloud + uses: google-github-actions/auth@v2 + with: + workload_identity_provider: ${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }} + service_account: ${{ env.GCP_DEPLOY_SERVICE_ACCOUNT }} + + - name: Set up gcloud + uses: google-github-actions/setup-gcloud@v2 + + - name: Push immutable images to Artifact Registry + env: + TRANSIT_IMAGE: ${{ steps.images.outputs.transit }} + POS_IMAGE: ${{ steps.images.outputs.pos }} + run: | + set -euo pipefail + gcloud auth configure-docker us-central1-docker.pkg.dev --quiet + for image in "$TRANSIT_IMAGE" "$POS_IMAGE"; do + if docker manifest inspect "$image" >/dev/null 2>&1; then + echo "Immutable image already exists; reusing $image" + else + docker push "$image" + fi + done + + - name: Make VM space and preserve terminal rollback images + run: | + set -euo pipefail + gcloud compute ssh "$GCP_INSTANCE" \ + --project="$GCP_PROJECT_ID" \ + --zone="$GCP_ZONE" \ + --tunnel-through-iap \ + --quiet \ + --command='sudo bash -s' <<'REMOTE_SCRIPT' + set -euo pipefail + + stack_dir=/opt/multipaz/stack + env_file="$stack_dir/.env" + rollback_env="$stack_dir/.env.terminal.rollback" + cd "$stack_dir" + test -f "$env_file" + cp -p "$env_file" "$rollback_env" + + # Images used by the running terminal containers stay local for + # rollback. Other immutable versions remain in Artifact Registry. + docker image prune --all --force + docker builder prune --all --force + journalctl --vacuum-size=200M + + available_kib="$(df -Pk / | awk 'NR == 2 {print $4}')" + if [ "$available_kib" -lt 1258291 ]; then + echo "Need at least 1.2 GiB free on / before loading terminal images; have ${available_kib} KiB" >&2 + exit 1 + fi + cp -a "$stack_dir" "${stack_dir}.bak-terminal-$(date -u +%Y%m%dT%H%M%SZ)" + df -h / + REMOTE_SCRIPT + + - name: Pull terminal images from Artifact Registry on the VM + env: + TRANSIT_IMAGE: ${{ steps.images.outputs.transit }} + POS_IMAGE: ${{ steps.images.outputs.pos }} + run: | + set -euo pipefail + gcloud compute ssh "$GCP_INSTANCE" \ + --project="$GCP_PROJECT_ID" \ + --zone="$GCP_ZONE" \ + --tunnel-through-iap \ + --quiet \ + --command="sudo bash -s -- '$TRANSIT_IMAGE' '$POS_IMAGE'" <<'REMOTE_SCRIPT' + set -euo pipefail + transit_image="$1" + pos_image="$2" + gcloud auth configure-docker us-central1-docker.pkg.dev --quiet + docker pull "$transit_image" + docker pull "$pos_image" + REMOTE_SCRIPT + + - name: Activate terminal images and verify rollback path + env: + TRANSIT_IMAGE: ${{ steps.images.outputs.transit }} + POS_IMAGE: ${{ steps.images.outputs.pos }} + run: | + set -euo pipefail + gcloud compute ssh "$GCP_INSTANCE" \ + --project="$GCP_PROJECT_ID" \ + --zone="$GCP_ZONE" \ + --tunnel-through-iap \ + --quiet \ + --command="sudo bash -s -- '$TRANSIT_IMAGE' '$POS_IMAGE'" <<'REMOTE_SCRIPT' + set -euo pipefail + + transit_image="$1" + pos_image="$2" + stack_dir=/opt/multipaz/stack + env_file="$stack_dir/.env" + rollback_env="$stack_dir/.env.terminal.rollback" + cd "$stack_dir" + + sed -i -E \ + "s|^TRANSIT_TERMINAL_IMAGE=.*|TRANSIT_TERMINAL_IMAGE=$transit_image|; s|^POS_TERMINAL_IMAGE=.*|POS_TERMINAL_IMAGE=$pos_image|" \ + "$env_file" + if ! docker compose --project-directory "$stack_dir" up -d --force-recreate transit-terminal pos-terminal; then + cp -p "$rollback_env" "$env_file" + docker compose --project-directory "$stack_dir" up -d --force-recreate transit-terminal pos-terminal || true + exit 1 + fi + + docker compose --project-directory "$stack_dir" ps transit-terminal pos-terminal + grep -E '^(TRANSIT_TERMINAL_IMAGE|POS_TERMINAL_IMAGE)=' "$env_file" + docker image prune --all --force + docker builder prune --all --force + df -h / + REMOTE_SCRIPT + + - name: Verify public terminal routes + run: | + set -euo pipefail + for path in /health /transit-terminal/ /pos-terminal/; do + curl --fail --retry 12 --retry-all-errors --retry-delay 5 "https://utopia.multipaz.org$path" >/dev/null + done diff --git a/MultipazCodelab/Holder/androidApp/build.gradle.kts b/MultipazCodelab/Holder/androidApp/build.gradle.kts index a2e5311f..84b3e955 100644 --- a/MultipazCodelab/Holder/androidApp/build.gradle.kts +++ b/MultipazCodelab/Holder/androidApp/build.gradle.kts @@ -59,6 +59,7 @@ dependencies { implementation(libs.multipaz) implementation(libs.multipaz.compose) + implementation(libs.multipaz.dcapi.credman) implementation(libs.ktor.client.android) diff --git a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/CredmanActivity.kt b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/CredmanActivity.kt index edc7b1ed..769e86a1 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/CredmanActivity.kt +++ b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/CredmanActivity.kt @@ -1,6 +1,7 @@ package org.multipaz.samples.wallet.cmp import org.koin.android.ext.android.inject +import org.koin.java.KoinJavaComponent.inject import org.multipaz.compose.digitalcredentials.CredentialManagerPresentmentActivity import org.multipaz.presentment.PresentmentSource import utopiasample.composeapp.generated.resources.Res diff --git a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/NdefService.kt b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/NdefService.kt index 83e04128..d94a97c7 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/NdefService.kt +++ b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/NdefService.kt @@ -3,19 +3,14 @@ package org.multipaz.samples.wallet.cmp import android.content.Context import org.koin.android.ext.android.inject import org.koin.java.KoinJavaComponent.inject -import org.multipaz.compose.mdoc.MdocNdefService import org.multipaz.compose.prompt.PresentmentActivity +import org.multipaz.context.applicationContext +import org.multipaz.mdoc.nfc.MdocNdefService import org.multipaz.mdoc.transport.MdocTransportOptions import org.multipaz.presentment.PresentmentSource import org.multipaz.samples.wallet.cmp.util.AppSettingsModel -class NdefService( - applicationContext: Context, - sendResponse: (ByteArray) -> Unit, -) : MdocNdefService( - applicationContext, - sendResponse, -) { +class NdefService : MdocNdefService() { private val presentmentSource: PresentmentSource by inject(PresentmentSource::class.java) private val settingsModel: AppSettingsModel by inject(AppSettingsModel::class.java) @@ -30,7 +25,6 @@ class NdefService( source = presentmentSource, promptModel = PresentmentActivity.promptModel, presentmentModel = PresentmentActivity.presentmentModel, - activityClass = PresentmentActivity::class.java, sessionEncryptionCurve = settingsModel.presentmentSessionEncryptionCurve.value, useNegotiatedHandover = settingsModel.presentmentUseNegotiatedHandover.value, negotiatedHandoverPreferredOrder = settingsModel.presentmentNegotiatedHandoverPreferredOrder.value, diff --git a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/UtopiaNfcService.kt b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/UtopiaNfcService.kt index f80b3bc8..b6c7e7b2 100644 --- a/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/UtopiaNfcService.kt +++ b/MultipazCodelab/Holder/androidApp/src/main/kotlin/org/multipaz/samples/wallet/cmp/UtopiaNfcService.kt @@ -1,14 +1,16 @@ package org.multipaz.samples.wallet.cmp import kotlinx.io.bytestring.ByteString -import org.multipaz.compose.mdoc.CombinedNfcService -import org.multipaz.compose.mdoc.NfcApduService +import org.multipaz.mdoc.nfc.MdocNfcDataTransferService import org.multipaz.nfc.Nfc +import org.multipaz.nfc.NfcApduRouter +import org.multipaz.nfc.NfcApduService -class UtopiaNfcService : CombinedNfcService() { +class UtopiaNfcService : NfcApduRouter() { override fun buildServices(): Map { return mapOf( - Nfc.NDEF_APPLICATION_ID to NdefService(this, ::sendResponseApdu), + Nfc.NDEF_APPLICATION_ID to NdefService(), + Nfc.ISO_MDOC_NFC_DATA_TRANSFER_APPLICATION_ID to MdocNfcDataTransferService(), ) } } diff --git a/MultipazCodelab/Holder/composeApp/build.gradle.kts b/MultipazCodelab/Holder/composeApp/build.gradle.kts index 2dda22e3..53325d3e 100644 --- a/MultipazCodelab/Holder/composeApp/build.gradle.kts +++ b/MultipazCodelab/Holder/composeApp/build.gradle.kts @@ -46,6 +46,7 @@ kotlin { implementation(libs.androidx.appcompat) implementation(libs.ktor.client.android) implementation(libs.koin.android) + implementation(libs.multipaz.dcapi.credman) } commonMain.dependencies { implementation(compose.runtime) @@ -60,7 +61,6 @@ kotlin { implementation(libs.kotlinx.datetime) implementation(libs.multipaz) implementation(libs.multipaz.doctypes) - implementation(libs.multipaz.dcapi) implementation(libs.multipaz.compose) implementation(libs.ktor.client.core) // CIO for JVM/Android; Darwin engine for iOS in iosMain @@ -76,6 +76,7 @@ kotlin { implementation(libs.ktor.client.darwin) implementation(libs.androidx.sqlite) implementation(libs.androidx.sqlite.framework) + implementation(libs.multipaz.dcapi.ios) } } commonTest.dependencies { diff --git a/MultipazCodelab/Holder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.android.kt b/MultipazCodelab/Holder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.android.kt index a4b43625..a863af61 100644 --- a/MultipazCodelab/Holder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.android.kt +++ b/MultipazCodelab/Holder/composeApp/src/androidMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.android.kt @@ -1,3 +1,10 @@ package org.multipaz.samples.wallet.cmp.util +import org.multipaz.digitalcredentials.DigitalCredentials +import org.multipaz.digitalcredentials.DigitalCredentialsCredman + actual fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean = true + +actual suspend fun getDigitalCredentials(): DigitalCredentials { + return DigitalCredentialsCredman.create() +} diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/AppSettingsModel.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/AppSettingsModel.kt index 3e3cb252..514ead26 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/AppSettingsModel.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/AppSettingsModel.kt @@ -12,7 +12,6 @@ import org.multipaz.cbor.buildCborArray import org.multipaz.cbor.toDataItem import org.multipaz.crypto.EcCurve import org.multipaz.digitalcredentials.DigitalCredentials -import org.multipaz.digitalcredentials.getDefault import org.multipaz.storage.Storage import org.multipaz.storage.StorageTable import org.multipaz.storage.StorageTableSpec @@ -45,7 +44,7 @@ class AppSettingsModel private constructor( ): AppSettingsModel { val instance = AppSettingsModel(readOnly) instance.settingsTable = storage.getTable(tableSpec) - instance.digitalCredentials = DigitalCredentials.getDefault() + instance.digitalCredentials = getDigitalCredentials() instance.init() return instance } diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/DigitalCredentialsRegistrationManager.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/DigitalCredentialsRegistrationManager.kt index 2c5d4f0c..37d339bf 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/DigitalCredentialsRegistrationManager.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/DigitalCredentialsRegistrationManager.kt @@ -3,7 +3,6 @@ package org.multipaz.samples.wallet.cmp.util import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.multipaz.digitalcredentials.DigitalCredentials -import org.multipaz.digitalcredentials.getDefault import org.multipaz.document.DocumentStore import org.multipaz.documenttype.DocumentTypeRepository import org.multipaz.util.Logger @@ -27,7 +26,7 @@ class DigitalCredentialsRegistrationManager( } registerMutex.withLock { - val digitalCredentials: DigitalCredentials = DigitalCredentials.getDefault() + val digitalCredentials: DigitalCredentials = getDigitalCredentials() if (!digitalCredentials.registerAvailable) { Logger.i(TAG, "Skipping register: API not available ($reason)") return diff --git a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.kt b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.kt index 7c289b4c..5699bf7b 100644 --- a/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.kt +++ b/MultipazCodelab/Holder/composeApp/src/commonMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.kt @@ -1,3 +1,7 @@ package org.multipaz.samples.wallet.cmp.util +import org.multipaz.digitalcredentials.DigitalCredentials + expect fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean + +expect suspend fun getDigitalCredentials(): DigitalCredentials diff --git a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.ios.kt b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.ios.kt index c6fb5bb5..0c848a2a 100644 --- a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.ios.kt +++ b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformDigitalCredentials.ios.kt @@ -1,3 +1,10 @@ package org.multipaz.samples.wallet.cmp.util +import org.multipaz.digitalcredentials.DigitalCredentials +import org.multipaz.digitalcredentials.DigitalCredentialsIos + actual fun shouldRegisterDigitalCredentialsInCommonModule(): Boolean = false + +actual suspend fun getDigitalCredentials(): DigitalCredentials { + return DigitalCredentialsIos.create() +} diff --git a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformStorage.ios.kt b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformStorage.ios.kt index 4abc2237..4a2f4d25 100644 --- a/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformStorage.ios.kt +++ b/MultipazCodelab/Holder/composeApp/src/iosMain/kotlin/org/multipaz/samples/wallet/cmp/util/PlatformStorage.ios.kt @@ -2,6 +2,7 @@ package org.multipaz.samples.wallet.cmp.util import org.multipaz.storage.Storage import org.multipaz.storage.ios.IosStorage +import platform.Foundation.NSBundle import platform.Foundation.NSFileManager private const val IOS_APP_GROUP_IDENTIFIER = "group.org.multipaz.hanlu.testapp.sharedgroup" @@ -11,7 +12,9 @@ actual fun createWalletStorage(): Storage = storageFileUrl = NSFileManager.defaultManager .containerURLForSecurityApplicationGroupIdentifier( - groupIdentifier = IOS_APP_GROUP_IDENTIFIER, + groupIdentifier = + NSBundle.mainBundle.objectForInfoDictionaryKey("AppGroupID") as? String + ?: error("Missing AppGroupID in Info.plist"), )!! .URLByAppendingPathComponent("storageNoBackup.db")!!, excludeFromBackup = true, diff --git a/MultipazCodelab/Holder/gradle/libs.versions.toml b/MultipazCodelab/Holder/gradle/libs.versions.toml index 976b8c70..5d594bc0 100644 --- a/MultipazCodelab/Holder/gradle/libs.versions.toml +++ b/MultipazCodelab/Holder/gradle/libs.versions.toml @@ -17,7 +17,7 @@ kotlinx-coroutines = "1.8.1" kotlinx-io = "0.4.0" kotlinx-datetime = "0.6.0" kotlinx-serialization = "1.7.3" -multipaz = "0.101.0" +multipaz = "0.102.0" ktor = "3.1.0" androidx-sqlite = "2.5.2" coil = "3.3.0" @@ -48,7 +48,8 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa multipaz = { group = "org.multipaz", name = "multipaz", version.ref = "multipaz" } multipaz-doctypes = { group = "org.multipaz", name = "multipaz-doctypes", version.ref = "multipaz" } multipaz-compose = { group = "org.multipaz", name = "multipaz-compose", version.ref = "multipaz" } -multipaz-dcapi = { group = "org.multipaz", name = "multipaz-dcapi", version.ref = "multipaz" } +multipaz-dcapi-credman = { group = "org.multipaz", name = "multipaz-dcapi-credman", version.ref = "multipaz" } +multipaz-dcapi-ios = { group = "org.multipaz", name = "multipaz-dcapi-ios", version.ref = "multipaz" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } diff --git a/MultipazGettingStartedSample/composeApp/build.gradle.kts b/MultipazGettingStartedSample/composeApp/build.gradle.kts index 5758b286..d1f0f344 100644 --- a/MultipazGettingStartedSample/composeApp/build.gradle.kts +++ b/MultipazGettingStartedSample/composeApp/build.gradle.kts @@ -40,6 +40,8 @@ kotlin { implementation(libs.androidx.activity.compose) implementation(libs.androidx.fragment) + + implementation(libs.multipaz.dcapi.credman) } commonMain.dependencies { implementation(project(":core")) @@ -70,6 +72,8 @@ kotlin { implementation(libs.ktor.client.darwin) implementation(libs.androidx.sqlite) implementation(libs.androidx.sqlite.framework) + + implementation(libs.multipaz.dcapi.ios) } commonTest.dependencies { implementation(libs.kotlin.test) diff --git a/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/GetStartedNfcService.kt b/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/GetStartedNfcService.kt index 32db888e..21e4d8a6 100644 --- a/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/GetStartedNfcService.kt +++ b/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/GetStartedNfcService.kt @@ -1,14 +1,16 @@ package org.multipaz.getstarted import kotlinx.io.bytestring.ByteString -import org.multipaz.compose.mdoc.CombinedNfcService -import org.multipaz.compose.mdoc.NfcApduService +import org.multipaz.mdoc.nfc.MdocNfcDataTransferService import org.multipaz.nfc.Nfc +import org.multipaz.nfc.NfcApduRouter +import org.multipaz.nfc.NfcApduService -class GetStartedNfcService : CombinedNfcService() { +class GetStartedNfcService : NfcApduRouter() { override fun buildServices(): Map { return mapOf( - Nfc.NDEF_APPLICATION_ID to NdefService(this, ::sendResponseApdu), + Nfc.NDEF_APPLICATION_ID to NdefService(), + Nfc.ISO_MDOC_NFC_DATA_TRANSFER_APPLICATION_ID to MdocNfcDataTransferService() ) } } diff --git a/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/NdefService.kt b/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/NdefService.kt index 0f97115f..526e614e 100644 --- a/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/NdefService.kt +++ b/MultipazGettingStartedSample/composeApp/src/androidMain/kotlin/org/multipaz/getstarted/NdefService.kt @@ -1,10 +1,10 @@ package org.multipaz.getstarted import android.content.Context -import org.multipaz.compose.mdoc.MdocNdefService import org.multipaz.compose.prompt.PresentmentActivity import org.multipaz.crypto.EcCurve import org.multipaz.getstarted.core.AppContainer +import org.multipaz.mdoc.nfc.MdocNdefService import org.multipaz.mdoc.transport.MdocTransportOptions class NdefService( @@ -27,7 +27,6 @@ class NdefService( source = container.presentmentSource, promptModel = PresentmentActivity.promptModel, presentmentModel = PresentmentActivity.presentmentModel, - activityClass = PresentmentActivity::class.java, transportOptions = MdocTransportOptions(bleUseL2CAP = true), sessionEncryptionCurve = EcCurve.P256, useNegotiatedHandover = true, diff --git a/MultipazGettingStartedSample/core/build.gradle.kts b/MultipazGettingStartedSample/core/build.gradle.kts index 59271925..34d2d554 100644 --- a/MultipazGettingStartedSample/core/build.gradle.kts +++ b/MultipazGettingStartedSample/core/build.gradle.kts @@ -27,6 +27,7 @@ kotlin { sourceSets { androidMain.dependencies { implementation(libs.ktor.client.android) + implementation(libs.multipaz.dcapi.credman) } commonMain.dependencies { implementation(compose.runtime) @@ -46,6 +47,7 @@ kotlin { implementation(libs.ktor.client.darwin) implementation(libs.androidx.sqlite) implementation(libs.androidx.sqlite.framework) + implementation(libs.multipaz.dcapi.ios) } } } diff --git a/MultipazGettingStartedSample/core/src/androidMain/kotlin/org/multipaz/getstarted/core/Platform.kt b/MultipazGettingStartedSample/core/src/androidMain/kotlin/org/multipaz/getstarted/core/Platform.kt index 4ea5522f..a095b68a 100644 --- a/MultipazGettingStartedSample/core/src/androidMain/kotlin/org/multipaz/getstarted/core/Platform.kt +++ b/MultipazGettingStartedSample/core/src/androidMain/kotlin/org/multipaz/getstarted/core/Platform.kt @@ -4,6 +4,8 @@ import android.content.pm.PackageManager import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.android.Android import org.multipaz.context.applicationContext +import org.multipaz.digitalcredentials.DigitalCredentials +import org.multipaz.digitalcredentials.DigitalCredentialsCredman import org.multipaz.digitalcredentials.getAppOrigin @Suppress("DEPRECATION") @@ -20,6 +22,10 @@ actual suspend fun getAppToAppOrigin(): String { actual fun isAndroid(): Boolean = true +actual suspend fun getDigitalCredentials(): DigitalCredentials { + return DigitalCredentialsCredman.create() +} + actual val httpClientEngineFactory: HttpClientEngineFactory<*> by lazy { Android } diff --git a/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/AppContainerImpl.kt b/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/AppContainerImpl.kt index 13221234..14379f0d 100644 --- a/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/AppContainerImpl.kt +++ b/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/AppContainerImpl.kt @@ -143,16 +143,17 @@ class AppContainerImpl : AppContainer { validFrom = validFrom, validUntil = validUntil, domain = CredentialDomains.MDOC_USER_AUTH, - ) { namespaceName, dataElement -> - setOf( - "age_over_18", - "age_over_21", - "portrait", - "given_name", - "family_name", - "birth_date", - ).contains(dataElement.attribute.identifier) - } + includeElement = { namespaceName, dataElement -> + setOf( + "age_over_18", + "age_over_21", + "portrait", + "given_name", + "family_name", + "birth_date", + ).contains(dataElement.attribute.identifier) + } + ) } // Initialize TrustManager @@ -259,7 +260,7 @@ class AppContainerImpl : AppContainer { ), ) - val digitalCredentials = DigitalCredentials.getDefault() + val digitalCredentials = getDigitalCredentials() if (digitalCredentials.registerAvailable) { try { digitalCredentials.register( diff --git a/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/Platform.kt b/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/Platform.kt index e0564a2b..c54eb691 100644 --- a/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/Platform.kt +++ b/MultipazGettingStartedSample/core/src/commonMain/kotlin/org/multipaz/getstarted/core/Platform.kt @@ -1,9 +1,12 @@ package org.multipaz.getstarted.core import io.ktor.client.engine.HttpClientEngineFactory +import org.multipaz.digitalcredentials.DigitalCredentials expect suspend fun getAppToAppOrigin(): String expect fun isAndroid(): Boolean +expect suspend fun getDigitalCredentials(): DigitalCredentials + expect val httpClientEngineFactory: HttpClientEngineFactory<*> diff --git a/MultipazGettingStartedSample/core/src/iosMain/kotlin/org/multipaz/getstarted/core/Platform.kt b/MultipazGettingStartedSample/core/src/iosMain/kotlin/org/multipaz/getstarted/core/Platform.kt index 1c59c406..1547b5cf 100644 --- a/MultipazGettingStartedSample/core/src/iosMain/kotlin/org/multipaz/getstarted/core/Platform.kt +++ b/MultipazGettingStartedSample/core/src/iosMain/kotlin/org/multipaz/getstarted/core/Platform.kt @@ -2,6 +2,8 @@ package org.multipaz.getstarted.core import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.darwin.Darwin +import org.multipaz.digitalcredentials.DigitalCredentials +import org.multipaz.digitalcredentials.DigitalCredentialsIos import platform.Foundation.NSBundle actual fun isAndroid(): Boolean = false @@ -10,6 +12,10 @@ actual suspend fun getAppToAppOrigin(): String { return NSBundle.mainBundle.bundleIdentifier ?: "unknown.bundle.id" } +actual suspend fun getDigitalCredentials(): DigitalCredentials { + return DigitalCredentialsIos.create() +} + actual val httpClientEngineFactory: HttpClientEngineFactory<*> by lazy { Darwin } diff --git a/MultipazGettingStartedSample/feature/biometrics/src/commonMain/kotlin/org/multipaz/getstarted/biometrics/SelfieCheckSection.kt b/MultipazGettingStartedSample/feature/biometrics/src/commonMain/kotlin/org/multipaz/getstarted/biometrics/SelfieCheckSection.kt index 73833ed1..e7ef1daf 100644 --- a/MultipazGettingStartedSample/feature/biometrics/src/commonMain/kotlin/org/multipaz/getstarted/biometrics/SelfieCheckSection.kt +++ b/MultipazGettingStartedSample/feature/biometrics/src/commonMain/kotlin/org/multipaz/getstarted/biometrics/SelfieCheckSection.kt @@ -3,9 +3,11 @@ package org.multipaz.getstarted.biometrics import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text diff --git a/MultipazGettingStartedSample/feature/verification/build.gradle.kts b/MultipazGettingStartedSample/feature/verification/build.gradle.kts index 05f61e6f..364dc699 100644 --- a/MultipazGettingStartedSample/feature/verification/build.gradle.kts +++ b/MultipazGettingStartedSample/feature/verification/build.gradle.kts @@ -40,6 +40,12 @@ kotlin { implementation(libs.coil.compose) implementation(libs.kotlinx.serialization.json) } + androidMain.dependencies { + implementation(libs.multipaz.dcapi.credman) + } + iosMain.dependencies { + implementation(libs.multipaz.dcapi.ios) + } } } diff --git a/MultipazGettingStartedSample/feature/verification/src/commonMain/kotlin/org/multipaz/getstarted/verification/W3CDCCredentialsRequestButton.kt b/MultipazGettingStartedSample/feature/verification/src/commonMain/kotlin/org/multipaz/getstarted/verification/W3CDCCredentialsRequestButton.kt index 11592961..f6c1efa8 100644 --- a/MultipazGettingStartedSample/feature/verification/src/commonMain/kotlin/org/multipaz/getstarted/verification/W3CDCCredentialsRequestButton.kt +++ b/MultipazGettingStartedSample/feature/verification/src/commonMain/kotlin/org/multipaz/getstarted/verification/W3CDCCredentialsRequestButton.kt @@ -37,6 +37,7 @@ import org.multipaz.digitalcredentials.getDefault import org.multipaz.documenttype.SingleDocumentCannedRequest import org.multipaz.documenttype.knowntypes.DrivingLicense import org.multipaz.getstarted.core.getAppToAppOrigin +import org.multipaz.getstarted.core.getDigitalCredentials import org.multipaz.getstarted.verification.W3CDCConstants.Companion.CERT_CRL_URL import org.multipaz.getstarted.verification.W3CDCConstants.Companion.CERT_SERIAL_NUMBER_BITS import org.multipaz.getstarted.verification.W3CDCConstants.Companion.CERT_SUBJECT_COMMON_NAME @@ -322,7 +323,7 @@ private suspend fun doDcRequestFlow( Logger.iJson(TAG, "Request", dcRequestObject) val t0 = Clock.System.now() - val dcResponseObject = DigitalCredentials.getDefault().request(dcRequestObject) + val dcResponseObject = getDigitalCredentials().request(dcRequestObject) Logger.iJson(TAG, "Response", dcResponseObject) val dcResponse = VerificationUtil.decryptDcResponse( diff --git a/MultipazGettingStartedSample/gradle/libs.versions.toml b/MultipazGettingStartedSample/gradle/libs.versions.toml index 4aa0ab53..220ae3da 100644 --- a/MultipazGettingStartedSample/gradle/libs.versions.toml +++ b/MultipazGettingStartedSample/gradle/libs.versions.toml @@ -19,7 +19,7 @@ kotlinxSerializationJson = "1.9.0" ktor = "3.4.0" androidx-sqlite = "2.5.2" -multipaz = "0.100.0" # latest version of Multipaz to use +multipaz = "0.102.0" # latest version of Multipaz to use multipaz-vision = "0.95.0" # latest version of Multipaz Extras androidx-fragment = "1.8.6" @@ -42,7 +42,8 @@ multipaz = { group = "org.multipaz", name = "multipaz", version.ref = "multipaz" multipaz-compose = { group = "org.multipaz", name = "multipaz-compose", version.ref = "multipaz" } multipaz-doctypes = { group = "org.multipaz", name = "multipaz-doctypes", version.ref = "multipaz" } multipaz-vision = { group = "org.multipaz", name = "multipaz-vision", version.ref = "multipaz-vision" } -multipaz-dcapi = { group = "org.multipaz", name = "multipaz-dcapi", version.ref = "multipaz" } +multipaz-dcapi-credman = { group = "org.multipaz", name = "multipaz-dcapi-credman", version.ref = "multipaz" } +multipaz-dcapi-ios = { group = "org.multipaz", name = "multipaz-dcapi-ios", version.ref = "multipaz" } multipaz-longfellow = { group = "org.multipaz", name = "multipaz-longfellow", version.ref = "multipaz" } androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidx-fragment" } diff --git a/MultipazTransitTerminal/.gitignore b/MultipazTransitTerminal/.gitignore new file mode 100644 index 00000000..faddc7a3 --- /dev/null +++ b/MultipazTransitTerminal/.gitignore @@ -0,0 +1,297 @@ +# Created by https://www.toptal.com/developers/gitignore/api/kotlin,android,androidstudio,intellij +# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,android,androidstudio,intellij + +### Android ### +# Gradle files +.gradle/ +build/ +.kotlin/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files +*.log + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +output.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof + +### Android Patch ### +gen-external-apklibs + +# Replacement of .externalNativeBuild directories introduced +# with Android Studio 3.5. + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +### Kotlin ### +# Compiled class file +*.class + +# Log file + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +.navigation/ +*.ipr +*~ +*.swp + +# Keystore files + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Android Patch + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# NDK +obj/ + +# IntelliJ IDEA +/out/ + +# User-specific configurations +.idea/caches/ +.idea/libraries/ +.idea/shelf/ +.idea/workspace.xml +.idea/tasks.xml +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/modules.xml +.idea/scopes/scope_settings.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml +.idea/assetWizardSettings.xml +.idea/gradle.xml +.idea/jarRepositories.xml +.idea/navEditor.xml + +# Legacy Eclipse project files +.classpath +.project +.cproject +.settings/ + +# Mobile Tools for Java (J2ME) + +# Package Files # + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) + +## Plugin-specific files: + +# mpeltonen/sbt-idea plugin + +# JIRA plugin + +# Mongo Explorer plugin +.idea/mongoSettings.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) + +### AndroidStudio Patch ### + +!/gradle/wrapper/gradle-wrapper.jar + +.agents/ + +terminalBackend/environment + +# End of https://www.toptal.com/developers/gitignore/api/kotlin,android,androidstudio,intellij \ No newline at end of file diff --git a/MultipazTransitTerminal/README.md b/MultipazTransitTerminal/README.md new file mode 100644 index 00000000..b68a1b42 --- /dev/null +++ b/MultipazTransitTerminal/README.md @@ -0,0 +1,241 @@ +# Multipaz Transit Terminal + +A sample transit faregate built with [Multipaz](https://github.com/openwallet-foundation/multipaz). +It reads a rider's Digital Payment Credential (DPC) over ISO 18013-5 proximity (NFC tap), records a +journey, and settles the selected fare through a device-attested terminal backend. + +This is a development sample. It uses a fictional `Utopia Transit` operator, USD fares, local HTTP, +and development attestation settings. + +## How it works + +```text +Rider wallet ── NFC tap ──> Transit terminal app ── attested RPC ──> Transit backend ──> Records server + DPC check in / choose exit / pay payment key ledger +``` + +1. At entry, the terminal reads the rider's DPC and records an open journey using its payment + instrument ID. +2. The operator selects an exit station (or randomly gets selected for demo purposes). The backend + stores the fare and the app asks the wallet to authorize that exact amount as ISO 18013 + transaction data. +3. At exit, the same credential must be presented. The terminal backend submits the signed + presentment to the records server, which verifies it and settles the payment. + +The Android app contains no payment-processor signing key. It authenticates to the backend using +device attestation; the backend owns the key used to authenticate to the records server. + +## Age-based fares + +The terminal can request an identity credential alongside the DPC to determine the rider's fare +class. It accepts an mDL, Photo ID, or EU Personal ID and derives the class from issuer-signed age +claims in this order: + +| Class | Eligibility | Fare applied | +|----------|--------------------------------------|-------------------| +| Child | Under 18 | 33% discount | +| Senior | 65 or older | 50% discount. | +| Standard | No qualifying age claim or age 18–64 | Full listed fare. | + +The app uses `age_over_65`, `age_over_18`, `age_in_years`, or `birth_date` where available (in that +order). If the wallet does not present an identity credential, the journey continues with the +standard fare. The derived fare class is recorded at check-in and the discounted amount is what the +wallet authorizes at checkout; it is not a user-selectable discount. + +## Project layout + +| Path | Purpose | +|-------------------|------------------------------------------------------------------------------------------| +| `androidApp/` | Android application entry point and Android permissions. | +| `shared/` | Kotlin Multiplatform Compose UI, proximity reader, journey client, and payment client. | +| `transitBackend/` | JVM/Ktor backend that verifies app attestation, stores journeys, and proxies settlement. | +| `iosApp/` | Xcode host application for the shared Compose UI. | + +The primary configuration points are: + +- `shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt` — backend URL, payee account, + currency, and terminal identity. +- `transitBackend/src/main/resources/resources/default_configuration.json` — server port, records + server URL, app-attestation requirements, and the development payment-processor identity. + +## Prerequisites + +- JDK 17. +- Android Studio with an Android SDK, plus a physical NFC-capable Android device running API 29 or + newer. +- `adb` when using a physical Android device. +- A compatible Multipaz Utopia records server and a holder wallet containing a DPC + (`org.multipaz.payment.sca.1`). The records server must trust the DPC issuer, trust this + terminal's payment-processor root, and contain both payer and payee accounts. The committed payee + account is `30000001`. + +For iOS development, use macOS and Xcode. NFC reader mode requires a signed device build with the +appropriate Core NFC entitlement. + +## Run it end to end + +### 1. Start the Utopia universe server + +- use [this branch](https://github.com/VishnuSanal/multipaz-utopia/tree/transit) - this adds a enw + account for the transit terminal inthe SOR + +Start a Multipaz Utopia server that is compatible with the snapshot dependency declared in +`gradle/libs.versions.toml`. + +```bash +./gradlew run +``` + +The backend's default is the deployed Utopia Registry at +`https://utopia.multipaz.org/registry`. For a local Docker Utopia bundle, override it as below. The +backend adds `/rpc` itself: + +```bash +./gradlew :transitBackend:run --args="-param records_server_url=http://localhost:8100/registry" +``` + +### 2. Start the transit backend + +```bash +./gradlew :transitBackend:run +``` + +The default backend listens on port `8011`. Confirm it is available at +`http://localhost:8011/`; it responds with `MultipazTransitTerminal backend is running`. + +### 3. Configure the Android terminal for the local backend + +The Android terminal talks to a local HTTP backend through `adb reverse`, and the backend accepts +only an attestation made by the terminal app's package and signing certificate. + +In `shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt`, use the local endpoint (the +example is already present as a comment): + +```kotlin +const val DEFAULT_TERMINAL_URL = "http://localhost:8011/rpc" +``` + +Comment out the deployed `https://utopia.multipaz.org/transit-terminal/rpc` +value while running locally. The debug manifest already permits cleartext HTTP; do not enable this +for a release build. + +#### Shared app-signing certificate is required + +The backend verifies Android Keystore attestation in +`transitBackend/src/main/resources/resources/default_configuration.json`: + +- package: `org.multipaz.transit` +- SHA-256 signing-certificate digest: `E3:41:87:7A:41:BD:70:23:81:3E:F2:60:A2:1F:81:0D:C8:BF:53:13:98:CB:16:17:5E:75:5B:97:8C:A6:A1:EF` + +Both terminal apps use the same keystore for **debug and release** builds. Gradle reads it from the +repository-level `keys/` directory: + +```text +keys/keystore.jks +keys/keystore.properties +``` + +`keystore.properties` contains the keystore password, alias, and key password: + +```properties +storePassword=... +keyAlias=... +keyPassword=... +``` + +These files are ignored by Git and must never be committed. To verify the certificate that Gradle +will use, run this from the repository root: + +```bash +keytool -list -v -keystore keys/keystore.jks -alias "$(sed -n 's/^keyAlias=//p' keys/keystore.properties)" | grep SHA256 +``` + +If you replace the keystore or use a different application ID, update +`client_requirements.android.app_signature_certificate_digests` and `app_packages` in the backend +configuration. A mismatch prevents the app from registering with the backend. + +### 4. Install the Android app and expose the backend + +```bash +adb reverse tcp:8011 tcp:8011 +./gradlew :androidApp:installDebug +``` + +`adb reverse` makes `localhost:8011` on a physical device reach the development machine. Use an +NFC-capable physical device for a real wallet tap; an emulator can be useful for installation and +backend-attestation checks but cannot replace that flow. For a remote terminal backend, set the URL +in `Constants.kt` to its reachable HTTPS endpoint. + +### 5. Issue DPC & age credential + +- issue a DPC from the utopia universe bank +- either generate (or issue) an age credential in the holder you are using. if you are using + testapp, you can + use [this branch](https://github.com/VishnuSanal/multipaz-identity-credential/tree/age) and + generate child and senior citizen credentials locally + +### 6. Run a journey + +1. Open the app and permissions as needed. +2. At **check-in**, present the rider wallet with NFC - this requests a DPC and an age credential. +3. Choose an exit station and fare (or this gets automatically selected with a timeout) +4. At **checkout**, present the same wallet again. A successful settlement shows a receipt; a failed + attestation, credential, or payment shows the decline reason. + +## Build and test + +```bash +./gradlew :androidApp:assembleDebug +./gradlew :transitBackend:run +./gradlew :shared:testAndroidHostTest +``` + +Open `iosApp/` in Xcode to build and run the iOS host app. Kotlin/Native iOS targets require a macOS +build host. + +## CI release APKs + +GitHub Actions runs [Build terminal apps](../.github/workflows/build-terminal-apps.yml) manually or +when changes are pushed to `main`. It builds only signed release APKs: + +```bash +./gradlew :androidApp:assembleRelease +``` + +The workflow restores the shared `keys/` files from these repository secrets: + +- `ANDROID_KEYSTORE_B64` — Base64-encoded `keys/keystore.jks`. +- `ANDROID_KEYSTORE_PROPERTIES_B64` — Base64-encoded `keys/keystore.properties`. + +Create each value as a single line from the repository root: + +```bash +base64 -w 0 keys/keystore.jks +base64 -w 0 keys/keystore.properties +``` + +On macOS, use `base64 -i | tr -d '\n'` instead. The workflow uploads the release APK as +the `multipaz-transit-terminal` artifact. + +## Development configuration and security + +`default_configuration.json` is deliberately suitable only for local development: + +- it listens on HTTP and accepts software-level Android keystore attestation; +- the app package and shared signing-certificate digest are pinned in `client_requirements`; +- the payment-processor private key is in the sample configuration; and +- the debug Android manifest enables cleartext traffic. + +Before using this pattern beyond a demo, use TLS, hardware-backed / Play Integrity attestation as +appropriate, production issuer and processor trust roots, and store the payment key in a secure +server-side key-management system or HSM. Never ship a payment-processor private key in an app. + +## Troubleshooting + +| Symptom | Likely cause | Resolution | +|------------------------------------|------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------| +| Cannot connect to terminal backend | Backend is stopped or device port forwarding is missing. | Start `:transitBackend:run` and run `adb reverse tcp:8011 tcp:8011`. | +| Registration / attestation fails | The APK package or signing digest differs from the backend configuration. | Update `client_requirements` to match the installed build. | +| Payment transaction is rejected | The records server does not trust the DPC issuer or terminal payment-processor root, or the accounts are absent. | Configure the same trust roots and seed the payer plus account `30000001`. | +| The second tap fails | A different DPC was presented at checkout. | Present the same credential used at check-in. | +| NFC does not start | Device NFC is disabled or unsupported, or the wallet does not support NFCv2. | Enable NFC and use an NFCv2-compatible wallet. | diff --git a/MultipazTransitTerminal/androidApp/build.gradle.kts b/MultipazTransitTerminal/androidApp/build.gradle.kts new file mode 100644 index 00000000..1dbd4ffc --- /dev/null +++ b/MultipazTransitTerminal/androidApp/build.gradle.kts @@ -0,0 +1,87 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import java.io.FileInputStream +import java.util.Properties + +plugins { + alias(libs.plugins.androidApplication) + alias(libs.plugins.composeCompiler) +} + +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + } +} +dependencies { + implementation(project(":shared")) + + implementation(libs.androidx.activity.compose) + + implementation(libs.androidx.fragment) + + implementation(libs.multipaz) + implementation(libs.multipaz.compose) + implementation(libs.multipaz.doctypes) + implementation(libs.multipaz.utopia) + + implementation(libs.compose.uiToolingPreview) + debugImplementation(libs.compose.uiTooling) +} + +val releaseVersionCode = providers.gradleProperty("releaseVersionCode").orNull?.toIntOrNull() ?: 1 +val sourceRevision = providers.exec { + commandLine("git", "rev-parse", "--short=7", "HEAD") +}.standardOutput.asText.map { it.trim() } +val releaseVersionName = providers.gradleProperty("releaseVersionName") + .orElse(sourceRevision) + .getOrElse("dev") + +android { + namespace = "org.multipaz.transit" + compileSdk = libs.versions.android.compileSdk.get().toInt() + + defaultConfig { + applicationId = "org.multipaz.transit" + minSdk = libs.versions.android.minSdk.get().toInt() + targetSdk = libs.versions.android.targetSdk.get().toInt() + versionCode = releaseVersionCode + versionName = releaseVersionName + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } + signingConfigs { + val keystorePropertiesFile = rootProject.file("../keys/keystore.properties") + val keystoreProperties = Properties().apply { + load(FileInputStream(keystorePropertiesFile)) + } + create("signing") { + storeFile = file("$rootDir/../keys/keystore.jks") + storePassword = keystoreProperties["storePassword"] as String + keyAlias = keystoreProperties["keyAlias"] as String + keyPassword = keystoreProperties["keyPassword"] as String + } + } + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + signingConfig = signingConfigs["signing"] + } + debug { + signingConfig = signingConfigs["signing"] + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + buildFeatures { + compose = true + } +} diff --git a/MultipazTransitTerminal/androidApp/proguard-rules.pro b/MultipazTransitTerminal/androidApp/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/debug/AndroidManifest.xml b/MultipazTransitTerminal/androidApp/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..67d9f942 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/debug/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/AndroidManifest.xml b/MultipazTransitTerminal/androidApp/src/main/AndroidManifest.xml new file mode 100644 index 00000000..609e3094 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/kotlin/org/multipaz/transit/MainActivity.kt b/MultipazTransitTerminal/androidApp/src/main/kotlin/org/multipaz/transit/MainActivity.kt new file mode 100644 index 00000000..da0ed888 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/kotlin/org/multipaz/transit/MainActivity.kt @@ -0,0 +1,19 @@ +package org.multipaz.transit + +import android.os.Bundle +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.fragment.app.FragmentActivity +import org.multipaz.context.initializeApplication + +class MainActivity : FragmentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + initializeApplication(applicationContext) + enableEdgeToEdge() + super.onCreate(savedInstanceState) + + setContent { + App() + } + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/res/drawable/ic_launcher_foreground.xml b/MultipazTransitTerminal/androidApp/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..60313405 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..7353dbd1 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..7353dbd1 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..e4393615548a8f2400bd44b091bf02a8caa98fc5 GIT binary patch literal 974 zcmV;<12OzkNk&G-0{{S5MM6+kP&iDv0{{RoN5ByfPX;-XBt=qG&*Br0q(3cAFNWUA zI8Xv&B-yH!*{`@03HcWh5Qw{T&KbyUBsr3zdRDx(vVNUd$MoLybOzkowpCU03hq_} zDUo+aL_efX${?o?`2KGKfbb8rfEo~h00bZc4WJ4HAb5G7JVpcDud zLS+j9QXmi@Tke2>l(8sd*$_Y>sGw3lUcWK|AykU~n<@6J5nMlKC>!ZOFiMM2S6Bie z5UTu!3NbGu3|)Z$2^=sQG_$&NIGVqm11COSe^BYDN2H^dLq_}}tHB?rIDueUHDft> zeR_F+`cQp;cPItOQCc7cN;Q8vg=*R>^;bVm^#7p9grii57$AUO5s+0PQBf0h4s4py zjY-JA7=RB#lTcPHrocwDUMx>V0YatjMFr%gHpIj8|6|*XYfJ}7BA^gdR}uG<-YjZe z)SOU8ny>nMiU`qIGWmM1&+XISpl`?S!l4|lHu2%+`uE7KdSwnFp&5Y#T1%$?&2sg- z)HEyV@9Fw}a->2zq;1=F$jwZg6q&7U+ip`k`__z8r$(IA4OX>n8>y||l^iqgJa6=I zU(7QR{ht7>@m()vQd0ON7{pK~$9K%uw$ATk5SIW@`A1{Z5V@em|DpoRy z7a}y>OsP1I+{a`^@UiBY(oZnszoVOrIO$`AtGkZ5sMD;t>QR)1^Xxpda*mz*b;Oav zoQ!m;atpekc1|*EoVWwf)=`G7d>feELk*k59Lf^I_QgPswzseSF&M=y?c+r-3TyCi zTXF&Qm_Bpz$l(-6w1d`p0YO}!Pcd)%Xkh&aB4(9InyZ2JOeTn%eKZgL0mhTOWX_@$ z6qk-~3rw}@+P#CK56b2SNb7E$T7sLfW-Y~)^9fFE0qpN#NpllHOzsVAxujW^O%Sm^ zu)#Tb1r*m2#D!gesWyWKQXD*G_N-nC8g1@TwM5Nzl&6;Hk~D2Vt<`x&&t_yMqKsO$`k1_a`9dGqZvIi{%UNiqW wA+hT1>sN0;zjS3)qWGd&)W60xZPpyTi?QFN6(OR3{`d~w85E7F0PdX4y#N3J literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..2eca7afc068662093cfb4661d37be164a8189d0c GIT binary patch literal 2360 zcmV-83CH$QNk&F62><|BMM6+kP&iB@2><{uN5Byf6^DYhZ5W3?>>UgdF#+Dy(nLG1 zE{j=t)0MStk>mWya%5&^W@cu#(4a-ZfUvt|=6uVUYwyGtvR5=c(><*l_^K8%Q%76I zh}GuhXfyw2{LQFZ{LD0}>cx!A(1wgBQk&WSOPQIOnHgk#X2Y^=J8g4^-udu-da|UT z9A@UE%*^~lAZcU&&i^Dxl5N^n*tTukwr$(C?KcJ6_Iuy{Q+T#*oO5~t;8xqFSgG3G z-QC?ibe9&cJMK;av+Vq{H9#S^4qSThjBFYp-T23$0M9ryu{o7c0_V(eAW4#G&Ab0? zZ2NuNw#^lR0EPdTN&TMyh&KZoxzQF{T`8dq%am<&8%6Xs#AtiAEEA6BKxEiqDlzzr zNkZKx*Z!d0zk^7}bF5~20I>ExK8goIKv5j)u9o43YkP1i*`*=nEe;dfgtNXIy$h={7Fyz&xQUJ}~YH zBvmYI13lx=6BJ8bqg_gHv>;EQDt3z;4an|dFwKJ!%jtPaphXj?ir1oqGk7NTgc9XX zDA2M3F_aMmJx%Ees^Lf|(87Wgfqc&udYa&YVyQom0xd15#CQ#4X@h6Tfw03llmzN; zxKwVEhaZdCnmVq@6w##t+ z=?RXn1ST--EHR)lvQb12ijheP)Gy4P{DJJJeiRp#K#e|13bY@=0@$%B#t0=)*HcL6@TknLiKPZ2Fo8jDk^xOD9+U`6QU!(j z{&E&63Rz?f(Ls%Qa8(jp1`2@MLJPzD6$L*{V17{irJzT z^n5B($SSb}ThD`H)lLGVW+h6kQdStuTGfLd3e3sq15d|+up^*~OXL)*jPX78;p~Hr ztv8RD#fP24ED~rqFiL4g{P9kQY{ z@FHwktfomASOe_+68+f%L^*JI$v+B#**S|0Xl($HkW$C1iWB6f^kwrGg{rE2i9w+f zNnz(~zBv()05${y8}iWrP97n8YR`%Tn;oaRs{Ia9VD}=0^g1_KFro+WAnX;8Fr=yW zUTyu2Z#Va676ZGz%s?uU%t}>C55RVdtUfe`xC;CrYgyQ$V8pdSN(OYr>Zd6RltsB& ze;F`JDPh7B%q7MK^0LJ#5NwV5fCHohiw_AZ;;ih2obx%>#KCbOy+K+r?yR*!wnBj@ zNZc~h4>&xnp zUe$P>2VgUxPpNSuEL&7)VTqx@nsNZ?PIXPHSRErTOPm71>BRRGT?qi?47h^994bT@ zyIr9uM_^WJl>v7-0D#AUb&XUeawE6@_CdeLR@<0Chn+nS(|g3Af-Y2Pa&AZ3Q}knEg36w$I`5pfN$_e(ta zOX0v@Zh1lx$fz1SBmug1#Uc~#9m$W9;wdLU6so#Lr6ozTSUZF z;0M{R0L{&Br=!t_B9LCSct8cjXx}`|8S?_`p12O@gG&kKL(6krPPrNPQ(UsSxjYtF z@B}jh;guVzJE%lN3Dz>W_%*ZZq18k5NL^Ntz|wt9kIZ$B1!9)xFpzB=t#oXo$9Ypz z)9sARw>P)s(rr3sRDEV3caDq=7L4c_@HG0Pl^bkfBFc8_XxO7=3Y+jPOR&cW+vz2! zX~A~Ge|lHk4@PIX#>zlw+B0r};GPsB^sFiNo zq3oRdxz>`lANLKf3+B4xyy0UYGtDK>W_jDmf!qpwV6t(vJ=Haz(|WjIw)-dpsXG4* zGRszPrnYLuNV?QM>&s!z5Ue0o}+?I2(Qu*}i(r4>pU9RixLfw8%QV zrbwY9QuL0WUehA)Fr#Yu|Ie$pms@oK%XT?u^iM+l7$|ic>6^vu8}Z8wwWTynWTpN# zD_GCTIu1HlLGSLHBfe{qvwm<|%>2*jrVvRF}J8efPX`9v$P8V53jM3`DAS`|PvbsxH0q e#z)UN&xJC}fX1z1z%c0sQ$@uG_tv-);tT-!E@#02 literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..e4e35126b5c075b1715e1a97296497ece7f52e3a GIT binary patch literal 798 zcmV+(1L6EqNk&E%0{{S5MM6+kP&iBp0{{RoFTe{BH{~jlY*(54vH_z1Kg^&cXE^7K z4Y!dbyUKi3SULdmPlgC6T;*YXeLIfZMsg(0x{JW)|GQW&74L6mN^WD@R+WXjLrggo zK|xf*&b%ipbXT25>N&zz~ntYj|h+fNWGO39MwLM1)>VY6l42Pr1O#0> zh^=`HZ@GsNs-oILrTWiRRs81)@tgjPp8q#WSrKy+YbA)L)mV5VKmq~+Rmae22jbsU zsSqdu0wgfbyBgxOzeGR*#K;Gjh-DElLw2nxUm8kXhWC$u1*wUEl8v8AN?kXsr)K#A zzebUJU!6QRqgs?rAJmp#b*X0cAe%m_J-;%gFTW&y?Yd(9pYN+p$MC1&JGZM(yOrhs zarhoMRyneu$9w&xz(1OHD^or`Pg|AI<$YBVO7VHUDdg|}XUNUQbFqz!c^juTQya0J zGitkyv9;TOG`ruM?>x!x_nnF8{{(0|Jdw0>* z^AR$vo;h72K8-S4p`h30_MuDX{ny&cmL7T)a`_}WIUl^!dd%K>1X%!t1XyiWy9oHRptfB*l zp@*95s*|w7O-xT_VwoZ(W!S_@t*WirwHw;?1Es%!l{)le!!Gb;rhfKvn`mK~^^POg zZ$PiLGu1lIO`c&Yvn+*$-Rwjw~6EP2c>Gc(ijZdVJe&3(5?5&S$wQUY@~ZCjnq2iU$Z*jB%)&o(mwa-wZlZAa*xtAd%CZ%1Lq zikX?a%gk_?4CJh}A|(A9 z2-L032usRbN2Gri-=MCFqlguN#buRC*_;PCZ@Oit!&jUhe*AOQ*9Z2k1fb&365x$n zN$0%e(u+%gGw{3mo##%%14%eWz_?W8lHC$<{^#`PQxnk-mkpE&K>!ZfI2~G&oPQ+w zmZ>Ci`0z781QLKtRh)iFI`m5+79?GBqzVuL1i-o9QmQFbof0`R2nb&>kOODZA{ZAT z3&|P?9|qt&kQRYFG>Y*kCc@yG2OvU~4H+0O1*HS$|-UP$VRfrpd=m!`7DugnCbRN;;pV2JA| zI82D98~?+1Li9aGB0p^Q4~Uv-1k6pjP%uEXEfMD*kJt}m?F@u9nAGV~`-;;% z*~#}tvXn~F>NyyJa#gM->ESzKAgcbL+-?cz9&Im~v{m*pwW)_lP+_@NlSlZ8;k=w% zFRFwH&2~A4k4Q%P+00rA5`jt`A?aoRPmjlU9N!ZQPigu;ii1#)G%rpX0aL9zzDz5W z#C-+?FuFyk7UxoA%bmN|mI_R1@OkAjntzcuR+K9BYS>5uOl`erGm5zQSHW;ACRkSa0LTV=%gUoRb6*9aIhtToB#437S5LybI<^a@-sHJF9% zEIqLBlICXxX)Elx=g|ZGS_lIMLP=aF&OaXEH-^h`{bB7j)uDuDr+%YnB}-{meT#t% z1NG~~ZaHa9u-3ju*0-O5u$0L6eA*RR{CHE?4gYyUk7 zKVVJXS_#nk%&s)AnB8UZRdUAPY`xx&P{Qh|eadUolWd4LhGL3qToh>zv!@p7yIU@&IJH zO2M#6?*|H=h5^pNo7kI6pee{pb#ZBAbK%T$VvHY}Q-uKPjI!25U_7ROUa2Ec%+WIRuRvP;0xK zlV{aWGd7<}?MKTrZ!V{a(qPAHc8JWYw4p$L+0%a zx?2qfp(a@dPK&=`;G%9?YpXOoW;T+omo{d~{NvI0-oDNz2-_qKSOzwOy4^i=;Hq(A zcX4Lp@IgtqDD$`fUtN%#Uw*jveFn`xj}rzMB8*j$f%H%FjuwAY+n0aGYru(RTXr=6 cv%jcfL~L>m4aLU{cn0FbHIIu8NzNcJ03w9YCjbBd literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..3221436c9232d843dd373774a3b5c52e2632518b GIT binary patch literal 1192 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 G5sVf>Niy32 literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..f10dfb0dce0af918f4e8d89ab8e4763c4578ea63 GIT binary patch literal 1730 zcmV;z20i&wNk&Gx1^@t8MM6+kP&iDj1^@srkH8}k)rOdcpnr99M?}(cmxz*HYg6;) z*(53BuFAU1%*@Qp%;*_)`Th3tYxyn1Ybngkc9<+;vpzkalHU8owry8N z>D-Yb;Mlfy>{-8U+qP{CA$FC@8i7+KbID4X-lgsI&WEeUZQDq4?{@8$56HG{+q9#v zwr$&awVwH8n^$pi5gz=&**C4NJyW)A#@V-QR~!hkZKrL%_rIG6!W>gLkyK``D9n*W zAVA^&WlH}YxQ(Pp&M`Bz_672Znt+kW6zJ&zGhmHDza7VB=peTK6G& zqBZE87NLw#qLk4LtcfD04EGWv^#ca?5#_b-D#nQ7d7rm z?rFhBV+>_HS@vjsIb}32hTVyx{!W}DYgVO_Su-w$z1;*yR@cApZT zvfE*exZz;)DJOUO!KJnfbB+biLXfh@_a5ENo9bISELW7Gxf6R7K#kzh=dB|4FPMU> zZ~0RN1g~~l{td1L(S~uO;F)P-c;k5d%IP-te%C9b&yQ{Jg85PZ)N_J~uF_riq_fPMFUSHRq54bQa6Nv|7i> z)vr*Ml6>+gIQ>nJ85IexC}gXYG*SSX&TcYdqoT)k52`v!^PV8w#1! ze$gUxau8R=D5h`8dU#MiA9*ksSh>olv6V;}2Kwn>TV(msa&9Nsm{>Tfs1_ggP& z(NlpF$@kQbbmip<=6h2Jaqa>IkS=`td?KMl*j9|bR>%5#!(veYcrvgUAZuFgSkw4N zcfgGwOp5P>vO-i+^~YKtt!CIHPfGk1s$5aZV~&~hqC3#~tR6IEe97BJW9e95LhHAB z($i@lZJBtSmY$3oio?#H=h!DPt@-U;yc-Tt8Fd+h)0)-LFX;8qf^IEQeH!gw=)p-h zu;;$-PPaDEGK(TDBqh7$BE~6#o1s=K)N7ZIkC)jt#-rDd#K|bdF}~l zt~>d=Mb9m&S|PPV#!>*P4s?NBbQb5uWaI=vcJ zrxr@h*O|YTcJ@@KxTDj}b>}^-`kzB7WEa}ZYJ-z9(rdb)5amJg+pt!!ius`=Cy@fo z7>s6OLD(9T){R-t&&u;c4pvz%UZh;4}PhsBP|TvxyL6O@%=uAO_X z!WJ(qUfB_XgPjub6)gVcn>GsG4R7$T1k6f$_6^P!0~vW%&^V(M&Q$@v3g&+dXT=5O z*Da1DPXYVp3Z9k68QF)oax=1Z#~B55IXeGp%7prr4j%tS4J*oS9#9GJa)#c;TrcG| z{ra@eNLi1j>F=fD*S$+Q@hqo$UX4AyB*!|hRqG0c^+mSbHi&6`@#9+Nd&#b7lUE0@ z?6ke{QRIo1J zfg3l{*gjedXWhgE00Z!VV%*PjBYj`4Mer&!Jz0Ah;{x5*5CEJh4>hoCnND6$Lm3!F z-1#C_t!9CxHK735Ks@qe2Hsu6mCHF4bamB446Nzu8a!9R=IIvjj{I2uI3t7u8|M66 zAhc#Zd$RU&ErSP9Xn}o6E4ND~3hk2<%JL7;XFETLjQtn3Ot+6TPES`pF6Mu( zWXUTzBH%V(%KhYp8|OP?|HX>F^iN`hVq5~`z|;%ES;VtQPJT6~U3zAo2LkWZYj0&1 zsdfcXbTIQ21}B1 YV?@N4NgS6mFpi&}`E}K9@Xx_S1#rpgIiyJw=YwH{{Gcz;aEi*HOnPZrlg-83Z?~G?W zGaj$hXQQ}k9vwM_sN{PP9gRyXudGDc9Og9fF*wDesFYFbViKLZBb8~6@7!+6rC^vu)OVKyI{cisVGi%*@Qp z%*@Qpe7AVav;NghZ|^^ygE#?}VmMD0TFeXqoY-PnthQ9L&O0Tr5y-;;R5E#jkfqv! z7yv-phW!7HdpfB%?(WH?-bN=xLD~k){98V4{~@@Mq)2iM>>l&F#}@-##W3Lj1G)Wi~wcpS<*|c_}FvN z*ZsZAxMWi;NO4?@auLScSS=o71Ed`bFvg*B3+1AV9hMy&LU7^w+<1>ui5JIac zu@+(@gz(X8f5ycH(Fc(cSnVI7C=$z|5W;Pk8p-oEPAybF&m+1o#-GG0D48LG#KJR$ z{dnH5at3@gwZ^#?LX0k}WVUDwLU?T%&-*!}s;KOmQtNHnWr2#qd1FV@Cg#IS`^1!XNYeJIsCM*mdRRd(<^ zqGn-iH*w1Bhpg}^y`IhU4s-Uvc!omdkZ90nRkOA5^D};9QGSAzvc$1af>1A?3v3+k zH&cI|7qFVr#wi!Vgv=y}e}`GtT8D#5KE!C3I2owep+Oa7Mtt7S!LCzsjJ3q%>M*F< z97o0acn5Ew3}X{qAW7UE2GyM9saY=i`MDTth{@%lGqvm%ZG4XLpTb;Xa(n1Z{@9Gj z;sYhe(WR^O3pvGUS}KXK$>j4jIXGSPcsDoC~UrrS6DKg)nFm zO+2v%qW%lul+*5udcOBo(-&l@HIN?6Wu>`|{{hAp8qa*@d`e3g~NtEc`2s zzsC8tGd>?e|A@nf@-v+qRKP(>Sb+y|E?4Q{Z6voW|Uy!z2Z=^l z9%TXGRn>Go*BOAj86wE0V%6#_R53^vv~bn3lC$#AGmktN<1=Y~hf8NJKt*E4)N|ch z**etv39i7VjwV!g7G6=(!&(FJ`5o6gOzwM3y-?;tkr^^@aWxg9+|@Kufj132ttS*F zN*O`n!8ZY_YHFYB4uw!+#>a~&jdHaySAYwaRhR@X9(6Fu)K-XTty2&o!W3avlzM64 zB2*QpXbnuxZ^Q%>djKpVF;HO$FRq7@v781LU|M*(uK;kS#>oH#>aD|d|jYjm{i;k2~-sq0M4L7nSg4#|2{#w z$KtA!&r?bwk25)m4Y*XQN{{0pM5>_329*EE!10t!BFqSC54&af929$3N~F8e*vZOs z4xtcn!Ccodus_&!bQeS61VCqbGw^BINR>uqpNiE*5ILUX)T92w!BZ@mVI3_? z914)K0-Ucvhf=m5Cm`f_b_#kVXaL-Ro(g3zJG7k+y*z%Jy_^b>xGWDK%eNeN+E-{N zGq5j1rIVdwVX7<8%k?^GDDOT3yjoV!b?mv3iqqyoM4H&)FSuH1C>J4Q1T9BisL24J zghTF`235rlJ$K$h-$`E{MO>8!kQUYM`6?D-WB>y7I*%RZ=VwQ15dq%ZSz48`J)3Sv z0VF3S08{}0MY?Zx0R-rDJWKb53td-|977dBi%@BE$I_*B6=L0m2qdQI0K_iReN)}z z5)a^CXno=6bI!v5hLiqSa(flx@36<9U}7HZt|N2wg9m_Lo_mY4&s~%EiR%gTiSkM6 zeTP{GY7LAoUoLx}O5(&D0)TINxR1ln6%4o%YMoqY!SMF^QYrv^CgyWz0q+sHF7z3# zt)*a}Q(SYuK|hoh%YVF-u;JM=mTd&KZXxWG`DXHFODYl2mFUBrA z0J+c(h6oYM#?vyP5!(RZ;o?d74u19m2+Hy=TRKXS1tZHxkvIA%*y-NGJ-)ff(&fsw z-jhx4&rzWMq4bzjEuvbWXvv5$HEuuXVPNS@Ck3He0D6%XY1zmv6N_X3RxO2-=Uv;p zdIL~WlQZnVfPZA*m4qs=VOZzhnloHH1-|W{JR<{p6FoD_jQKcmogiDE(@&2_k7M8n z)C4npWdVTHYdjVe8w@gIvOQ{U;x7O_ zHwjU4NKs8NBeWlNHoFS1P~sB+0>7DW$3v0X=i$ZWRETod*F*!oU~V~qg!$UziwppM ziC|QrYP#Ux6N|l0nYFK*G)e`ZQv^#YtgZjx%)fVD1QK1Tw{xrZc+nJ@I(n(J1WSWd zF6SoYC3p`xC8mwLyqT-si|6=lh4Z|2(AD8GX&fq}lu1^Nze6 zTWIyrNycoX<0&GZfm@i*Q%*@IOjvQwNonuFx6{vC?Zw@65`gE{8~Q`>*(1FMI^_%> zN>Et=IM2U$aR2Q?TWuM3lG}9S)#vT7Fy^{7l4u$OCe264(R%!GoGW;IR=?e{|9P7( zgUFptH@4S2GPJYr*K}?URzjr1Ng)}q7F@xQ89>j;$w$bURvEw#fC(T;iKFxy=zI^a z!&@Z7$sieVd==vpvi^E>nFJuMUq-IeYO?W~0>C@`dP1(-OGjF<64P>o1b1+5i&A3U za=^p%R~UDpn?ki)>^K18k?qq3Hqg4A8`5Tlj!c~8_yO?I=}!#ltl&H?BY?h>D+}+e z4dI!7>T++e;{wPgXCYbx^j-l?xqKaJ;nHyXj6gHi6}$`Ph<0@G=iObTO#8@28|ow5 zE&HZN)dmIhhB_JpI_7+$GzxQ;Yd+wh<-*)3T?@{8Yj}Iv#G-cF<)BA4+R!M@&^}Un z=fcyEmgcxl++zVD!j#x~{OP)doA0@$#%GvF0f4~G_5uLe(Ejj z_=hC{V~v?qwfti!H@k|YF_fACXg2^TClujUh4Zs*cqaxx zeFFf!*+^rWd;qv*8|>H%0W_1d)FKNoI=GFsz=qLf7Jz=?S<3{U%Cj(B0rv(w-siU3 z_KmL>aeG+rA5)fYxf}4gE8P?(#-6&!536_n8XBLKad}wpAA3-_)7OaV&Gy1b9bsZ; zgzNys9~R#;DJ$ge0i|JVv*h05AAZ~(QhBz*7Xt9AdUx@byZ+-FsTV6jPJUD+*M*Vo z%q_PAi{D)p4dESF9L)gaO)C+ATm#+MMp%vqL79V>-^wf>hPR_MFoeIjra45}fsN+g z=8pCEqGAm+!&~n&18{QArNFcZ2K7H{pe=6gX!a75<*{b{y`WkHb^qbTm*_NbY$#<( zDbjOxEnGc&jqzlAL;;8Z+_*{(pgQh!#iXpNL6$jWlP@0Ms6P69ZFuP`J|3mI{<3<& z9yxE5N)DiW+sIbvS6eu9!Ldqd5e)4`Y_S_$u}P&kFJdR1V0{^?E2-b4k^v|*(Da#{ zOG>&6Y^apEfLv*voOSn{U781=IH$g(&Ul(*5ewW6Kx>Vwl;QoKCXXs((nBayIKLq( zEgv7=iQD&OTDYcl_T7OPQ8m+Wb=3lp0XR!4G|={#9iEi`FL#>v8W>by`NX2;)T3h+ z0LmrbTvKcG9BRhljg|l~*58Y3!dq?!4(>fqtan~4neV6XMJsGb$U6IvUcNnC6IV%E zOQK%tX`U8=WgWPvfoAWwDMLEnk`wF2l6l(53M{bUMT7f4_I{g6s2$4!hMvWYz3q>6-KA zZ(OO{E2;Cb?Q?i$aN9e3L)dU8UH2~jry z^_%lMyXR@3Kj40Dzv106WoB|>Dc2g1@RCf|+9b+&4X$cSi7j90GroJk{k-;h-JSEl z+2D=}F(Z{@i;gGH-1u9m`BsN3G%y@;y|B;d=BP3@K5say&EtenRusG)MaT#dh44zN z@*MbTeAe)##}B?+tbws2JZIgRPj4V8z`@fY-Jhe%`0}k z;Tozb4-dRk`<$hB z&GdS1xaGXrYf5m1@EfnVFVr<|BMM6+kP&iCP2><{uzrZgL^@ifMZ5(O;y;HAzBVqzLp=DSW z_9ICuwH}>I)0O~8k=wLE{AOnQ0DfX-W@cvG9r;ne?^bQw4t6+Z+%v4g=5TT+<7`Z# z4bzpdr83@=aYH+<6f8-yOZ`MD+jz2V+wR!j<_C242xE+F+qUhR*)_7Uay{8~ z`8FL00AME9|9>-NyJp*Vb~ge63jZ%F`ac2u>NWwy)G8`3pqDLS96#78`9^}BOvIgm zVvVUw5L3*$CM+7HNq|HcK-#up zZY9WhYomvy{e1uyXG}%WWyosA*FA2C2=qCCG;JoDE`v8S_ZRAIphC(FTF=_w`HqA@ z3inT)i6IO?z91MLzQjs0EUCLm+e_Mh5Z}DGgt?S>3a!)Fc;|TGH_aa{UlHFqFzbHd z)sOR)ahUq*Odq`+Nj&`G5Kl>w)Rkw43YjzOD8J88p4kUh^K=wK_uS4s4?Bg|k9jJ@ z#yq^hOp)~y-U_*wC$W-koRI5;;8kxKNr`8ckUT2|9zMz)?`oyV*;@8^Hd1x7N{C*y zor}+IAXVJXEB9hOTQBsPj;TyAb{_5B0TEc9w@0 z_9<&&jfa-*DO);<#tR&=bN!6Vhz^PLh>0~Nx|i9e>qF2fOR8DiycXU<*h$CGdK9L z1$90)84@JrhzMscXpme`jfF{&;7mVA_l(Igk4|$T*ET` z8vSY!`ZbGs=xFEd$eg(UMn^19Bv`5Cf*~X_B!=TfbV#_>FpF>-Q_Vpkk|PoMZ3vxA zkve{@-_D=*r9S_jFE%Wy+wL`~$k2k83iffzD`#2TtE({$~iF(S7iq2j};AgRGh!yT-5 z4XW86gql3ogCB~HcuF(p*I*UxyRS}d`L(1WtR=r)@HKmwi}I_1eW~W@U!lx6%u*MS zHRp#wu@K#O4Gxt8PycGHnHn{?GeI&mI8^c74bBouVBgOo$v40GJ5UQRJT$WgFx9}i z5~RX{r0^!wK__{rB^_YB;?EV-{)j@_K%Ib}@lc69zzETS3}RYlJS4@pH+_VC=b_L# zwx7P_y+0422TS2q^2~#=@cQ-DC43aH^}j-^^Ncd)9))bR9*FZDBAN*F_IijOYanYe8GuIH%RAr^vs&4SW)X+xY#VfIY)69Mgdx)D^fAd{$Rl_S$tWH#cl9P5lF9;8(%ta|#X`2#`#ZdXu!%Y%u6tS z@uAmVeeG+>YJe7cf`K)F*$=P)ar(bL{okuLjiBE9O=B0Arp!Ihocf=i>h#@C%bu72WeO@Dyc56ngX;+nmMHx6S{zUVrksD@?BbV(Z-F6TfnQTo8^o`D z8b-ocbQFGi8xR8Wvw$A(N-MtE#Xq|QWS2mPKXEm!_!Qha`^)j$pN5e}!=fYiA;18* z{{S*T5uAO;@y`ZdJo)E?;)iaeh4G5^F8uaG@$C-)!SR0_|M=w(ZWsUX+XYVxqZS=q z2=_ny6rch0RI1p)Q>oO>Pap0NFGN}xyNLE80CT~0Lx*?W3+0igMK~XdXsta0YOO^$ K{|W*5l`aAVNTD|X literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/MultipazTransitTerminal/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..63cb25828367b7491f128f3a65f89311b76cd03e GIT binary patch literal 7044 zcmV-~8++tZNk&F|8vp=TMM6+kP&iC)8vp<=zrZgLH3#FiZ6rzkm%S4^d;KF~0(iS? zy>nrTfr}?77*sOB3t-MOZC|wN<^d>}Ey)wqBIYK^5? zQClXMuyPkUm7pX`g;bJnv~KTiFsTG4=gCtpa`vvJl9;qIhg>(T%cK^yDDEMeoJ}gx z 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 literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/androidApp/src/main/res/values/ic_launcher_background.xml b/MultipazTransitTerminal/androidApp/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..8ff1b150 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #277676 + \ No newline at end of file diff --git a/MultipazTransitTerminal/androidApp/src/main/res/values/strings.xml b/MultipazTransitTerminal/androidApp/src/main/res/values/strings.xml new file mode 100644 index 00000000..9000d3f6 --- /dev/null +++ b/MultipazTransitTerminal/androidApp/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Multipaz Transit Terminal + \ No newline at end of file diff --git a/MultipazTransitTerminal/build.gradle.kts b/MultipazTransitTerminal/build.gradle.kts new file mode 100644 index 00000000..e69de29b diff --git a/MultipazTransitTerminal/gradle.properties b/MultipazTransitTerminal/gradle.properties new file mode 100644 index 00000000..6f8e6ea6 --- /dev/null +++ b/MultipazTransitTerminal/gradle.properties @@ -0,0 +1,12 @@ +#Kotlin +kotlin.code.style=official +kotlin.daemon.jvmargs=-Xmx3072M + +#Gradle +org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 +org.gradle.configuration-cache=true +org.gradle.caching=true + +#Android +android.nonTransitiveRClass=true +android.useAndroidX=true \ No newline at end of file diff --git a/MultipazTransitTerminal/gradle/gradle-daemon-jvm.properties b/MultipazTransitTerminal/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..5301309f --- /dev/null +++ b/MultipazTransitTerminal/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,13 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e8f7f2860374272b4c64643d36d8f0dc/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/77785cb3076de1b8f41fcbc6540556c0/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e8f7f2860374272b4c64643d36d8f0dc/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/77785cb3076de1b8f41fcbc6540556c0/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3932798aff0bd10c6286eaaff40c6f0a/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/6fa62408db9bcb00d7e180251d5f068c/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e8f7f2860374272b4c64643d36d8f0dc/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/77785cb3076de1b8f41fcbc6540556c0/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/da24493caf79e03d5c254365c5ad7ac1/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/df839bfdbcd8a8e829b9cf1be59c478b/redirect +toolchainVendor=AZUL +toolchainVersion=21 \ No newline at end of file diff --git a/MultipazTransitTerminal/gradle/libs.versions.toml b/MultipazTransitTerminal/gradle/libs.versions.toml new file mode 100644 index 00000000..7e8cd138 --- /dev/null +++ b/MultipazTransitTerminal/gradle/libs.versions.toml @@ -0,0 +1,77 @@ +[versions] +agp = "9.0.1" +android-compileSdk = "36" +android-minSdk = "29" # Multipaz (multipaz-compose) requires API 29+. +android-targetSdk = "36" +androidx-activity = "1.13.0" +androidx-fragment = "1.8.6" +androidx-appcompat = "1.7.1" +androidx-core = "1.19.0" +androidx-espresso = "3.7.0" +androidx-lifecycle = "2.11.0-beta01" +androidx-testExt = "1.3.0" +composeMultiplatform = "1.11.1" +junit = "4.13.2" +kotlin = "2.4.10" +material3 = "1.11.0-alpha07" + +multipaz = "0.101.0-SNAPSHOT" +ktor = "3.3.3" + +ksp = "2.3.11" +kotlinx-coroutines = "1.10.2" +kotlinx-io = "0.8.2" +kotlinx-serialization = "1.9.0" +logback = "1.5.21" + +[libraries] +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +junit = { module = "junit:junit", version.ref = "junit" } +androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } +androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-testExt" } +androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } +compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" } +androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } +compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" } +compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" } +compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" } +compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" } +compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" } + +multipaz = { module = "org.multipaz:multipaz", version.ref = "multipaz" } +multipaz-compose = { module = "org.multipaz:multipaz-compose", version.ref = "multipaz" } + +multipaz-doctypes = { module = "org.multipaz:multipaz-doctypes", version.ref = "multipaz" } +multipaz-utopia = { group = "org.multipaz", name = "multipaz-utopia", version.ref = "multipaz" } +ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } +ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } + +multipaz-server = { module = "org.multipaz:multipaz-server", version.ref = "multipaz" } +multipaz-cbor-rpc = { module = "org.multipaz:multipaz-cbor-rpc", version.ref = "multipaz" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" } +kotlinx-io-bytestring = { module = "org.jetbrains.kotlinx:kotlinx-io-bytestring", version.ref = "kotlinx-io" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } +ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" } +ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" } +ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktor" } +ktor-server-double-receive = { module = "io.ktor:ktor-server-double-receive", version.ref = "ktor" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } + +[plugins] +androidApplication = { id = "com.android.application", version.ref = "agp" } +androidMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" } +composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } +composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +ktor = { id = "io.ktor.plugin", version.ref = "ktor" } \ No newline at end of file diff --git a/MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.jar b/MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.properties b/MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..75927bd2 --- /dev/null +++ b/MultipazTransitTerminal/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/MultipazTransitTerminal/gradlew b/MultipazTransitTerminal/gradlew new file mode 100755 index 00000000..adff685a --- /dev/null +++ b/MultipazTransitTerminal/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/MultipazTransitTerminal/gradlew.bat b/MultipazTransitTerminal/gradlew.bat new file mode 100644 index 00000000..c4bdd3ab --- /dev/null +++ b/MultipazTransitTerminal/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/MultipazTransitTerminal/iosApp/Configuration/Config.xcconfig b/MultipazTransitTerminal/iosApp/Configuration/Config.xcconfig new file mode 100644 index 00000000..08837764 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/Configuration/Config.xcconfig @@ -0,0 +1,7 @@ +TEAM_ID= + +PRODUCT_NAME=Multipaz Transit Terminal +PRODUCT_BUNDLE_IDENTIFIER=org.multipaz.transit.MultipazTransitTerminal$(TEAM_ID) + +CURRENT_PROJECT_VERSION=1 +MARKETING_VERSION=1.0 \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj b/MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj new file mode 100644 index 00000000..e69de29b diff --git a/MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..fe1aa713 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000..ee7e3ca0 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..4c663a0b --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,36 @@ +{ + "images" : [ + { + "filename" : "app-icon-1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png new file mode 100644 index 0000000000000000000000000000000000000000..53fc536fb9ac5c1dbb27c7e1da13db3760070a11 GIT binary patch literal 67285 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 BXNCX( literal 0 HcmV?d00001 diff --git a/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/Contents.json b/MultipazTransitTerminal/iosApp/iosApp/Assets.xcassets/Contents.json new file mode 100644 index 00000000..e69de29b diff --git a/MultipazTransitTerminal/iosApp/iosApp/ContentView.swift b/MultipazTransitTerminal/iosApp/iosApp/ContentView.swift new file mode 100644 index 00000000..46a12f4b --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/ContentView.swift @@ -0,0 +1,18 @@ +import UIKit +import SwiftUI +import Shared + +struct ComposeView: UIViewControllerRepresentable { + func makeUIViewController(context: Self.Context) -> UIViewController { + MainViewControllerKt.MainViewController() + } + + func updateUIViewController(_ uiViewController: UIViewController, context: Self.Context) {} +} + +struct ContentView: View { + var body: some View { + ComposeView() + .ignoresSafeArea() + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/Info.plist b/MultipazTransitTerminal/iosApp/iosApp/Info.plist new file mode 100644 index 00000000..814bbec9 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/Info.plist @@ -0,0 +1,10 @@ + + + + + CADisableMinimumFrameDurationOnPhone + + NFCReaderUsageDescription + Utopia Transit uses NFC to read a rider's payment credential. + + \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/MultipazTransitTerminal/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000..4aa7c535 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/iOSApp.swift b/MultipazTransitTerminal/iosApp/iosApp/iOSApp.swift new file mode 100644 index 00000000..d83dca61 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/iOSApp.swift @@ -0,0 +1,10 @@ +import SwiftUI + +@main +struct iOSApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/iosApp/iosApp/iosApp.entitlements b/MultipazTransitTerminal/iosApp/iosApp/iosApp.entitlements new file mode 100644 index 00000000..2bb4dee1 --- /dev/null +++ b/MultipazTransitTerminal/iosApp/iosApp/iosApp.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.developer.nfc.readersession.formats + + TAG + + + diff --git a/MultipazTransitTerminal/settings.gradle.kts b/MultipazTransitTerminal/settings.gradle.kts new file mode 100644 index 00000000..e69de29b diff --git a/MultipazTransitTerminal/shared/build.gradle.kts b/MultipazTransitTerminal/shared/build.gradle.kts new file mode 100644 index 00000000..c673a23e --- /dev/null +++ b/MultipazTransitTerminal/shared/build.gradle.kts @@ -0,0 +1,98 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.androidMultiplatformLibrary) + alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.composeCompiler) + alias(libs.plugins.ksp) +} + +kotlin { + listOf( + iosArm64(), + iosSimulatorArm64() + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "Shared" + isStatic = true + } + } + + android { + namespace = "org.multipaz.transit.shared" + compileSdk = libs.versions.android.compileSdk.get().toInt() + minSdk = libs.versions.android.minSdk.get().toInt() + + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + } + androidResources { + enable = true + } + withHostTest { + isIncludeAndroidResources = true + } + withDeviceTestBuilder { + sourceSetTreeName = "test" + }.configure { + instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + } + + sourceSets { + androidMain.dependencies { + implementation(libs.compose.uiToolingPreview) + implementation(libs.compose.uiTooling) + implementation(libs.ktor.client.android) + } + iosMain.dependencies { + implementation(libs.ktor.client.darwin) + } + val commonMain by getting { + kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin") + dependencies { + implementation(libs.compose.runtime) + implementation(libs.compose.foundation) + implementation(libs.compose.material3) + implementation(libs.compose.ui) + implementation(libs.compose.components.resources) + implementation(libs.compose.uiToolingPreview) + implementation(libs.androidx.lifecycle.viewmodelCompose) + implementation(libs.androidx.lifecycle.runtimeCompose) + + implementation(libs.multipaz) + implementation(libs.multipaz.compose) + implementation(libs.multipaz.doctypes) + implementation(libs.multipaz.utopia) + } + } + commonTest.dependencies { + implementation(libs.kotlin.test) + } + } +} + +dependencies { + add("kspCommonMainMetadata", libs.multipaz.cbor.rpc) + androidRuntimeClasspath(libs.compose.uiTooling) +} + +tasks.withType().all { + if (name != "kspCommonMainKotlinMetadata") + dependsOn("kspCommonMainKotlinMetadata") +} + +tasks.matching { it.name != "kspCommonMainKotlinMetadata" && it.name.startsWith("ksp") }.configureEach { + dependsOn("kspCommonMainKotlinMetadata") +} + +listOf( + "compileKotlinIosArm64", + "compileKotlinIosSimulatorArm64", + "compileKotlinIosX64", + "compileKotlinJvm" +) + .forEach { taskName -> + tasks.findByName(taskName)?.dependsOn("kspCommonMainKotlinMetadata") + } \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/androidHostTest/kotlin/org/multipaz/transit/SharedLogicAndroidHostTest.kt b/MultipazTransitTerminal/shared/src/androidHostTest/kotlin/org/multipaz/transit/SharedLogicAndroidHostTest.kt new file mode 100644 index 00000000..0a1a8ac9 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/androidHostTest/kotlin/org/multipaz/transit/SharedLogicAndroidHostTest.kt @@ -0,0 +1,12 @@ +package org.multipaz.transit + +import kotlin.test.Test +import kotlin.test.assertEquals + +class SharedLogicAndroidHostTest { + + @Test + fun example() { + assertEquals(3, 1 + 2) + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/androidMain/kotlin/org/multipaz/transit/Platform.android.kt b/MultipazTransitTerminal/shared/src/androidMain/kotlin/org/multipaz/transit/Platform.android.kt new file mode 100644 index 00000000..874f9bc2 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/androidMain/kotlin/org/multipaz/transit/Platform.android.kt @@ -0,0 +1,35 @@ +package org.multipaz.transit + +import android.os.Build +import androidx.compose.ui.text.font.DeviceFontFamilyName +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import io.ktor.client.engine.HttpClientEngineFactory +import io.ktor.client.engine.android.Android + +actual object Platform { + actual val httpClientEngineFactory: HttpClientEngineFactory<*> by lazy { + Android + } +} + +/** + * AOSP has shipped Source Sans Pro in /system/fonts since Android 12, registered as the + * `source-sans-pro` family with real 400/600/700 faces. It is the direct predecessor of the + * design's Source Sans 3 and reads identically at UI sizes, so the kiosk gets its typeface + * without the app bundling a single byte of font. + * + * These are optional-local fonts: on a device that lacks the family (Android 10/11, or a ROM + * that stripped it) each one fails to resolve and Compose falls through to the platform + * default, which is Roboto. + */ +actual fun kioskFontFamily(): FontFamily { + val name = DeviceFontFamilyName("source-sans-pro") + return FontFamily( + Font(name, FontWeight.Normal), + Font(name, FontWeight.Medium), + Font(name, FontWeight.SemiBold), + Font(name, FontWeight.Bold), + ) +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/MultipazTransitTerminal/shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml new file mode 100644 index 00000000..1ffc948c --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/App.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/App.kt new file mode 100644 index 00000000..204a02a0 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/App.kt @@ -0,0 +1,311 @@ +package org.multipaz.transit + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.launch +import org.multipaz.compose.prompt.PromptDialogs +import org.multipaz.transit.journey.RpcJourneyStore +import org.multipaz.transit.journey.Journey +import org.multipaz.transit.payment.AgeDiscount +import org.multipaz.transit.payment.RpcPaymentSettler +import org.multipaz.transit.payment.SettlementResult +import org.multipaz.transit.payment.extractPresentedClaims +import org.multipaz.transit.proximity.GateTap +import org.multipaz.transit.proximity.ProximityReaderModel +import org.multipaz.transit.proximity.ProximityScreen +import org.multipaz.transit.proximity.handleNfcHandover +import org.multipaz.transit.ui.DocPhase +import org.multipaz.transit.ui.SettlementFailureScreen +import org.multipaz.transit.ui.SettlementSuccessScreen +import org.multipaz.transit.ui.Station +import org.multipaz.transit.ui.StationSelectionScreen +import org.multipaz.transit.ui.TransitScaffold +import org.multipaz.transit.ui.TransitScreen +import org.multipaz.transit.ui.TransitTheme +import org.multipaz.transit.ui.getStationList +import org.multipaz.transit.ui.rememberAppState +import org.multipaz.util.Logger +import org.multipaz.util.Platform +import kotlin.time.Clock + +private const val TAG = "TransitTerminal" + +@Composable +@Preview +fun App() { + val proximityReaderModel = remember { ProximityReaderModel() } + val paymentSettler = remember { RpcPaymentSettler() } + val journeyStore = remember { RpcJourneyStore() } + val state = rememberAppState() + val coroutineScope = rememberCoroutineScope() + val readerState by proximityReaderModel.state.collectAsState() + + LaunchedEffect(Unit) { + try { + paymentSettler.init() + } catch (e: Exception) { + Logger.e(TAG, "Failed to initialize payment settler", e) + state.cancel( + SettlementResult.Declined( + e.message ?: e.cause?.message ?: "Unknown Error Occurred" + ) + ) + } + } + + // The document chips track the reader, so both credentials light up the moment the + // wallet starts answering and turn green together once the fare settles. + val docPhase = when (state.screen) { + TransitScreen.CHECK_IN -> if (readerState == ProximityReaderModel.State.IDLE) DocPhase.IDLE else DocPhase.READING + TransitScreen.SELECTION -> DocPhase.IDLE + TransitScreen.CHECKOUT -> + if (readerState == ProximityReaderModel.State.IDLE) DocPhase.IDLE else DocPhase.READING + + TransitScreen.SETTLEMENT -> DocPhase.DONE + TransitScreen.FAILURE -> DocPhase.FAILED + } + + TransitTheme { + PromptDialogs(Platform.promptModel) + + Scaffold { paddingValues -> + TransitScaffold( + destination = state.destination, + discount = state.fareDiscount, + docPhase = docPhase, + journeyResumeNotice = state.journeyResumeNotice, + modifier = Modifier.padding(paddingValues), + ) { + when (state.screen) { + TransitScreen.CHECK_IN -> + ProximityScreen( + proximityReaderModel = proximityReaderModel, + paymentSettler = paymentSettler, + amountCents = null, // non amount-binding requst + gateTap = GateTap.ENTRY, + onNfcHandover = { scanResult -> + handleNfcHandover( + scanResult = scanResult, + proximityReaderModel = proximityReaderModel + ) + }, + onBackClicked = { + state.cancel( + SettlementResult.Declined( + "User Cancelled the Transaction" + ) + ) + }, + onTransferComplete = { presentmentRecord -> + try { + val claims = extractPresentedClaims(presentmentRecord) + val paymentInstrumentId = requireNotNull( + claims.card?.paymentInstrumentId + ) { "The payment credential did not provide an instrument id" } + val journey = journeyStore.checkIn( + paymentInstrumentId = paymentInstrumentId, + entryStation = Constants.ENTRY_STATION, + fareClass = claims.discount.fareClass, + ) + when (journey.state) { + "OPEN" -> state.checkin(claims) + "READY_FOR_CHECKOUT" -> { + proximityReaderModel.reset() + state.resumeCheckout( + presentedClaims = claims, + journey = journey + ) + } + + else -> throw IllegalStateException( + "Journey cannot resume from state ${journey.state}" + ) + } + } catch (e: CancellationException) { + Logger.w(TAG, "Settlement cancelled", e) + state.cancel( + SettlementResult.Declined( + "User Cancelled the Transaction" + ) + ) + } catch (e: Throwable) { + Logger.w( + TAG, + "Settlement failed, declining sale", + e + ) + state.cancel( + SettlementResult.Declined( + e.message ?: e.cause?.message + ?: "Unknown Error Occurred" + ) + ) + } + }, + onTransferError = { e -> + Logger.w(TAG, "Proximity transfer failed", e) + state.cancel( + SettlementResult.Declined( + e.message ?: e.cause?.message + ?: "Unknown Error Occurred" + ) + ) + }, + ) + + TransitScreen.SELECTION -> + StationSelectionScreen( + discount = state.fareDiscount, + onStationSelected = { station -> + // The selection callback is not suspend, so the next screen is + // entered only after the backend has durably recorded the fare. + coroutineScope.launch { + try { + val paymentInstrumentId = requireNotNull( + state.claims?.card?.paymentInstrumentId + ) { "The payment credential did not provide an instrument id" } + + journeyStore.selectExit( + paymentInstrumentId = paymentInstrumentId, + exitStation = station.name, + fareCents = station.fareCents, + ) + proximityReaderModel.reset() + state.checkout(station) + } catch (e: CancellationException) { + Logger.w(TAG, "Settlement cancelled", e) + state.cancel( + SettlementResult.Declined( + "User Cancelled the Transaction" + ) + ) + } catch (e: Throwable) { + Logger.w(TAG, "Could not store journey destination", e) + state.cancel( + SettlementResult.Declined( + e.message ?: "Could not store journey" + ) + ) + } + } + } + ) + + TransitScreen.CHECKOUT -> { + ProximityScreen( + proximityReaderModel = proximityReaderModel, + paymentSettler = paymentSettler, + amountCents = state.settledCents, + gateTap = GateTap.EXIT, + onNfcHandover = { scanResult -> + handleNfcHandover( + scanResult = scanResult, + proximityReaderModel = proximityReaderModel + ) + }, + onBackClicked = { + state.cancel( + SettlementResult.Declined( + "User Cancelled the Transaction" + ) + ) + }, + onTransferComplete = { presentmentRecord -> + try { + val claims = extractPresentedClaims(presentmentRecord) + val exitCard = requireNotNull(claims.card) { + "The payment credential did not provide an instrument id" + } + val paymentInstrumentId = + requireNotNull(exitCard.paymentInstrumentId) { + "The payment credential did not provide an instrument id" + } + + if (paymentInstrumentId != state.claims?.card?.paymentInstrumentId) + throw IllegalStateException("Cards doesn't match!") + + journeyStore.beginCheckout(paymentInstrumentId) + + val transactionId = paymentSettler.commit(presentmentRecord) + journeyStore.settle(paymentInstrumentId) + state.settle( + SettlementResult.Approved( + transactionId = transactionId, + amountCents = state.settledCents, + timestampEpochMillis = + Clock.System.now().toEpochMilliseconds(), + card = exitCard, + age = state.fareDiscount, + ) + ) + } catch (e: CancellationException) { + Logger.w(TAG, "Settlement cancelled", e) + state.cancel( + SettlementResult.Declined( + "User Cancelled the Transaction" + ) + ) + } catch (e: Throwable) { + Logger.w( + TAG, + "Settlement failed, declining sale", + e + ) + state.cancel( + SettlementResult.Declined( + e.message ?: e.cause?.message + ?: "Unknown Error Occurred" + ) + ) + } + }, + onTransferError = { e -> + Logger.w(TAG, "Proximity transfer failed", e) + state.cancel( + SettlementResult.Declined( + e.message ?: e.cause?.message + ?: "Unknown Error Occurred" + ) + ) + }, + ) + } + + TransitScreen.SETTLEMENT -> + SettlementSuccessScreen( + amountCents = state.settlementAmountCents, + destination = state.destination, + onNewTransaction = { + proximityReaderModel.reset() + state.newTransaction() + }, + card = state.lastSettlement?.card, + age = state.lastSettlement?.age + ?: AgeDiscount.None, + ) + + TransitScreen.FAILURE -> + SettlementFailureScreen( + failure = state.lastFailure + ?: SettlementResult.Declined("Unknown Failure"), + amountCents = state.settledCents, + destination = state.destination, + onNewTransaction = { + proximityReaderModel.reset() + state.newTransaction() + }, + ) + } + } + } + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt new file mode 100644 index 00000000..07f49b42 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Constants.kt @@ -0,0 +1,19 @@ +package org.multipaz.transit + +object Constants { + // For local development with `adb reverse tcp:8011 tcp:8011`, use: + // const val DEFAULT_TERMINAL_URL = "http://localhost:8011/rpc" + const val DEFAULT_TERMINAL_URL = "https://utopia.multipaz.org/transit-terminal/rpc" + + const val DEFAULT_PAYEE_ACCOUNT = "30000001" + + const val TERMINAL_PAYEE_NAME = "Utopia Transit Terminal" + const val TERMINAL_PAYEE_ID = "utopia-transit-terminal-001" + const val TERMINAL_CURRENCY = "USD" + + /** Identity shown in the kiosk header. */ + const val TRANSIT_AUTHORITY = "Utopia Transit" + const val ENTRY_STATION = "Terminal Entrance" + const val TERMINAL_STATION = "Meridian Park" + const val TERMINAL_GATE = "Faregate 4" +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Platform.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Platform.kt new file mode 100644 index 00000000..3fb996c5 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/Platform.kt @@ -0,0 +1,14 @@ +package org.multipaz.transit + +import androidx.compose.ui.text.font.FontFamily +import io.ktor.client.engine.HttpClientEngineFactory + +expect object Platform { + val httpClientEngineFactory: HttpClientEngineFactory<*> +} + +/** + * The kiosk face. The design is drawn in Source Sans 3, which no platform ships, so each + * target supplies the closest font it already has rather than the app carrying binaries. + */ +expect fun kioskFontFamily(): FontFamily diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/DeviceInstanceId.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/DeviceInstanceId.kt new file mode 100644 index 00000000..2c1d7c77 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/DeviceInstanceId.kt @@ -0,0 +1,41 @@ +package org.multipaz.transit.journey + +import kotlinx.io.bytestring.ByteString +import org.multipaz.storage.KeyExistsStorageException +import org.multipaz.storage.StorageTableSpec +import org.multipaz.util.Platform +import org.multipaz.util.toBase64Url +import kotlin.random.Random + +/** + * Stable, random identifier for this installation of the terminal app. + * + * It is deliberately kept in Multipaz's app-local persistent storage rather than derived from + * hardware identifiers. Clearing app data or reinstalling creates a new installation identity. + */ +object DeviceInstanceId { + private const val RECORD_KEY = "instance" + + private val tableSpec = StorageTableSpec( + name = "TransitDeviceInstance", + supportPartitions = false, + supportExpiration = false, + schemaVersion = 1, + ) + + suspend fun get(): String { + val table = Platform.storage.getTable(tableSpec) + table.get(RECORD_KEY)?.let { return it.toByteArray().decodeToString() } + + val generatedId = Random.Default.nextBytes(16).toBase64Url() + try { + table.insert(RECORD_KEY, ByteString(generatedId.encodeToByteArray())) + return generatedId + } catch (_: KeyExistsStorageException) { + // Another app component created the identifier between our read and insert. + return requireNotNull(table.get(RECORD_KEY)) { + "Device instance identifier was not persisted" + }.toByteArray().decodeToString() + } + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/JourneyService.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/JourneyService.kt new file mode 100644 index 00000000..127470e6 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/JourneyService.kt @@ -0,0 +1,57 @@ +package org.multipaz.transit.journey + +import org.multipaz.cbor.annotation.CborSerializable +import org.multipaz.rpc.annotation.RpcInterface +import org.multipaz.rpc.annotation.RpcMethod + +/** + * Client-side wire representation of a journey returned by the terminal backend. + * + * The payment instrument identifier is intentionally omitted: it is only used as the backend + * lookup key and must not be retained in the journey record. + */ +@CborSerializable +data class Journey( + /** Station where the rider checked in. */ + val entryStation: String, + /** Selected destination, present after the backend moves the journey beyond `OPEN`. */ + val exitStation: String? = null, + /** Fare in minor currency units, once a destination has been selected. */ + val fareCents: Long? = null, + /** Fare entitlement snapshot, for example `STANDARD`, `CHILD`, or `SENIOR`. */ + val fareClass: String, + /** Current backend lifecycle state, for example `OPEN` or `SETTLED`. */ + val state: String, +) { + companion object +} + +/** RPC contract used by the terminal application to persist and advance a journey. */ +@RpcInterface +interface JourneyService { + /** Creates an `OPEN` journey or returns one for this app installation and instrument. */ + @RpcMethod(endpoint = "checkIn") + suspend fun checkIn( + paymentInstrumentId: String, + deviceInstanceId: String, + entryStation: String, + fareClass: String, + ): Journey + + /** Stores the selected exit station and fare, then advances the journey to checkout-ready. */ + @RpcMethod(endpoint = "selectExit") + suspend fun selectExit( + paymentInstrumentId: String, + deviceInstanceId: String, + exitStation: String, + fareCents: Long, + ): Journey + + /** Marks a checkout-ready journey as `PAYMENT_PENDING`. */ + @RpcMethod(endpoint = "beginCheckout") + suspend fun beginCheckout(paymentInstrumentId: String, deviceInstanceId: String): Journey + + /** Marks a payment-pending journey as `SETTLED`. */ + @RpcMethod(endpoint = "settle") + suspend fun settle(paymentInstrumentId: String, deviceInstanceId: String): Journey +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/RpcJourneyStore.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/RpcJourneyStore.kt new file mode 100644 index 00000000..fd9bbc0c --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/journey/RpcJourneyStore.kt @@ -0,0 +1,68 @@ +package org.multipaz.transit.journey + +import kotlinx.coroutines.withContext +import org.multipaz.rpc.client.RpcAuthorizedDeviceClient +import org.multipaz.rpc.handler.RpcAuthClientSession +import org.multipaz.rpc.handler.RpcExceptionMap +import org.multipaz.rpc.handler.RpcNotifier +import org.multipaz.rpc.transport.HttpTransport +import org.multipaz.transit.Constants.DEFAULT_TERMINAL_URL +import org.multipaz.transit.Platform + +/** + * Attested RPC client for the terminal backend's persistent journey table. + * + * The authenticated connection is established lazily and retained for this app instance. Expected + * backend lifecycle errors are surfaced as [org.multipaz.rpc.handler.InvalidRequestException]. + */ +class RpcJourneyStore( + private val terminalBackendUrl: String = DEFAULT_TERMINAL_URL +) { + private var journeyService: JourneyService? = null + + /** Returns the cached journey RPC stub, creating an attested device connection if needed. */ + private suspend fun service(): JourneyService { + journeyService?.let { return it } + val connection = try { + RpcAuthorizedDeviceClient.connect( + exceptionMap = RpcExceptionMap.Builder().build(), + httpClientEngine = Platform.httpClientEngineFactory, + url = terminalBackendUrl, + secureArea = org.multipaz.util.Platform.getSecureArea(), + storage = org.multipaz.util.Platform.storage, + ) + } catch (e: HttpTransport.ConnectionException) { + throw HttpTransport.ConnectionException( + "Could not connect to terminal backend - is the backend running/accessible?", + e, + ) + } + return JourneyServiceStub("journeys", connection.dispatcher, connection.notifier).also { + journeyService = it + } + } + + /** Persists a new open journey for the presented payment instrument. */ + suspend fun checkIn(paymentInstrumentId: String, entryStation: String, fareClass: String): Journey = + withContext(RpcAuthClientSession()) { + service().checkIn(paymentInstrumentId, DeviceInstanceId.get(), entryStation, fareClass) + } + + /** Persists the selected destination and its fare. */ + suspend fun selectExit(paymentInstrumentId: String, exitStation: String, fareCents: Long): Journey = + withContext(RpcAuthClientSession()) { + service().selectExit(paymentInstrumentId, DeviceInstanceId.get(), exitStation, fareCents) + } + + /** Advances a stored journey to the payment-pending state. */ + suspend fun beginCheckout(paymentInstrumentId: String): Journey = + withContext(RpcAuthClientSession()) { + service().beginCheckout(paymentInstrumentId, DeviceInstanceId.get()) + } + + /** Records successful payment settlement for the journey. */ + suspend fun settle(paymentInstrumentId: String): Journey = + withContext(RpcAuthClientSession()) { + service().settle(paymentInstrumentId, DeviceInstanceId.get()) + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentCardClaims.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentCardClaims.kt new file mode 100644 index 00000000..662ea960 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentCardClaims.kt @@ -0,0 +1,173 @@ +package org.multipaz.transit.payment + +import kotlinx.datetime.DateTimeUnit +import kotlinx.datetime.TimeZone +import kotlinx.datetime.atStartOfDayIn +import kotlinx.datetime.plus +import org.multipaz.claim.MdocClaim +import org.multipaz.documenttype.DocumentTypeRepository +import org.multipaz.documenttype.knowntypes.DrivingLicense +import org.multipaz.documenttype.knowntypes.EUPersonalID +import org.multipaz.documenttype.knowntypes.PhotoID +import org.multipaz.documenttype.knowntypes.addKnownTypes +import org.multipaz.util.Logger +import org.multipaz.utopia.knowntypes.DigitalPaymentCredential +import org.multipaz.utopia.knowntypes.addUtopiaTypes +import org.multipaz.verification.Iso18013PresentmentRecord +import org.multipaz.verification.MdocVerifiedPresentation +import kotlin.time.Clock + +private val AGE_DOCTYPES = listOf( + DrivingLicense.MDL_DOCTYPE, + PhotoID.PHOTO_ID_DOCTYPE, + EUPersonalID.EUPID_DOCTYPE, +) + +/** + * Extracts everything the receipt needs from a settled proximity presentment: the customer's + * [PaymentCardDetails] and the [AgeDiscount] that came back alongside it. + * + * The records server is the authority: it already verified the issuer + device signatures and the + * card-bound amount when [RpcPaymentSettler.commit] succeeded. Here we re-run + * [Iso18013PresentmentRecord.verify] only to pull the issuer-signed claims back out in a structured + * form. + * + * The [DocumentTypeRepository] must be populated. The request carries four doc requests (mdL / + * PhotoID / EUPID for age, plus the DPC), and with more than one doc request + * `DeviceResponse.verify` resolves each document back to its request by looking up the registered + * transaction types — an empty repository would silently skip that step. Registering + * [addUtopiaTypes] therefore also re-runs the SCA amount binding locally, which the server has + * already checked; a disagreement surfaces here as missing receipt details rather than a failed + * sale. [addKnownTypes] must come first: [addUtopiaTypes] resolves the EUPID document type + * eagerly. + * + * Best-effort: these details are cosmetic and the payment is already committed by the time this + * runs, so any verification hiccup returns [PresentedClaims.NONE] rather than failing a completed + * sale. + */ +suspend fun extractPresentedClaims(record: Iso18013PresentmentRecord): PresentedClaims = + runCatching { + val verifiedPresentations = record.verify( + atTime = Clock.System.now(), + documentTypeRepository = DocumentTypeRepository().apply { + addKnownTypes() + addUtopiaTypes() + }, + zkSystemRepository = null, + ).filterIsInstance() + + PresentedClaims( + card = verifiedPresentations + .firstOrNull { it.docType == DigitalPaymentCredential.CARD_DOCTYPE } + ?.let { paymentCardOf(it) }, + discount = verifiedPresentations + .filter { it.docType in AGE_DOCTYPES } + .let { discountOf(it) }, + ) + }.getOrElse { e -> + Logger.w("PaymentCardClaims", "Could not extract presented claims for receipt", e) + PresentedClaims.NONE + } + +private fun MdocVerifiedPresentation.claim(name: String): MdocClaim? = + issuerSignedClaims.firstOrNull { it.dataElementName == name } + +private fun paymentCardOf(presentation: MdocVerifiedPresentation): PaymentCardDetails { + fun text(name: String): String? = presentation.claim(name) + ?.value + ?.let { runCatching { it.asTstr }.getOrNull() } + + return PaymentCardDetails( + issuerName = text("issuer_name"), + holderName = text("holder_name"), + maskedAccountReference = text("masked_account_reference"), + paymentInstrumentId = text("payment_instrument_id"), + expiryDate = text("expiry_date"), + ) +} + +/** + * Reads the age attestation out of whichever identity credential the wallet chose to satisfy the + * "mdL or PhotoID or PID" use case with. + * + * `mandatory = true` on that use case is a hint to the wallet, not something the terminal can + * enforce, so a response carrying only the payment card is a real possibility and maps to + * [AgeDiscount.None]. EUPID has no `age_over_65`, so 65+ stays null there; it does carry + * `age_in_years`, which settles both thresholds when the boolean is absent. + */ +private fun discountOf(presentations: List): AgeDiscount { + val presentation = AGE_DOCTYPES + .firstNotNullOfOrNull { type -> presentations.firstOrNull { it.docType == type } } + ?: return AgeDiscount.None + + fun bool(name: String): Boolean? = presentation.claim(name) + ?.value + ?.let { + runCatching { it.asBoolean }.onFailure { + Logger.w( + "Unexpected claim value for '$name'", + it.stackTraceToString() + ) + }.getOrNull() + } + + // Check senior first to avoid being masked by age_over_18 = false on contradictory documents + if (bool("age_over_65") == true) + return AgeDiscount.SeniorCitizen + + if (bool("age_over_18") == false) + return AgeDiscount.Child + + val ageInYears = presentation.claim("age_in_years") + ?.value + ?.let { + runCatching { it.asNumber }.onFailure { + Logger.w( + "Unexpected claim value for 'age_in_years'", + it.stackTraceToString() + ) + }.getOrNull() + } + + val timeZone = TimeZone.currentSystemDefault() + val now = Clock.System.now() + + val dateOfBirthInstant = presentation.claim("birth_date") + ?.value + ?.let { + runCatching { it.asDateString.atStartOfDayIn(timeZone) }.onFailure { + Logger.w( + "Unexpected claim value for 'birth_date'", + it.stackTraceToString() + ) + }.getOrNull() + } + + // Prefer age_in_years when available; fall back to birth_date calculation + return when { + ageInYears != null -> when { + ageInYears >= 65 -> AgeDiscount.SeniorCitizen + ageInYears < 18 -> AgeDiscount.Child + else -> AgeDiscount.None + } + + dateOfBirthInstant != null -> when { + // calculated purely based on calendar date (not based on the birth time zone) + now < dateOfBirthInstant.plus( + 18, + DateTimeUnit.YEAR, + timeZone + ) -> AgeDiscount.Child + + now >= dateOfBirthInstant.plus( + 65, + DateTimeUnit.YEAR, + timeZone + ) -> AgeDiscount.SeniorCitizen + + else -> AgeDiscount.None + } + + else -> AgeDiscount.None + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentProcessor.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentProcessor.kt new file mode 100644 index 00000000..bc27589b --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/PaymentProcessor.kt @@ -0,0 +1,72 @@ +package org.multipaz.transit.payment + +import kotlinx.io.bytestring.ByteString +import org.multipaz.cbor.annotation.CborSerializable +import org.multipaz.rpc.annotation.RpcInterface +import org.multipaz.rpc.annotation.RpcMethod +import org.multipaz.verification.PresentmentRecord + +/** + * RPC interface for payment transaction processing. + * + * A payment flow consists of two steps: + * 1. [createTransaction] — the verifier creates a pending transaction and receives a nonce + * to be included in the credential presentation. + * 2. [commitTransaction] — after the holder presents a credential, the verifier submits + * the [PresentmentRecord] to finalize the transaction. + */ +@RpcInterface +interface PaymentProcessor { + /** + * Creates a new pending payment transaction. + * + * @param request details of the payment (payee, amount, currency). + * @return transaction data including the transaction ID and a nonce that the payment + * server uses to request credential presentation. + */ + @RpcMethod(endpoint = "create") + suspend fun createTransaction(request: PaymentTransactionRequest): PaymentTransactionData + + /** + * Commits a previously created transaction by providing a verified credential presentation. + * + * @param presentmentRecord self-contained result of the credential presentation. + * @return transaction confirmation id + */ + @RpcMethod(endpoint = "commit") + suspend fun commitTransaction(presentmentRecord: PresentmentRecord): String +} + +/** + * Request to create a payment transaction via [PaymentProcessor.createTransaction]. + * + * @property payeeAccount identifier of the payee's account. + * @property amount payment amount. + * @property currency ISO 4217 currency code (e.g. "USD", "EUR"). + * @property description optional human-readable description of the payment. + */ +@CborSerializable +data class PaymentTransactionRequest( + val payeeAccount: String, + val amount: Double, + val currency: String, + val description: String? +) { + companion object +} + +/** + * Data returned when a payment transaction is created via [PaymentProcessor.createTransaction]. + * + * @property transactionId unique identifier for the pending transaction. + * @property payeeName display name of the payee, suitable for showing to the payer. + * @property nonce a nonce to use in the presentment request. + */ +@CborSerializable +data class PaymentTransactionData( + val transactionId: String, + val payeeName: String, + val nonce: ByteString +) { + companion object +} \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/RpcPaymentSettler.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/RpcPaymentSettler.kt new file mode 100644 index 00000000..d9508b32 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/RpcPaymentSettler.kt @@ -0,0 +1,71 @@ +package org.multipaz.transit.payment + +import kotlinx.coroutines.withContext +import org.multipaz.transit.Constants +import org.multipaz.transit.Constants.DEFAULT_PAYEE_ACCOUNT +import org.multipaz.transit.Constants.DEFAULT_TERMINAL_URL +import org.multipaz.transit.Platform +import org.multipaz.rpc.client.RpcAuthorizedDeviceClient +import org.multipaz.rpc.handler.RpcAuthClientSession +import org.multipaz.rpc.handler.RpcExceptionMap +import org.multipaz.rpc.transport.HttpTransport +import org.multipaz.transit.payment.PaymentProcessor +import org.multipaz.transit.payment.PaymentTransactionData +import org.multipaz.transit.payment.PaymentTransactionRequest +import org.multipaz.verification.Iso18013PresentmentRecord + +const val TAG = "RpcPaymentSettler" + +class RpcPaymentSettler( + private val terminalBackendUrl: String = DEFAULT_TERMINAL_URL, + private val payeeAccount: String = DEFAULT_PAYEE_ACCOUNT +) { + private var paymentProcessor: PaymentProcessor? = null + + suspend fun init() { + try { + RpcAuthorizedDeviceClient.connect( + exceptionMap = RpcExceptionMap.Builder().build(), + httpClientEngine = Platform.httpClientEngineFactory, + url = terminalBackendUrl, + secureArea = org.multipaz.util.Platform.getSecureArea(), + storage = org.multipaz.util.Platform.storage + ) + } catch (e: HttpTransport.ConnectionException) { + throw HttpTransport.ConnectionException( + "Could not connect to terminal backend - is the backend running/accessible?", + e + ) + }.also { + paymentProcessor = PaymentProcessorStub( + endpoint = "pos", + dispatcher = it.dispatcher, + notifier = it.notifier + ) + } + } + + suspend fun createTransaction(amountCents: Long): PaymentTransactionData = + withContext(RpcAuthClientSession()) { + if (paymentProcessor == null) { + init() + } + paymentProcessor?.createTransaction( + PaymentTransactionRequest( + payeeAccount = payeeAccount, + amount = amountCents / 100.0, + currency = Constants.TERMINAL_CURRENCY, + description = null + ) + ) ?: throw IllegalStateException("Payment processor failed to initialize - pls check the connection and try again") + } + + suspend fun commit(record: Iso18013PresentmentRecord): String = + withContext(RpcAuthClientSession()) { + if (paymentProcessor == null) { + init() + } + paymentProcessor?.commitTransaction(record) + ?: throw IllegalStateException("Payment processor failed to initialize - pls check the connection and try again") + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/Settlement.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/Settlement.kt new file mode 100644 index 00000000..5f1d93c0 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/Settlement.kt @@ -0,0 +1,24 @@ +package org.multipaz.transit.payment + +import kotlinx.serialization.Serializable + +enum class AgeDiscount(val fareClass: String) { + None("STANDARD"), + Child("CHILD"), + SeniorCitizen("SENIOR"); + + companion object { + fun fromFareClass(fareClass: String): AgeDiscount = + entries.first { it.fareClass == fareClass } + } +} + +/** The claims read back off a settled presentment, for the receipt. */ +data class PresentedClaims( + val card: PaymentCardDetails? = null, + val discount: AgeDiscount = AgeDiscount.None, +) { + companion object { + val NONE = PresentedClaims() + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/SettlementResult.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/SettlementResult.kt new file mode 100644 index 00000000..ed029f81 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/payment/SettlementResult.kt @@ -0,0 +1,32 @@ +package org.multipaz.transit.payment + +/** Outcome of a settlement attempt. */ +sealed interface SettlementResult { + data class Approved( + val transactionId: String, + val amountCents: Long, + val timestampEpochMillis: Long, + /** Payment card read from the presented DPC. */ + val card: PaymentCardDetails? = null, + /** Age attestation read from the identity credential presented alongside the DPC. */ + val age: AgeDiscount = AgeDiscount.None, + ) : SettlementResult + + data class Declined(val reason: String) : SettlementResult +} + +/** + * Details read from a customer's Utopia Wholesale Digital Payment Credential (DPC) + * + * An instance only exists once the mdoc's issuer and device signatures have validated + */ +data class PaymentCardDetails( + val issuerName: String? = null, + val holderName: String? = null, + val maskedAccountReference: String? = null, + val paymentInstrumentId: String? = null, + val expiryDate: String? = null, +) { + val displayName: String? + get() = holderName?.ifBlank { null } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderFlow.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderFlow.kt new file mode 100644 index 00000000..f875e3f3 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderFlow.kt @@ -0,0 +1,111 @@ +package org.multipaz.transit.proximity + +import org.multipaz.cbor.Cbor +import org.multipaz.mdoc.connectionmethod.MdocConnectionMethod +import org.multipaz.mdoc.nfc.MdocHandoverType +import org.multipaz.mdoc.request.DeviceRequest +import org.multipaz.mdoc.response.DeviceResponse +import org.multipaz.mdoc.role.MdocRole +import org.multipaz.mdoc.sessionencryption.SessionEncryption +import org.multipaz.mdoc.transport.MdocTransport +import org.multipaz.mdoc.transport.MdocTransportFactory +import org.multipaz.util.Constants +import org.multipaz.util.Logger + +/** + * Runs the ISO/IEC 18013-5 reader exchange for [session]: opens a transport to the holder, sends + * [deviceRequest] over an encrypted session, and waits for the response. + * + * The transport is closed before returning, whether or not the exchange succeeded. Throwing means + * the exchange itself failed; returning means the session ended, which is not the same as it having + * produced a usable response - see the returned [ProximityReaderOutcome]. + */ +internal suspend fun runReaderFlow( + session: ProximityReaderSession, + deviceRequest: DeviceRequest, +): ProximityReaderOutcome { + val transport = session.existingTransport ?: session.createTransport() + + Logger.dCbor(TAG, "handover", Cbor.encode(session.handover)) + + val sessionEncryption = SessionEncryption( + role = MdocRole.MDOC_READER, + eSelfKey = session.eReaderKey, + remotePublicKey = session.deviceEngagement.eDeviceKey, + encodedSessionTranscript = Cbor.encode(session.sessionTranscript), + insertSequenceNumbers = session.nfcHandoverType == MdocHandoverType.V2_HANDOVER + ) + + try { + transport.open(session.deviceEngagement.eDeviceKey) + Logger.dCbor(TAG, "DeviceRequest", deviceRequest.toDataItem()) + transport.sendMessage( + sessionEncryption.encryptMessage( + messagePlaintext = Cbor.encode(deviceRequest.toDataItem()), + statusCode = null + ) + ) + + val deviceResponse = transport.receiveResponse(sessionEncryption) + ?: return ProximityReaderOutcome.NoResponse + if (deviceResponse.status != 0) { + return ProximityReaderOutcome.InvalidStatus(deviceResponse.status) + } + return ProximityReaderOutcome.Success( + deviceRequest = deviceRequest, + deviceResponse = deviceResponse, + sessionTranscript = session.sessionTranscript, + eReaderKey = session.eReaderKey, + ) + } finally { + transport.close() + } +} + +/** + * Creates a transport for one of the connection methods the holder offered in its engagement. + */ +private fun ProximityReaderSession.createTransport(): MdocTransport { + val connectionMethods = MdocConnectionMethod.disambiguate( + deviceEngagement.connectionMethods, + MdocRole.MDOC_READER + ) + return MdocTransportFactory.Default.createTransport( + connectionMethod = connectionMethods[0], // TODO: maybe selectConnectionMethod(connectionMethods) + role = MdocRole.MDOC_READER, + options = transportOptions + ) +} + +/** + * Waits for the holder's response and, unless the holder said it is hanging up, tells it the session + * is over - auto-close is enabled, so the reader terminates the session itself. + * + * Returns `null` if the session ended without the holder sending a DeviceResponse. + */ +private suspend fun MdocTransport.receiveResponse( + sessionEncryption: SessionEncryption +): DeviceResponse? { + val sessionData = waitForMessage() + if (sessionData.isEmpty()) { + Logger.i(TAG, "Holder closed the connection without sending a DeviceResponse") + return null + } + + val (message, status) = sessionEncryption.decryptMessage(sessionData) + Logger.i(TAG, "Holder sent ${message?.size} bytes status $status") + if (status == Constants.SESSION_DATA_STATUS_SESSION_TERMINATION) { + Logger.i( + TAG, "Holder indicated they closed the connection. " + + "Closing and ending reader loop" + ) + } else { + Logger.i( + TAG, "Holder did not indicate they are closing the connection. " + + "Auto-close is enabled, so sending termination message, closing, and " + + "ending reader loop" + ) + sendMessage(SessionEncryption.encodeStatus(Constants.SESSION_DATA_STATUS_SESSION_TERMINATION)) + } + return message?.let { DeviceResponse.fromDataItem(Cbor.decode(it)) } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderModel.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderModel.kt new file mode 100644 index 00000000..467f5df1 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderModel.kt @@ -0,0 +1,181 @@ +package org.multipaz.transit.proximity + +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import org.multipaz.cbor.DataItem +import org.multipaz.mdoc.nfc.MdocHandoverType +import org.multipaz.mdoc.request.DeviceRequest +import org.multipaz.mdoc.transport.MdocTransport +import org.multipaz.mdoc.transport.MdocTransportOptions +import org.multipaz.util.Logger +import kotlin.time.Duration + +const val TAG = "ProximityReaderModel" + +/** + * Drives a single mdoc reader session through its states, from an engagement to an outcome. + * + * The session is set up in steps - [setMdocTransportOptions] and [setConnectionEndpoint] with the + * engagement, then [setDeviceRequest] with a request built against [sessionTranscript] - and run by + * [start], which leaves the result in [outcome]. The exchange itself lives in [runReaderFlow]; this + * class owns the state, not the protocol. + */ +class ProximityReaderModel { + enum class State { + IDLE, + WAITING_FOR_DEVICE_REQUEST, + WAITING_FOR_START, + CONNECTING, + COMPLETED, + } + + private var sessionJob: Job? = null + private var session: ProximityReaderSession? = null + private var deviceRequest: DeviceRequest? = null + private var pendingTransportOptions: MdocTransportOptions? = null + private var _outcome: ProximityReaderOutcome? = null + + private val _state = MutableStateFlow(State.IDLE) + + /** + * The current state. + */ + val state = _state.asStateFlow() + + /** + * The outcome of the reader session, either a [ProximityReaderOutcome.Success] or one of the + * [ProximityReaderOutcome.Failure] cases. + * + * This is `null` until the model reaches [State.COMPLETED], and stays `null` if the session was + * canceled before it produced an outcome. + */ + val outcome: ProximityReaderOutcome? + get() = _outcome + + /** + * The session transcript of the session being set up, which a device request must be built + * against. + * + * This should only be read in states which aren't [State.IDLE] and [State.COMPLETED]. It will + * throw [IllegalStateException] if this is not the case. + */ + val sessionTranscript: DataItem + get() = activeSession().sessionTranscript + + private fun activeSession(): ProximityReaderSession { + check(_state.value != State.IDLE && _state.value != State.COMPLETED) { + "There is no session in state ${_state.value}" + } + return checkNotNull(session) + } + + /** + * Runs the reader flow in [scope], moving to [State.CONNECTING] and then, once the session ends + * for any reason, to [State.COMPLETED] with [outcome] set. + */ + fun start( + scope: CoroutineScope, + ) { + check(_state.value == State.WAITING_FOR_START) + val session = checkNotNull(session) + val deviceRequest = checkNotNull(deviceRequest) + + _state.value = State.CONNECTING + Logger.i(TAG, "Starting...") + + sessionJob = scope.launch { + val currentJob = coroutineContext[Job] + try { + _outcome = runReaderFlow(session, deviceRequest) + } catch (e: CancellationException) { + Logger.i(TAG, "Reader flow cancelled") + throw e + } catch (e: Throwable) { + Logger.w(TAG, "Error doing reader flow", e) + _outcome = ProximityReaderOutcome.Failed(e) + } finally { + // A newer session, or a reset(), has already taken over the model - leave it alone. + if (this@ProximityReaderModel.sessionJob === currentJob) { + completeSession() + } + } + } + } + + /** + * Sets the options to create a transport with, for the next call to [setConnectionEndpoint]. + */ + fun setMdocTransportOptions(options: MdocTransportOptions) { + pendingTransportOptions = options + } + + /** + * Sets up a session for the holder described by [deviceEngagement] and moves to + * [State.WAITING_FOR_DEVICE_REQUEST]. + * + * See [ProximityReaderSession] for what the parameters mean. + */ + suspend fun setConnectionEndpoint( + deviceEngagement: DataItem, + handover: DataItem, + existingTransport: MdocTransport? = null, + nfcHandoverType: MdocHandoverType? = null, + durationNfcTapToEngagement: Duration? = null, + ) { + check(_state.value == State.IDLE) + val session = ProximityReaderSession.create( + encodedDeviceEngagement = deviceEngagement, + handover = handover, + existingTransport = existingTransport, + nfcHandoverType = nfcHandoverType, + durationNfcTapToEngagement = durationNfcTapToEngagement, + transportOptions = pendingTransportOptions ?: MdocTransportOptions(), + ) + this.session = session + Logger.dCbor(TAG, "sessionTranscript", session.sessionTranscript) + _state.value = State.WAITING_FOR_DEVICE_REQUEST + } + + /** + * Sets the request to send to the holder and moves to [State.WAITING_FOR_START]. + */ + fun setDeviceRequest( + deviceRequest: DeviceRequest + ) { + check(_state.value == State.WAITING_FOR_DEVICE_REQUEST) + this.deviceRequest = deviceRequest + _state.value = State.WAITING_FOR_START + } + + + /** + * Releases the session which just ended, keeping its [outcome]. + */ + private fun completeSession() { + session = null + deviceRequest = null + if (_state.value != State.IDLE) { + Logger.i(TAG, "Setting state to COMPLETED") + _state.value = State.COMPLETED + } + sessionJob = null + } + + /** + * Cancels any session in progress and returns the model to [State.IDLE], discarding the outcome + * of a previous session. + */ + fun reset() { + sessionJob?.cancel(CancellationException("ReaderModel reset")) + sessionJob = null + session = null + deviceRequest = null + pendingTransportOptions = null + _outcome = null + _state.value = State.IDLE + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderOutcome.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderOutcome.kt new file mode 100644 index 00000000..02bea7e7 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderOutcome.kt @@ -0,0 +1,57 @@ +package org.multipaz.transit.proximity + +import org.multipaz.cbor.DataItem +import org.multipaz.crypto.EcPrivateKey +import org.multipaz.mdoc.request.DeviceRequest +import org.multipaz.mdoc.response.DeviceResponse + +/** + * The outcome of a reader session, available from [ProximityReaderModel.outcome] once the model + * reaches [ProximityReaderModel.State.COMPLETED]. + */ +sealed interface ProximityReaderOutcome { + + /** + * The holder returned a [DeviceResponse] with an OK status. + * + * [sessionTranscript] and [eReaderKey] are carried along because verifying the response means + * checking it against what was asked and which session it was asked in. + */ + data class Success( + val deviceRequest: DeviceRequest, + val deviceResponse: DeviceResponse, + val sessionTranscript: DataItem, + val eReaderKey: EcPrivateKey, + ) : ProximityReaderOutcome + + /** + * A session which didn't yield a usable response. + * + * [error] describes the failure and is what should be surfaced to the caller. + */ + sealed interface Failure : ProximityReaderOutcome { + val error: Throwable + } + + /** + * The reader flow threw before a response was obtained, for example because the transport went + * away mid-session. + */ + data class Failed(override val error: Throwable) : Failure + + /** + * The session ended without the holder sending a DeviceResponse message. + */ + data object NoResponse : Failure { + override val error: Throwable + get() = IllegalStateException("No DeviceResponse message") + } + + /** + * The holder sent a DeviceResponse carrying a non-zero status. + */ + data class InvalidStatus(val status: Int) : Failure { + override val error: Throwable + get() = IllegalStateException("DeviceResponse has non-zero status $status") + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderSession.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderSession.kt new file mode 100644 index 00000000..dc60aba4 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityReaderSession.kt @@ -0,0 +1,74 @@ +package org.multipaz.transit.proximity + +import org.multipaz.cbor.Bstr +import org.multipaz.cbor.Cbor +import org.multipaz.cbor.DataItem +import org.multipaz.cbor.Tagged +import org.multipaz.cbor.buildCborArray +import org.multipaz.crypto.Crypto +import org.multipaz.crypto.EcPrivateKey +import org.multipaz.mdoc.engagement.DeviceEngagement +import org.multipaz.mdoc.nfc.MdocHandoverType +import org.multipaz.mdoc.transport.MdocTransport +import org.multipaz.mdoc.transport.MdocTransportOptions +import kotlin.time.Duration + +/** + * The parameters of a single reader session, fixed once the connection endpoint is known. + * + * Sessions are made with [create], which generates the ephemeral reader key and the session + * transcript binding the exchange to this engagement, so [ProximityReaderModel] can hold one + * nullable session instead of a nullable field per parameter. + * + * @property handover the NFCv2 handover as defined in ISO/IEC 18013-5 Second Edition. + * @property existingTransport the transport the engagement was received on, if it can be reused, or + * `null` to create one from the connection methods in the engagement. + * @property nfcHandoverType the kind of NFC handover which produced the engagement, or `null` if it + * didn't come from NFC. + * @property durationNfcTapToEngagement how long the NFC tap took, for the session's timings. + * @property transportOptions the options to create a transport with, when one isn't being reused. + * @property eReaderKey the ephemeral reader key, on the same curve as the holder's `EDeviceKey`. + * @property sessionTranscript the `SessionTranscript` as defined in ISO/IEC 18013-5, which both + * sides derive their session keys from and which the holder signs over. + */ +internal class ProximityReaderSession private constructor( + val deviceEngagement: DeviceEngagement, + val handover: DataItem, + val existingTransport: MdocTransport?, + val nfcHandoverType: MdocHandoverType?, + val durationNfcTapToEngagement: Duration?, + val transportOptions: MdocTransportOptions, + val eReaderKey: EcPrivateKey, + val sessionTranscript: DataItem, +) { + companion object { + /** + * Creates a session for the holder described by an NFCv2 [encodedDeviceEngagement]. + */ + suspend fun create( + encodedDeviceEngagement: DataItem, + handover: DataItem, + existingTransport: MdocTransport?, + nfcHandoverType: MdocHandoverType?, + durationNfcTapToEngagement: Duration?, + transportOptions: MdocTransportOptions, + ): ProximityReaderSession { + val deviceEngagement = DeviceEngagement.fromDataItem(encodedDeviceEngagement) + val eReaderKey = Crypto.createEcPrivateKey(deviceEngagement.eDeviceKey.curve) + return ProximityReaderSession( + deviceEngagement = deviceEngagement, + handover = handover, + existingTransport = existingTransport, + nfcHandoverType = nfcHandoverType, + durationNfcTapToEngagement = durationNfcTapToEngagement, + transportOptions = transportOptions, + eReaderKey = eReaderKey, + sessionTranscript = buildCborArray { + add(Tagged(24, Bstr(Cbor.encode(encodedDeviceEngagement)))) + add(Tagged(24, Bstr(Cbor.encode(eReaderKey.publicKey.toCoseKey().toDataItem())))) + add(handover) + }, + ) + } + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityUtils.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityUtils.kt new file mode 100644 index 00000000..9c1df427 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/ProximityUtils.kt @@ -0,0 +1,81 @@ +package org.multipaz.transit.proximity + +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.flow.first +import org.multipaz.cbor.Cbor +import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodNfcV2 +import org.multipaz.mdoc.nfc.MdocHandoverType +import org.multipaz.mdoc.nfc.ScanMdocReaderResult +import org.multipaz.mdoc.transport.MdocTransportClosedException +import org.multipaz.mdoc.transport.MdocTransportException +import org.multipaz.nfc.NfcTagLostException +import org.multipaz.util.Logger + +private fun Throwable.isTagLostOrTransportClosed(): Boolean { + var current: Throwable? = this + while (current != null) { + if (current is NfcTagLostException || + current is MdocTransportClosedException || + current is MdocTransportException + ) { + return true + } + current = current.cause + } + return false +} + +suspend fun handleNfcHandover( + scanResult: ScanMdocReaderResult, + proximityReaderModel: ProximityReaderModel, +): Boolean { + if (proximityReaderModel.state.value != ProximityReaderModel.State.IDLE) { + Logger.i( + TAG, + "Ignoring NFC handover, state is already ${proximityReaderModel.state.value}" + ) + return false + } + require(scanResult.type == MdocHandoverType.V2_HANDOVER) { + "This terminal accepts NFCv2 handover only." + } + require(scanResult.transport.connectionMethod is MdocConnectionMethodNfcV2) { + "This terminal accepts NFCv2 NFC-only transfer only." + } + try { + proximityReaderModel.apply { + reset() + setConnectionEndpoint( + deviceEngagement = Cbor.decode(scanResult.encodedDeviceEngagement.toByteArray()), + handover = scanResult.handover, + existingTransport = scanResult.transport, + nfcHandoverType = scanResult.type, + durationNfcTapToEngagement = scanResult.processingDuration + ) + } + + proximityReaderModel.state.first { it == ProximityReaderModel.State.COMPLETED || it == ProximityReaderModel.State.IDLE } + if (proximityReaderModel.state.value == ProximityReaderModel.State.COMPLETED) { + // Only a thrown reader flow failure aborts the tap; a session which completed with + // an unusable response is left for the caller to report. + val err = (proximityReaderModel.outcome as? ProximityReaderOutcome.Failed)?.error + err?.let { + if (err.isTagLostOrTransportClosed()) { + Logger.i( + TAG, + "Tag lost during NFC-only transfer, resetting model for re-tap", + err + ) + proximityReaderModel.reset() + } + throw err + } + } + return true + } catch (e: Exception) { + if (e is CancellationException) throw e + Logger.w(TAG, "Error handling NFC handover endpoint setup", e) + proximityReaderModel.reset() + throw e + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/VerificationProximityTransferScreen.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/VerificationProximityTransferScreen.kt new file mode 100644 index 00000000..d547378c --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/proximity/VerificationProximityTransferScreen.kt @@ -0,0 +1,550 @@ +package org.multipaz.transit.proximity + +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.StartOffset +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +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 +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import org.multipaz.cbor.DataItem +import org.multipaz.documenttype.ISO_18013_TRANSACTION_DATA_NAMESPACE +import org.multipaz.documenttype.knowntypes.DrivingLicense +import org.multipaz.documenttype.knowntypes.EUPersonalID +import org.multipaz.documenttype.knowntypes.PaymentTransaction +import org.multipaz.documenttype.knowntypes.PhotoID +import org.multipaz.mdoc.nfc.MdocReaderNfcHandoverOptions +import org.multipaz.mdoc.nfc.ScanMdocReaderResult +import org.multipaz.mdoc.nfc.scanMdocReader +import org.multipaz.mdoc.request.DeviceRequest +import org.multipaz.mdoc.request.DeviceRequestInfo +import org.multipaz.mdoc.request.DocRequestInfo +import org.multipaz.mdoc.request.DocumentSet +import org.multipaz.mdoc.request.TransactionsInfo +import org.multipaz.mdoc.request.UseCase +import org.multipaz.mdoc.request.buildDeviceRequest +import org.multipaz.mdoc.transport.MdocTransportOptions +import org.multipaz.nfc.NfcTagReader +import org.multipaz.transit.Constants +import org.multipaz.transit.payment.RpcPaymentSettler +import org.multipaz.transit.ui.GhostButton +import org.multipaz.transit.ui.TransitTheme +import org.multipaz.transit.ui.type +import org.multipaz.util.Logger +import org.multipaz.util.Platform +import org.multipaz.utopia.knowntypes.DigitalPaymentCredential +import org.multipaz.verification.Iso18013PresentmentRecord + +enum class GateTap { ENTRY, EXIT } + +@Composable +fun ProximityScreen( + proximityReaderModel: ProximityReaderModel, + paymentSettler: RpcPaymentSettler, + amountCents: Long? = null, + gateTap: GateTap, + onBackClicked: () -> Unit, + onTransferComplete: suspend (presentmentRecord: Iso18013PresentmentRecord) -> Unit, + onTransferError: (error: Throwable) -> Unit, + onNfcHandover: (suspend (ScanMdocReaderResult) -> Unit)? = null, +) { + val coroutineScope = rememberCoroutineScope { Platform.promptModel } + + val proximityReaderModelState = proximityReaderModel.state.collectAsState().value + + LaunchedEffect(proximityReaderModelState) { + when (proximityReaderModelState) { + ProximityReaderModel.State.WAITING_FOR_DEVICE_REQUEST -> { + val sessionTranscript = try { + proximityReaderModel.sessionTranscript + } catch (e: Exception) { + Logger.w(TAG, "Session transcript not available", e) + return@LaunchedEffect + } + + try { + val deviceRequest = if (amountCents == null) { + createCheckInRequest( + sessionTranscript = sessionTranscript, + ) + } else { + createCheckoutRequest( + paymentSettler = paymentSettler, + amountCents = amountCents, + sessionTranscript = sessionTranscript, + ) + } + + proximityReaderModel.setDeviceRequest( + deviceRequest = deviceRequest + ) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Logger.e(TAG, "Error creating device request", e) + onTransferError(e) + } + } + + ProximityReaderModel.State.WAITING_FOR_START -> { + proximityReaderModel.start(coroutineScope) + } + + ProximityReaderModel.State.COMPLETED -> { + handleTransferOutcome( + outcome = proximityReaderModel.outcome, + onTransferComplete = onTransferComplete, + onTransferError = onTransferError, + ) + } + + else -> {} + } + } + + val nfcTagReader = NfcTagReader.getReaders().firstOrNull() + + LaunchedEffect(Unit) { + if (proximityReaderModel.state.value == ProximityReaderModel.State.IDLE && onNfcHandover != null) { + if (nfcTagReader != null) { + withContext(Platform.promptModel) { + while (isActive) { + try { + val scanResult = nfcTagReader.scanMdocReader( + message = if (nfcTagReader.dialogAlwaysShown) { + "Hold your device near the terminal" + } else { + null + }, + options = MdocTransportOptions(), + handoverOptions = MdocReaderNfcHandoverOptions( + useNfcV2 = true + ), + selectConnectionMethod = { connectionMethods -> + connectionMethods.singleOrNull() + }, + negotiatedHandoverConnectionMethods = emptyList(), + onHandover = { scanResult -> + onNfcHandover(scanResult) + scanResult + }) + if (scanResult != null) { + break + } + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Logger.e(TAG, "Error scanning, stopping scan", e) + onTransferError(e) + break + } + } + } + } + } + } + + Column(Modifier.fillMaxSize()) { + Box( + Modifier.weight(1f).fillMaxWidth().padding(horizontal = 26.dp), + contentAlignment = Alignment.Center, + ) { + when { + proximityReaderModelState != ProximityReaderModel.State.IDLE -> ReadingState(gateTap) + else -> TapAtGate(gateTap) + } + } + + CheckoutFooter(onCancel = onBackClicked) + } +} + +private suspend fun createCheckInRequest( + sessionTranscript: DataItem, +): DeviceRequest { + return buildDeviceRequest( + sessionTranscript = sessionTranscript, + deviceRequestInfo = DeviceRequestInfo.fromValues( + useCases = listOf( + // DPC + UseCase( + mandatory = true, + documentSets = listOf( + DocumentSet(listOf(0)) + ), + purposeHints = emptyMap() + ), + // + mdl OR photoid OR pid (optionally) + UseCase( + mandatory = false, + documentSets = listOf( + DocumentSet(listOf(1)), + DocumentSet(listOf(2)), + DocumentSet(listOf(3)) + ), + purposeHints = emptyMap() + ) + ) + ) + ) { + addDocRequest( + docType = DigitalPaymentCredential.CARD_DOCTYPE, + nameSpaces = mapOf( + DigitalPaymentCredential.CARD_NAMESPACE to listOf( + "issuer_name", + "holder_name", + "masked_account_reference", + "payment_instrument_id", + "issue_date", + "expiry_date", + ).associateWith { false } + ), + ) + addDocRequest( + docType = DrivingLicense.MDL_DOCTYPE, + nameSpaces = mapOf( + DrivingLicense.MDL_NAMESPACE to listOf( + "age_over_18", + "age_over_65", + "age_in_years", + "birth_date" + ).associateWith { false } + ) + ) + addDocRequest( + docType = PhotoID.PHOTO_ID_DOCTYPE, + nameSpaces = mapOf( + PhotoID.ISO_23220_2_NAMESPACE to listOf( + "age_over_18", + "age_over_65", + "age_in_years", + "birth_date" + ).associateWith { false } + ) + ) + addDocRequest( + docType = EUPersonalID.EUPID_DOCTYPE, + nameSpaces = mapOf( + EUPersonalID.EUPID_NAMESPACE to listOf( + "age_over_18", + "age_in_years", + "birth_date" + ).associateWith { false } + ) + ) + // addReaderAuthAll(key) + } +} + +/** + * Registers a transaction for [amountCents] with [paymentSettler] and builds the DeviceRequest which + * asks the holder for a payment credential bound to it. + * + * The transaction is carried in the doc request so the holder signs over the amount and payee it is + * about to authorize; [sessionTranscript] binds the request to this proximity session. + */ +private suspend fun createCheckoutRequest( + paymentSettler: RpcPaymentSettler, + amountCents: Long, + sessionTranscript: DataItem, +): DeviceRequest { + val transactionId = + paymentSettler.createTransaction(amountCents = amountCents).transactionId + + val payload = PaymentTransaction.Payload( + transactionId = transactionId, + currency = Constants.TERMINAL_CURRENCY, + amount = amountCents / 100.0, + payee = PaymentTransaction.Payee( + name = Constants.TERMINAL_PAYEE_NAME, + id = Constants.TERMINAL_PAYEE_ID, + ), + ) + + val transactionSerialized: DataItem = PaymentTransaction.serializeIso18013Request(payload) + + return buildDeviceRequest( + sessionTranscript = sessionTranscript, + deviceRequestInfo = DeviceRequestInfo.fromValues( + useCases = listOf( + // DPC + UseCase( + mandatory = true, + documentSets = listOf( + DocumentSet(listOf(0)) + ), + purposeHints = emptyMap() + ), + ) + ) + ) { + addDocRequest( + docType = DigitalPaymentCredential.CARD_DOCTYPE, + nameSpaces = mapOf( + DigitalPaymentCredential.CARD_NAMESPACE to listOf( + "issuer_name", + "holder_name", + "masked_account_reference", + "payment_instrument_id", + "issue_date", + "expiry_date", + ).associateWith { false }, + ISO_18013_TRANSACTION_DATA_NAMESPACE to mapOf(PaymentTransaction.identifier to true) + ), + docRequestInfo = + DocRequestInfo( + transactionData = TransactionsInfo( + data = mapOf( + PaymentTransaction.identifier to transactionSerialized + ) + ) + ) + ) + // addReaderAuthAll(key) + } +} + + +/** + * Delivers the outcome of a completed proximity transfer, reporting the failure to + * [onTransferError] or handing the resulting presentment record to [onTransferComplete] + */ +private suspend fun handleTransferOutcome( + outcome: ProximityReaderOutcome?, + onTransferComplete: suspend (presentmentRecord: Iso18013PresentmentRecord) -> Unit, + onTransferError: (error: Throwable) -> Unit, +) { + when (outcome) { + // The session was canceled before producing an outcome, so there is nothing to report. + null -> {} + + is ProximityReaderOutcome.Failure -> onTransferError(outcome.error) + + is ProximityReaderOutcome.Success -> { + try { + val presentmentRecord = Iso18013PresentmentRecord( + response = outcome.deviceResponse.toDataItem(), + sessionTranscript = outcome.sessionTranscript, + request = outcome.deviceRequest.toDataItem(), + eDeviceKey = outcome.eReaderKey, + encryptionInfo = null, + origin = null + ) + onTransferComplete(presentmentRecord) + } catch (e: CancellationException) { + throw e + } catch (e: Throwable) { + Logger.w(TAG, "Error completing transfer", e) + onTransferError(e) + } + } + } +} + +/** + * The resting state of the gate: a breathing NFC target with rings pulsing outward from it. The + * whole point of the screen is that one tap covers both the age check and the fare, so that is + * the only sentence on it. + */ +@Composable +private fun TapAtGate(gateTap: GateTap) { + val c = TransitTheme.colors + val type = TransitTheme.type + val t = rememberInfiniteTransition(label = "tap") + val ringA by t.animateFloat( + initialValue = 0f, targetValue = 1f, + animationSpec = infiniteRepeatable(tween(2400, easing = LinearEasing)), + label = "ringA", + ) + val ringB by t.animateFloat( + initialValue = 0f, targetValue = 1f, + animationSpec = infiniteRepeatable( + tween(2400, easing = LinearEasing), + initialStartOffset = StartOffset(1200), + ), + label = "ringB", + ) + val breathe by t.animateFloat( + initialValue = 1f, targetValue = 1.035f, + animationSpec = infiniteRepeatable(tween(1600), RepeatMode.Reverse), + label = "breathe", + ) + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Box(Modifier.size(164.dp), contentAlignment = Alignment.Center) { + PulseRing(ringA) + PulseRing(ringB) + Box( + Modifier + .size(102.dp) + .graphicsLayer { scaleX = breathe; scaleY = breathe } + .clip(CircleShape) + .background(c.tapFill) + .border(1.dp, c.tapBorder, CircleShape), + contentAlignment = Alignment.Center, + ) { + Box(Modifier.size(44.dp).clip(CircleShape).background(c.primary)) + } + } + Spacer(Modifier.height(26.dp)) + Text( + if (gateTap == GateTap.ENTRY) "Tap to check in" else "Tap to check out", + style = type.headline, + color = c.ink, + ) + Spacer(Modifier.height(7.dp)) + Text( + if (gateTap == GateTap.ENTRY) + "Tap at the entry gate to start the journey." + else + "Tap at the exit gate to calculate and pay the fare.", + style = type.body, + color = c.ink.copy(alpha = 0.55f), + textAlign = TextAlign.Center, + ) + } +} + +/** One outward pulse: expands past the target and fades as it goes. */ +@Composable +private fun BoxScope.PulseRing(progress: Float) { + val c = TransitTheme.colors + // Fades in over the first fifth of the travel, then out across the rest. + val alpha = if (progress < 0.22f) { + 0.55f * (progress / 0.22f) + } else { + 0.55f * (1f - (progress - 0.22f) / 0.78f) + } + val scale = 0.62f + (1.32f - 0.62f) * progress + Box( + Modifier + .matchParentSize() + .graphicsLayer { + scaleX = scale + scaleY = scale + this.alpha = alpha + } + .border(1.dp, c.primary, CircleShape) + ) +} + +/** The wallet is answering: a filled target under a sweeping arc, plus a moving read bar. */ +@Composable +private fun ReadingState(gateTap: GateTap) { + val c = TransitTheme.colors + val type = TransitTheme.type + val t = rememberInfiniteTransition(label = "reading") + val sweep by t.animateFloat( + initialValue = 0f, targetValue = 360f, + animationSpec = infiniteRepeatable(tween(1100, easing = LinearEasing)), + label = "sweep", + ) + val fill by t.animateFloat( + initialValue = 0f, targetValue = 1f, + animationSpec = infiniteRepeatable(tween(1500)), + label = "fill", + ) + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Box(Modifier.size(164.dp), contentAlignment = Alignment.Center) { + Canvas(Modifier.size(134.dp).rotate(sweep)) { + val stroke = 2.dp.toPx() + val inset = stroke / 2f + val arcSize = Size(size.width - stroke, size.height - stroke) + drawCircle( + color = c.tapBorder, + radius = (size.minDimension - stroke) / 2f, + style = Stroke(width = stroke), + ) + drawArc( + color = c.primary, + startAngle = -90f, + sweepAngle = 90f, + useCenter = false, + topLeft = Offset(inset, inset), + size = arcSize, + style = Stroke(width = stroke), + ) + } + Box(Modifier.size(102.dp).clip(CircleShape).background(c.primary)) + } + Spacer(Modifier.height(26.dp)) + Text( + if (gateTap == GateTap.ENTRY) "Checking in…" else "Checking out…", + style = type.headline, + color = c.ink, + ) + Spacer(Modifier.height(7.dp)) + Text("Keep holding still", style = type.body, color = c.ink.copy(alpha = 0.55f)) + Spacer(Modifier.height(24.dp)) + Box( + Modifier + .width(160.dp) + .height(3.dp) + .clip(RoundedCornerShape(2.dp)) + .background(c.track), + ) { + Box( + Modifier + .fillMaxHeight() + .fillMaxWidth(fill) + .background(c.primary) + ) + } + } +} + +/** Quiet controls the rider only needs if the tap is not working out. */ +@Composable +private fun CheckoutFooter( + onCancel: () -> Unit, +) { + val c = TransitTheme.colors + Row( + Modifier.fillMaxWidth().padding(horizontal = 24.dp, vertical = 16.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + GhostButton( + label = "Cancel", + color = c.error, + modifier = Modifier.weight(1f), + onClick = onCancel, + ) + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/AppState.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/AppState.kt new file mode 100644 index 00000000..a29ff580 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/AppState.kt @@ -0,0 +1,121 @@ +package org.multipaz.transit.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Stable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableLongStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import org.multipaz.transit.journey.Journey +import org.multipaz.transit.payment.AgeDiscount +import org.multipaz.transit.payment.PresentedClaims +import org.multipaz.transit.payment.SettlementResult + +/** The high-level screens of the faregate. */ +enum class TransitScreen { CHECK_IN, SELECTION, CHECKOUT, SETTLEMENT, FAILURE } + +/** + * Drives the faregate flow: which [TransitScreen] is showing, the destination the rider picked + * (and therefore the fare carried into settlement), and the settlement result. A plain Compose + * state holder with no Android dependency, so the transitions can be unit-tested in commonTest. + */ +@Stable +class AppState { + var screen by mutableStateOf(TransitScreen.CHECK_IN) + private set + + /** The simulated destination, or null until the entry tap has completed. */ + var destination by mutableStateOf(null) + private set + + var claims by mutableStateOf(null) + private set + + /** Fare entitlement captured when this journey was first created or restored. */ + var fareDiscount : AgeDiscount by mutableStateOf(AgeDiscount.None) + private set + + var settledCents by mutableLongStateOf(0L) + private set + + /** A short explanation shown when an existing backend journey is restored. */ + var journeyResumeNotice by mutableStateOf(null) + private set + + /** The approved settlement backing the confirmation screen, or null before one exists. */ + var lastSettlement by mutableStateOf(null) + private set + + /** The decline backing the failure screen, or null while nothing has failed. */ + var lastFailure by mutableStateOf(null) + private set + + /** Amount shown on the settlement screen. */ + val settlementAmountCents: Long + get() = lastSettlement?.amountCents ?: settledCents + + /** Entry tap complete → briefly simulate the rider's destination. */ + fun checkin(presentedClaims: PresentedClaims) { + claims = presentedClaims + fareDiscount = presentedClaims.discount + journeyResumeNotice = null + screen = TransitScreen.SELECTION + } + + /** Simulation complete → wait for the same rider at the exit gate. */ + fun checkout(station: Station) { + destination = station + settledCents = station.fareCents + screen = TransitScreen.CHECKOUT + } + + /** Restores a checkout-ready journey persisted before this app instance was started. */ + fun resumeCheckout( + presentedClaims: PresentedClaims, + journey: Journey + ) { + claims = presentedClaims + fareDiscount = AgeDiscount.fromFareClass(journey.fareClass) + journeyResumeNotice = "Resuming an already existing journey. Please checkout." + checkout(journey.checkoutStation()) + } + + /** Fare authorized → record the result and open the gate. */ + fun settle(result: SettlementResult.Approved) { + lastSettlement = result + settledCents = result.amountCents + screen = TransitScreen.SETTLEMENT + } + + /** Abort the tap and show why the gate stayed shut. */ + fun cancel(reason: SettlementResult.Declined) { + lastFailure = reason + screen = TransitScreen.FAILURE + } + + /** Reset the faregate for the next rider's entry tap. */ + fun newTransaction() { + destination = null + claims = null + fareDiscount = AgeDiscount.None + settledCents = 0L + journeyResumeNotice = null + lastSettlement = null + lastFailure = null + screen = TransitScreen.CHECK_IN + } +} + + +/** Rehydrates the display station while retaining the stored, server-calculated fare. */ +private fun Journey.checkoutStation(): Station { + val exitStation = requireNotNull(exitStation) { "Stored journey has no exit station" } + val fareCents = requireNotNull(fareCents) { "Stored journey has no fare" } + val station = getStationList(AgeDiscount.None).firstOrNull { it.name == exitStation } + ?: throw IllegalStateException("Stored journey has an unknown exit station: $exitStation") + return station.copy(fareCents = fareCents) +} + +@Composable +fun rememberAppState(): AppState = remember { AppState() } diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Controls.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Controls.kt new file mode 100644 index 00000000..771ab0a0 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Controls.kt @@ -0,0 +1,58 @@ +package org.multipaz.transit.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp + +/** The one solid, unmissable action on a screen. */ +@Composable +fun PrimaryButton( + label: String, + modifier: Modifier = Modifier, + onClick: () -> Unit, +) { + val c = TransitTheme.colors + val type = TransitTheme.type + Box( + modifier + .clip(RoundedCornerShape(13.dp)) + .background(c.primary) + .clickable(onClick = onClick) + .padding(horizontal = 20.dp, vertical = 13.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, style = type.title, color = Color.White) + } +} + +/** A quiet secondary action: outline only, so it never competes with the tap target. */ +@Composable +fun GhostButton( + label: String, + modifier: Modifier = Modifier, + color: Color? = null, + onClick: () -> Unit, +) { + val c = TransitTheme.colors + val type = TransitTheme.type + Box( + modifier + .clip(RoundedCornerShape(12.dp)) + .border(1.dp, c.ink.copy(alpha = 0.14f), RoundedCornerShape(12.dp)) + .clickable(onClick = onClick) + .padding(horizontal = 14.dp, vertical = 12.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, style = type.label, color = color ?: c.ink.copy(alpha = 0.6f)) + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Motion.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Motion.kt new file mode 100644 index 00000000..ed1a91f2 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Motion.kt @@ -0,0 +1,44 @@ +package org.multipaz.transit.ui + +import androidx.compose.animation.core.EaseOutCubic +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.unit.dp + +/** + * Runs 0 → 1 once, the frame after this composable enters. Screens stagger their parts by + * passing a [delayMillis], which is what gives the outcome screens their settle-in feel. + */ +@Composable +fun rememberAppearance(delayMillis: Int = 0, durationMillis: Int = 360): Float { + var shown by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { shown = true } + val progress by animateFloatAsState( + targetValue = if (shown) 1f else 0f, + animationSpec = tween(durationMillis, delayMillis, EaseOutCubic), + label = "appearance", + ) + return progress +} + +/** Fades in while lifting the last few dp into place. */ +fun Modifier.riseIn(progress: Float): Modifier = graphicsLayer { + alpha = progress + translationY = (1f - progress) * 9.dp.toPx() +} + +/** Fades in while scaling up from slightly small, for the outcome badges. */ +fun Modifier.popIn(progress: Float): Modifier = graphicsLayer { + alpha = progress + val scale = 0.86f + 0.14f * progress + scaleX = scale + scaleY = scale +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/OutcomeScreen.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/OutcomeScreen.kt new file mode 100644 index 00000000..e41df496 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/OutcomeScreen.kt @@ -0,0 +1,171 @@ +package org.multipaz.transit.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp + +/** Which mark the outcome badge carries. */ +enum class OutcomeMark { CHECK, CROSS } + +/** A label/value line in the outcome's detail stack. */ +data class OutcomeDetail( + val label: String, + val value: String, + val valueColor: Color? = null, +) + +/** + * The shape both endings share: a badge, a verdict, and the receipt of what was actually read. + * Only the accent colour and the mark change between "the gate opened" and "it did not". + */ +@Composable +fun OutcomeScreen( + accent: Color, + mark: OutcomeMark, + headline: String, + subline: String, + details: List, + actionLabel: String, + onAction: () -> Unit, +) { + val c = TransitTheme.colors + val type = TransitTheme.type + val badge = rememberAppearance(durationMillis = 420) + val text = rememberAppearance(delayMillis = 60) + val stack = rememberAppearance(delayMillis = 140) + + Column(Modifier.fillMaxWidth().padding(horizontal = 26.dp)) { + Column( + Modifier.weight(1f).fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Box( + Modifier.size(100.dp).popIn(badge).clip(CircleShape).background(accent), + contentAlignment = Alignment.Center, + ) { + OutcomeMarkGlyph(mark) + } + Spacer(Modifier.height(26.dp)) + Column( + Modifier.riseIn(text), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(headline, style = type.headline, color = c.ink, textAlign = TextAlign.Center) + Spacer(Modifier.height(7.dp)) + Text( + subline, + style = type.body, + color = c.ink.copy(alpha = 0.55f), + textAlign = TextAlign.Center, + ) + } + if (details.isNotEmpty()) { + Spacer(Modifier.height(24.dp)) + DetailStack(details, Modifier.riseIn(stack)) + } + } + GhostButton( + label = actionLabel, + modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp), + onClick = onAction, + ) + } +} + +/** Hairline-separated rows: the receipt of what the gate actually read. */ +@Composable +private fun DetailStack(details: List, modifier: Modifier = Modifier) { + val c = TransitTheme.colors + val type = TransitTheme.type + Column( + modifier + .fillMaxWidth() + .clip(RoundedCornerShape(12.dp)) + .background(c.border), + verticalArrangement = Arrangement.spacedBy(1.dp), + ) { + for (detail in details) { + Row( + Modifier + .fillMaxWidth() + .background(c.card) + .padding(horizontal = 15.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text(detail.label, style = type.bodySmall, color = c.ink.copy(alpha = 0.6f)) + Text( + detail.value, + style = type.bodySmall.copy(fontWeight = FontWeight.SemiBold), + color = detail.valueColor ?: c.ink, + ) + } + } + } +} + +@Composable +private fun OutcomeMarkGlyph(mark: OutcomeMark) { + Canvas(Modifier.size(42.dp)) { + val stroke = 5.dp.toPx() + when (mark) { + OutcomeMark.CHECK -> { + // A tick drawn as two strokes: down to the elbow, then up and out. + val elbow = Offset(size.width * 0.38f, size.height * 0.74f) + drawLine( + color = Color.White, + start = Offset(size.width * 0.1f, size.height * 0.5f), + end = elbow, + strokeWidth = stroke, + cap = StrokeCap.Round, + ) + drawLine( + color = Color.White, + start = elbow, + end = Offset(size.width * 0.9f, size.height * 0.24f), + strokeWidth = stroke, + cap = StrokeCap.Round, + ) + } + + OutcomeMark.CROSS -> { + drawLine( + color = Color.White, + start = Offset(size.width * 0.16f, size.height * 0.16f), + end = Offset(size.width * 0.84f, size.height * 0.84f), + strokeWidth = stroke, + cap = StrokeCap.Round, + ) + drawLine( + color = Color.White, + start = Offset(size.width * 0.84f, size.height * 0.16f), + end = Offset(size.width * 0.16f, size.height * 0.84f), + strokeWidth = stroke, + cap = StrokeCap.Round, + ) + } + } + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementFailureScreen.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementFailureScreen.kt new file mode 100644 index 00000000..a4b00479 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementFailureScreen.kt @@ -0,0 +1,30 @@ +package org.multipaz.transit.ui + +import androidx.compose.runtime.Composable +import org.multipaz.transit.payment.SettlementResult + +/** + * The gate stays shut. The reason the reader gave is shown verbatim, since it is the only thing + * that tells the rider (or the station attendant) what to do differently on the next tap. + */ +@Composable +fun SettlementFailureScreen( + failure: SettlementResult.Declined, + amountCents: Long, + destination: Station?, + onNewTransaction: () -> Unit, +) { + val c = TransitTheme.colors + OutcomeScreen( + accent = c.error, + mark = OutcomeMark.CROSS, + headline = "Gate closed", + subline = failure.reason, + details = buildList { + destination?.let { add(OutcomeDetail("To ${it.name}", formatCurrency(amountCents))) } + add(OutcomeDetail("Card", "Not charged", c.ink.copy(alpha = 0.6f))) + }, + actionLabel = "Try again", + onAction = onNewTransaction, + ) +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementSuccessScreen.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementSuccessScreen.kt new file mode 100644 index 00000000..365dd12a --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/SettlementSuccessScreen.kt @@ -0,0 +1,52 @@ +package org.multipaz.transit.ui + +import androidx.compose.runtime.Composable +import org.multipaz.transit.payment.AgeDiscount +import org.multipaz.transit.payment.PaymentCardDetails + +/** + * The gate opens. The rider gets the verdict first and the receipt second: what was proven, + * which card paid, and how much came off it. + */ +@Composable +fun SettlementSuccessScreen( + amountCents: Long, + destination: Station?, + onNewTransaction: () -> Unit, + card: PaymentCardDetails? = null, + age: AgeDiscount = AgeDiscount.None, +) { + val c = TransitTheme.colors + val details = buildList { + // The fare settles on the payment credential alone, so the age row reports what the + // wallet actually returned rather than asserting the threshold the gate asked for. + add( + when { + age == AgeDiscount.Child -> + OutcomeDetail("Child Ticket", "Verified", c.successInk) + age == AgeDiscount.SeniorCitizen -> + OutcomeDetail("Senior Citizen Ticket", "Verified", c.successInk) + else -> OutcomeDetail("Normal Ticket", "Verified", c.ink) + } + ) + add( + OutcomeDetail( + label = card?.maskedAccountReference?.let { "Card $it" } ?: "Payment card", + value = formatCurrency(amountCents), + ) + ) + card?.displayName?.let { add(OutcomeDetail("Rider", it)) } + card?.issuerName?.let { add(OutcomeDetail("Issuer", it)) } + } + OutcomeScreen( + accent = c.success, + mark = OutcomeMark.CHECK, + headline = "Go ahead", + subline = destination + ?.let { "Faregate opening · ${it.platform}" } + ?: "Faregate opening", + details = details, + actionLabel = "Next rider", + onAction = onNewTransaction, + ) +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/StationSelectionScreen.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/StationSelectionScreen.kt new file mode 100644 index 00000000..113ad2e9 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/StationSelectionScreen.kt @@ -0,0 +1,115 @@ +package org.multipaz.transit.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.delay +import org.multipaz.transit.payment.AgeDiscount +import kotlin.time.Duration.Companion.milliseconds + +/** + * The journey simulation between entry and exit. A station can be selected manually; when no + * selection is made within seven seconds, the terminal selects a random destination for the demo. + */ +@Composable +fun StationSelectionScreen( + discount: AgeDiscount, + onStationSelected: (Station) -> Unit, +) { + val stations = getStationList(discount = discount) + var secondsRemaining by remember(discount) { mutableIntStateOf(7) } + var selected by remember(discount) { mutableStateOf(false) } + + fun select(station: Station) { + if (!selected) { + selected = true + onStationSelected(station) + } + } + + LaunchedEffect(discount) { + repeat(7) { + delay(1_000.milliseconds) + secondsRemaining -= 1 + } + select(stations.random()) + } + + val c = TransitTheme.colors + val type = TransitTheme.type + Column(Modifier.fillMaxWidth().padding(start = 24.dp, end = 24.dp, top = 22.dp)) { + Text("Where is the rider travelling?", style = type.display, color = c.ink) + Spacer(Modifier.height(5.dp)) + Text( + "Select a destination, or one will be simulated automatically in $secondsRemaining s.", + style = type.body, + color = c.ink.copy(alpha = 0.55f), + ) + Spacer(Modifier.height(16.dp)) + LazyColumn( + verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = PaddingValues(bottom = 6.dp), + ) { + items(stations, key = { it.name }) { station -> + StationRow(station) { select(station) } + } + } + } +} + +@Composable +private fun StationRow(station: Station, onClick: () -> Unit) { + val c = TransitTheme.colors + val type = TransitTheme.type + val interactions = remember { MutableInteractionSource() } + val pressed by interactions.collectIsPressedAsState() + Row( + Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(13.dp)) + .background(if (pressed) c.tintLow else c.card) + .border( + width = 1.dp, + color = if (pressed) c.primaryBorder else c.border, + shape = RoundedCornerShape(13.dp), + ) + .clickable(interactionSource = interactions, indication = null, onClick = onClick) + .padding(horizontal = 16.dp, vertical = 15.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column(Modifier.weight(1f)) { + Text(station.name, style = type.title, color = c.ink) + Spacer(Modifier.height(3.dp)) + Text(station.detail, style = type.caption, color = c.ink.copy(alpha = 0.45f)) + } + Spacer(Modifier.width(12.dp)) + Text(station.fare, style = type.fare, color = c.primaryInk) + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Stations.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Stations.kt new file mode 100644 index 00000000..8575ce07 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Stations.kt @@ -0,0 +1,64 @@ +package org.multipaz.transit.ui + +import androidx.compose.runtime.Immutable +import org.multipaz.transit.payment.AgeDiscount + +/** + * A destination offered on the faregate. Fares are held in cents so the amount handed to the + * payment settler is the same value the rider saw on the row they tapped. + */ +@Immutable +data class Station( + val name: String, + val line: String, + val zone: String, + val minutes: Int, + val platform: String, + var fareCents: Long, +) { + /** The supporting line under the station name, e.g. "Line 2 · Zone 1 · 6 min". */ + val detail: String get() = "$line · $zone · $minutes min" + + val fare: String get() = formatCurrency(fareCents) +} + +/** The destinations reachable from this faregate. */ +public fun getStationList(discount: AgeDiscount): List { + val multiplier = when (discount) { + AgeDiscount.Child -> 0.67 // 33% discount + AgeDiscount.SeniorCitizen -> 0.5 // 50% discount + AgeDiscount.None -> 1.0 + } + + return listOf( + Station("Central Exchange", "Line 2", "Zone 1", 6, "Platform 2", 275), + Station("Grove Street", "Line 2", "Zone 1", 11, "Platform 2", 275), + Station("Harbor Quay", "Line 4", "Zone 2", 18, "Platform 1", 340), + Station("Utopia North", "Line 2", "Zone 2", 24, "Platform 2", 340), + Station("Airfield Terminal", "Line 7", "Zone 3", 41, "Platform 4", 560), + ).map { + it.copy( + fareCents = (it.fareCents * multiplier).toLong() + ) + } +} + +/** Formats an amount in cents as US currency, e.g. 1234567 -> "$12,345.67". */ +fun formatCurrency(cents: Long): String { + val negative = cents < 0 + val abs = if (negative) -cents else cents + val dollars = abs / 100 + val rem = (abs % 100).toString().padStart(2, '0') + val grouped = groupThousands(dollars.toString()) + return (if (negative) "-$" else "$") + "$grouped.$rem" +} + +private fun groupThousands(digits: String): String { + val sb = StringBuilder() + val n = digits.length + for (i in digits.indices) { + if (i > 0 && (n - i) % 3 == 0) sb.append(',') + sb.append(digits[i]) + } + return sb.toString() +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Theme.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Theme.kt new file mode 100644 index 00000000..0ce2aa84 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/Theme.kt @@ -0,0 +1,181 @@ +package org.multipaz.transit.ui + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Typography +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import org.multipaz.transit.kioskFontFamily + +/** + * The Utopia Transit kiosk palette: warm paper surfaces, a single desaturated teal for + * everything interactive, and a muted green reserved for "the gate is open". + */ +@Immutable +data class TransitColors( + /** Page behind the kiosk surface. */ + val background: Color = Color(0xFFE9E7E2), + /** The kiosk surface itself. */ + val surface: Color = Color(0xFFFAF9F6), + /** Raised rows and cards sitting on [surface]. */ + val card: Color = Color(0xFFFFFFFF), + + /** Primary text. Lighter text is this colour at reduced alpha. */ + val ink: Color = Color(0xFF1C1E1D), + + /** Brand teal: rings, the tap target, the logo mark. */ + val primary: Color = Color(0xFF277676), + /** Deeper teal for numerals and text that has to hold contrast. */ + val primaryInk: Color = Color(0xFF006363), + /** Teal that shows up on a pressed/hovered row border. */ + val primaryBorder: Color = Color(0xFF599291), + + /** Hairline around resting rows and chips. */ + val border: Color = Color(0xFFDCE7E7), + /** Barely-there teal wash for a pressed row. */ + val tintLow: Color = Color(0xFFF4FCFC), + /** Teal wash behind the destination summary. */ + val tint: Color = Color(0xFFEBF6F6), + /** Fill inside the NFC target. */ + val tapFill: Color = Color(0xFFECF8F7), + /** Hairline around the NFC target. */ + val tapBorder: Color = Color(0xFFCEE3E2), + /** Unfilled portion of a progress track. */ + val track: Color = Color(0xFFDDEBEB), + /** The resting (unread) document dot. */ + val dotIdle: Color = Color(0xFFCDDBDA), + + /** Document chip while its credential is being read. */ + val readingBorder: Color = Color(0xFFB4DAD9), + val readingBackground: Color = Color(0xFFE7FAF9), + + /** Gate-open green. */ + val success: Color = Color(0xFF3A8357), + val successInk: Color = Color(0xFF236E44), + val successInkDeep: Color = Color(0xFF1F613C), + val successBorder: Color = Color(0xFFC4E0CC), + val successBackground: Color = Color(0xFFE5FAEB), + + /** Declined / gate-closed red, tuned to the same muted family as the greens. */ + val error: Color = Color(0xFFB54A46), + val errorInk: Color = Color(0xFF932B2A), + val errorBorder: Color = Color(0xFFF7CBC7), + val errorBackground: Color = Color(0xFFFFEFED), +) + +val LocalTransitColors = staticCompositionLocalOf { TransitColors() } + +/** Convenience accessor: `TransitTheme.colors.primary`. */ +object TransitTheme { + val colors: TransitColors + @Composable get() = LocalTransitColors.current +} + +/** + * The kiosk type scale. Sizes mirror the design one-for-one; the face comes from + * [kioskFontFamily], which is Source Sans on any platform that already ships it. + */ +@Immutable +data class TransitTypography( + /** Screen question, e.g. "Where are you going?". */ + val display: TextStyle, + /** Headline over the tap target and the outcome screens. */ + val headline: TextStyle, + /** Station name, and any row that reads as a title. */ + val title: TextStyle, + /** The fare on a station row. */ + val fare: TextStyle, + /** Supporting sentence under a headline. */ + val body: TextStyle, + /** Row labels and values in the summary panels. */ + val bodySmall: TextStyle, + /** Chip labels, the "Change" affordance. */ + val label: TextStyle, + /** Station detail line, brand sub-line. */ + val caption: TextStyle, +) + +val LocalTransitTypography = staticCompositionLocalOf { TransitTypeScheme } + +val TransitTheme.type: TransitTypography + @Composable get() = LocalTransitTypography.current + +private fun transitTypography(family: FontFamily) = TransitTypography( + display = TextStyle( + fontFamily = family, fontWeight = FontWeight.SemiBold, + fontSize = 26.sp, lineHeight = 30.sp, letterSpacing = (-0.5).sp, + ), + headline = TextStyle( + fontFamily = family, fontWeight = FontWeight.SemiBold, + fontSize = 25.sp, lineHeight = 29.sp, letterSpacing = (-0.5).sp, + ), + title = TextStyle( + fontFamily = family, fontWeight = FontWeight.SemiBold, + fontSize = 16.sp, lineHeight = 20.sp, letterSpacing = (-0.16).sp, + ), + fare = TextStyle( + fontFamily = family, fontWeight = FontWeight.SemiBold, + fontSize = 15.sp, lineHeight = 20.sp, + ), + body = TextStyle( + fontFamily = family, fontWeight = FontWeight.Normal, + fontSize = 14.sp, lineHeight = 20.sp, + ), + bodySmall = TextStyle( + fontFamily = family, fontWeight = FontWeight.Normal, + fontSize = 13.sp, lineHeight = 18.sp, + ), + label = TextStyle( + fontFamily = family, fontWeight = FontWeight.SemiBold, + fontSize = 12.sp, lineHeight = 16.sp, + ), + caption = TextStyle( + fontFamily = family, fontWeight = FontWeight.Normal, + fontSize = 11.5.sp, lineHeight = 15.sp, + ), +) + +private val TransitColorScheme = TransitColors() +private val TransitTypeScheme = transitTypography(kioskFontFamily()) + +@Composable +fun TransitTheme(content: @Composable () -> Unit) { + val colors = TransitColorScheme + val materialScheme = lightColorScheme( + primary = colors.primary, + onPrimary = Color.White, + primaryContainer = colors.tint, + onPrimaryContainer = colors.primaryInk, + secondary = colors.primaryBorder, + onSecondary = Color.White, + background = colors.background, + onBackground = colors.ink, + surface = colors.surface, + onSurface = colors.ink, + surfaceVariant = colors.tint, + onSurfaceVariant = colors.ink.copy(alpha = 0.6f), + error = colors.error, + onError = Color.White, + errorContainer = colors.errorBackground, + onErrorContainer = colors.errorInk, + outline = colors.primaryBorder, + outlineVariant = colors.border, + ) + CompositionLocalProvider( + LocalTransitColors provides colors, + LocalTransitTypography provides TransitTypeScheme, + ) { + MaterialTheme( + colorScheme = materialScheme, + typography = Typography(), + content = content, + ) + } +} diff --git a/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/TransitScaffold.kt b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/TransitScaffold.kt new file mode 100644 index 00000000..147aacb2 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonMain/kotlin/org/multipaz/transit/ui/TransitScaffold.kt @@ -0,0 +1,259 @@ +package org.multipaz.transit.ui + +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +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 +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import org.multipaz.transit.Constants +import org.multipaz.transit.payment.AgeDiscount + +/** How far along the two credentials are, which is what tints the document chips. */ +enum class DocPhase { IDLE, READING, DONE, FAILED } + +/** + * The kiosk chrome that every screen sits inside: the faregate identity at the top, the + * destination the rider picked plus the two documents this gate needs, and the gate bar along + * the bottom that slides open once the fare settles. + */ +@Composable +fun TransitScaffold( + destination: Station?, + discount: AgeDiscount, + docPhase: DocPhase, + journeyResumeNotice: String? = null, + onChangeDestination: (() -> Unit)? = null, + modifier: Modifier = Modifier, + content: @Composable ColumnScope.() -> Unit, +) { + val c = TransitTheme.colors + Column(modifier.fillMaxSize().background(c.surface)) { + Header() + destination?.let { + DestinationSummary(destination, discount) + DocumentChips(docPhase, discount) + } + journeyResumeNotice?.let { + JourneyResumeNotice(journeyResumeNotice) + } + Column( + Modifier.weight(1f).fillMaxWidth(), + content = content, + ) + GateBar(open = docPhase == DocPhase.DONE) + } +} + +/** Briefly explains why an already selected destination has been restored instead of reselected. */ +@Composable +private fun JourneyResumeNotice(message: String) { + val c = TransitTheme.colors + val type = TransitTheme.type + Text( + text = message, + modifier = Modifier + .fillMaxWidth() + .padding(start = 24.dp, end = 24.dp, top = 12.dp) + .clip(RoundedCornerShape(10.dp)) + .background(c.tint) + .padding(horizontal = 14.dp, vertical = 10.dp), + style = type.bodySmall, + color = c.primaryInk, + ) +} + +@Composable +private fun Header() { + val c = TransitTheme.colors + val type = TransitTheme.type + Row( + Modifier.fillMaxWidth().padding(start = 24.dp, end = 24.dp, top = 16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Box( + Modifier.size(22.dp).border(2.5.dp, c.primary, CircleShape) + ) + Spacer(Modifier.width(9.dp)) + Column { + Text( + Constants.TRANSIT_AUTHORITY, + style = type.bodySmall.copy(fontWeight = FontWeight.SemiBold), + color = c.ink, + ) + Text( + "${Constants.TERMINAL_STATION} · ${Constants.TERMINAL_GATE}", + style = type.caption, + color = c.ink.copy(alpha = 0.45f), + ) + } + } + } +} + +/** "To Harbor Quay — $3.40": what the rider is about to be charged, kept in view the whole way. */ +@Composable +private fun DestinationSummary(destination: Station, discount: AgeDiscount) { + val c = TransitTheme.colors + val type = TransitTheme.type + Row( + Modifier + .fillMaxWidth() + .padding(start = 24.dp, end = 24.dp, top = 16.dp) + .clip(RoundedCornerShape(12.dp)) + .background(c.tint) + .padding(horizontal = 15.dp, vertical = 11.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + "Exit at ${destination.name}", + style = type.bodySmall, + color = c.ink.copy(alpha = 0.6f) + ) + Text(destination.fare, style = type.fare, color = c.primaryInk) + } +} + +/** + * The two credentials this gate reads in a single tap. They light up together because that is + * exactly what happens: one presentment carries both the age attestation and the payment card. + */ +@Composable +private fun DocumentChips(phase: DocPhase, discount: AgeDiscount) { + Row( + Modifier.fillMaxWidth().padding(start = 24.dp, end = 24.dp, top = 14.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + DocumentChip(Modifier.weight(1f), phase, fareClassLabel(discount), round = true) + DocumentChip(Modifier.weight(1f), phase, "Payment card", round = false) + } +} + +private fun fareClassLabel(discount: AgeDiscount): String = when (discount) { + AgeDiscount.Child -> "Child fare · 33% discount" + AgeDiscount.SeniorCitizen -> "Senior fare · 50% discount" + AgeDiscount.None -> "Normal fare" +} + +@Composable +private fun DocumentChip( + modifier: Modifier, + phase: DocPhase, + label: String, + round: Boolean, +) { + val c = TransitTheme.colors + val type = TransitTheme.type + val spec = tween(durationMillis = 250) + val border by animateColorAsState( + when (phase) { + DocPhase.DONE -> c.successBorder + DocPhase.READING -> c.readingBorder + DocPhase.FAILED -> c.errorBorder + DocPhase.IDLE -> c.border + }, + spec, + ) + val background by animateColorAsState( + when (phase) { + DocPhase.DONE -> c.successBackground + DocPhase.READING -> c.readingBackground + DocPhase.FAILED -> c.errorBackground + DocPhase.IDLE -> c.card + }, + spec, + ) + val mark by animateColorAsState( + when (phase) { + DocPhase.DONE -> c.success + DocPhase.READING -> c.primary + DocPhase.FAILED -> c.error + DocPhase.IDLE -> c.dotIdle + }, + spec, + ) + val ink by animateColorAsState( + when (phase) { + DocPhase.DONE -> c.successInkDeep + DocPhase.READING -> c.primaryInk + DocPhase.FAILED -> c.errorInk + DocPhase.IDLE -> c.ink.copy(alpha = 0.45f) + }, + spec, + ) + Row( + modifier + .clip(RoundedCornerShape(10.dp)) + .background(background) + .border(1.dp, border, RoundedCornerShape(10.dp)) + .padding(horizontal = 12.dp, vertical = 9.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + // An age attestation reads as a seal; a payment card reads as a card. + Box( + Modifier + .size(width = 14.dp, height = if (round) 14.dp else 10.dp) + .clip(if (round) CircleShape else RoundedCornerShape(2.dp)) + .background(mark) + ) + Spacer(Modifier.width(8.dp)) + Text(label, style = type.label, color = ink) + } +} + +/** + * The gate itself, drawn as a bar across the foot of the screen: solid while the gate is shut, + * sliding out of the way once the fare has settled. + */ +@Composable +private fun GateBar(open: Boolean) { + val c = TransitTheme.colors + val closed by animateFloatAsState( + targetValue = if (open) 0f else 1f, + animationSpec = tween(durationMillis = if (open) 900 else 0), + label = "gate", + ) + Box( + Modifier + .fillMaxWidth() + .padding(start = 24.dp, end = 24.dp, top = 14.dp, bottom = 22.dp) + .height(4.dp) + .clip(RoundedCornerShape(3.dp)) + .background(c.track), + ) { + if (closed > 0f) { + Box( + Modifier + .fillMaxHeight() + .fillMaxWidth(closed) + .background(c.success) + ) + } + } +} diff --git a/MultipazTransitTerminal/shared/src/commonTest/kotlin/org/multipaz/transit/SharedCommonTest.kt b/MultipazTransitTerminal/shared/src/commonTest/kotlin/org/multipaz/transit/SharedCommonTest.kt new file mode 100644 index 00000000..14c8c550 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/commonTest/kotlin/org/multipaz/transit/SharedCommonTest.kt @@ -0,0 +1,12 @@ +package org.multipaz.transit + +import kotlin.test.Test +import kotlin.test.assertEquals + +class SharedCommonTest { + + @Test + fun example() { + assertEquals(3, 1 + 2) + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/MainViewController.kt b/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/MainViewController.kt new file mode 100644 index 00000000..3731d5be --- /dev/null +++ b/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/MainViewController.kt @@ -0,0 +1,5 @@ +package org.multipaz.transit + +import androidx.compose.ui.window.ComposeUIViewController + +fun MainViewController() = ComposeUIViewController { App() } \ No newline at end of file diff --git a/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/Platform.ios.kt b/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/Platform.ios.kt new file mode 100644 index 00000000..4df9cf30 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/iosMain/kotlin/org/multipaz/transit/Platform.ios.kt @@ -0,0 +1,14 @@ +package org.multipaz.transit + +import androidx.compose.ui.text.font.FontFamily +import io.ktor.client.engine.HttpClientEngineFactory +import io.ktor.client.engine.darwin.Darwin + +actual object Platform { + actual val httpClientEngineFactory: HttpClientEngineFactory<*> by lazy { + Darwin + } +} + +/** iOS ships no humanist sans, so the kiosk uses the system face (San Francisco). */ +actual fun kioskFontFamily(): FontFamily = FontFamily.SansSerif diff --git a/MultipazTransitTerminal/shared/src/iosTest/kotlin/org/multipaz/transit/SharedLogicIOSTest.kt b/MultipazTransitTerminal/shared/src/iosTest/kotlin/org/multipaz/transit/SharedLogicIOSTest.kt new file mode 100644 index 00000000..8482cd61 --- /dev/null +++ b/MultipazTransitTerminal/shared/src/iosTest/kotlin/org/multipaz/transit/SharedLogicIOSTest.kt @@ -0,0 +1,12 @@ +package org.multipaz.transit + +import kotlin.test.Test +import kotlin.test.assertEquals + +class SharedLogicIOSTest { + + @Test + fun example() { + assertEquals(3, 1 + 2) + } +} \ No newline at end of file diff --git a/MultipazTransitTerminal/transitBackend/.gitignore b/MultipazTransitTerminal/transitBackend/.gitignore new file mode 100644 index 00000000..5d981278 --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/.gitignore @@ -0,0 +1,2 @@ +/build +environment/db/* \ No newline at end of file diff --git a/MultipazTransitTerminal/transitBackend/Dockerfile b/MultipazTransitTerminal/transitBackend/Dockerfile new file mode 100644 index 00000000..62e6f7c7 --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/Dockerfile @@ -0,0 +1,20 @@ +# Build the backend JAR first: +# ./gradlew :transitBackend:buildFatJar +# +# The Docker build context is this transitBackend directory, so the prebuilt JAR +# is available at build/libs/. +FROM eclipse-temurin:17-jre-jammy + +# Keep the UID/GID stable so the host-mounted SQLite data directory can be +# owned by the non-root runtime user. +RUN groupadd --system --gid 10001 multipaz \ + && useradd --system --uid 10001 --gid multipaz multipaz + +WORKDIR /app +COPY build/libs/*-all.jar /app/transit-terminal.jar + +USER multipaz + +EXPOSE 8011 + +ENTRYPOINT ["java", "-jar", "/app/transit-terminal.jar"] diff --git a/MultipazTransitTerminal/transitBackend/build.gradle.kts b/MultipazTransitTerminal/transitBackend/build.gradle.kts new file mode 100644 index 00000000..19b422d3 --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/build.gradle.kts @@ -0,0 +1,66 @@ +plugins { + id("java-library") + alias(libs.plugins.kotlinJvm) + alias(libs.plugins.kotlinSerialization) + alias(libs.plugins.ksp) + alias(libs.plugins.ktor) +} + +val dockerImage = providers.gradleProperty("dockerImage") + .orElse("multipaz-transit-terminal") +val dockerImageTag = providers.gradleProperty("imageTag") + .orElse("dev") + +tasks.register("buildDockerImageAmd64") { + group = "distribution" + description = "Builds the Transit terminal backend fat JAR and loads a linux/amd64 Docker image locally." + dependsOn("buildFatJar") + workingDir = projectDir + commandLine( + "docker", "build", + "--platform", "linux/amd64", + "--tag", "${dockerImage.get()}:${dockerImageTag.get()}", + ".", + ) + outputs.upToDateWhen { false } +} + +application { + mainClass.set("org.multipaz.transit.backend.Main") +} + +kotlin { + jvmToolchain(17) + + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +dependencies { + ksp(libs.multipaz.cbor.rpc) + implementation(libs.multipaz) + + implementation(libs.multipaz.server) + + implementation(libs.kotlinx.serialization.json) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.io.bytestring) + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.java) + implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.double.receive) + implementation(libs.logback.classic) + + testImplementation(libs.junit) + testImplementation(libs.kotlinx.coroutines.test) +} + +ktor { +} diff --git a/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/BackendJourneyService.kt b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/BackendJourneyService.kt new file mode 100644 index 00000000..c1b0645a --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/BackendJourneyService.kt @@ -0,0 +1,53 @@ +package org.multipaz.transit.backend + +import org.multipaz.cbor.annotation.CborSerializable +import org.multipaz.rpc.annotation.RpcInterface +import org.multipaz.rpc.annotation.RpcMethod + +/** + * Backend-local RPC contract and storage record. + * + * Its CBOR field names intentionally match the client [org.multipaz.transit.journey.Journey] + * contract, allowing the Android/iOS app to decode the response without the backend depending on + * the multiplatform UI module. + */ +@CborSerializable +data class StoredJourney( + val entryStation: String, + val exitStation: String? = null, + val fareCents: Long? = null, + val fareClass: String, + val state: String, +) { + companion object +} + +/** Backend-local counterpart of the shared journey RPC contract. */ +@RpcInterface +interface BackendJourneyService { + /** Creates an open journey or returns one for this app installation and presentation. */ + @RpcMethod(endpoint = "checkIn") + suspend fun checkIn( + paymentInstrumentId: String, + deviceInstanceId: String, + entryStation: String, + fareClass: String, + ): StoredJourney + + /** Stores the selected destination and calculated fare. */ + @RpcMethod(endpoint = "selectExit") + suspend fun selectExit( + paymentInstrumentId: String, + deviceInstanceId: String, + exitStation: String, + fareCents: Long, + ): StoredJourney + + /** Records that exit payment processing has started. */ + @RpcMethod(endpoint = "beginCheckout") + suspend fun beginCheckout(paymentInstrumentId: String, deviceInstanceId: String): StoredJourney + + /** Records that exit payment processing completed. */ + @RpcMethod(endpoint = "settle") + suspend fun settle(paymentInstrumentId: String, deviceInstanceId: String): StoredJourney +} \ No newline at end of file diff --git a/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/Main.kt b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/Main.kt new file mode 100644 index 00000000..182baa8a --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/Main.kt @@ -0,0 +1,67 @@ +package org.multipaz.transit.backend + +import io.ktor.server.application.Application +import io.ktor.server.response.respondText +import io.ktor.server.routing.get +import io.ktor.server.routing.routing +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import org.multipaz.rpc.handler.HttpHandler +import org.multipaz.rpc.handler.RpcDispatcherLocal +import org.multipaz.rpc.handler.RpcExceptionMap +import org.multipaz.rpc.handler.RpcPoll +import org.multipaz.rpc.handler.SimpleCipher +import org.multipaz.rpc.server.ClientCheckImpl +import org.multipaz.rpc.server.ClientRegistrationImpl +import org.multipaz.rpc.server.register +import org.multipaz.server.common.ServerEnvironment +import org.multipaz.server.common.runServer +import org.multipaz.server.request.rpc + +/** + * Merchant backend for MultipazTransitTerminal. + * + * Run with: `./gradlew :transitBackend:run`. + * + * The RPC endpoint requires **device attestation**: `ServerEnvironment` registers + * `RpcAuthInspectorAssertion.Default`, and [TerminalPaymentProcessor] mixes it in via + * `RpcAuthBackendDelegate`. `ClientRegistrationImpl` performs the one-time attestation check against + * `client_requirements`; `ClientCheckImpl` handles the freshness ping. + */ +class Main { + companion object { + @JvmStatic + fun main(args: Array) { + runServer( + args = args, + needAdminPassword = true, + ) { serverEnvironment -> + configureRouting(serverEnvironment) + } + } + } +} + +fun Application.configureRouting(serverEnvironment: Deferred) { + val httpHandler = CoroutineScope(Dispatchers.Default).async { + val env = serverEnvironment.await() + val dispatcherBuilder = RpcDispatcherLocal.Builder() + ClientRegistrationImpl.register(dispatcherBuilder) + ClientCheckImpl.register(dispatcherBuilder) + TerminalPaymentProcessor.register(dispatcherBuilder) + TerminalJourneyService.register(dispatcherBuilder) + val rpcPoll = env.getInterface(RpcPoll::class)!! + val localDispatcher = dispatcherBuilder.build( + env, + env.getInterface(SimpleCipher::class)!!, + RpcExceptionMap.Builder().build(), + ) + HttpHandler(localDispatcher, rpcPoll) + } + routing { + get("/") { call.respondText("MultipazTransitTerminal backend is running") } + rpc("/rpc", httpHandler) + } +} diff --git a/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalJourneyService.kt b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalJourneyService.kt new file mode 100644 index 00000000..32a53edf --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalJourneyService.kt @@ -0,0 +1,199 @@ +package org.multipaz.transit.backend + +import kotlinx.io.bytestring.ByteString +import org.multipaz.cbor.annotation.CborSerializable +import org.multipaz.rpc.annotation.RpcState +import org.multipaz.rpc.backend.BackendEnvironment +import org.multipaz.rpc.backend.RpcAuthBackendDelegate +import org.multipaz.rpc.handler.InvalidRequestException +import org.multipaz.rpc.handler.RpcAuthInspector +import org.multipaz.storage.KeyExistsStorageException +import org.multipaz.storage.Storage +import org.multipaz.storage.StorageTable +import org.multipaz.storage.StorageTableSpec +import org.multipaz.util.toBase64Url +import java.security.MessageDigest +import kotlin.time.Clock +import kotlin.time.Duration.Companion.hours + +/** Multipaz table definition. Expiration removes abandoned journeys without a separate cleanup job. */ +private val JourneyTableSpec = StorageTableSpec( + name = "TransitJourneys", + supportPartitions = false, + supportExpiration = true, + schemaVersion = 1, +) + +/** Maximum time a rider may retain an uncompleted journey. */ +private val OPEN_JOURNEY_LIFETIME = 4.hours + +/** Retention period for a settled journey, allowing a receipt to be recovered briefly. */ +private val SETTLED_JOURNEY_LIFETIME = 24.hours.times(7) + +/** States persisted in [StoredJourney.state]. */ +enum class JourneyStates { + OPEN, + READY_FOR_CHECKOUT, + PAYMENT_PENDING, + SETTLED, +} + +/** + * Persistent journey mapping keyed by a one-way digest of the payment instrument and app + * installation identifiers. This permits one active journey per credential per device. + * + * Each method is guarded by device attestation. Expected domain failures use + * [InvalidRequestException], which Multipaz serializes back to the app + */ +@RpcState(endpoint = "journeys", creatable = true) +@CborSerializable +class TerminalJourneyService : BackendJourneyService, RpcAuthInspector by RpcAuthBackendDelegate { + + /** Resolves the backend-owned table; the server environment supplies JDBC-backed storage. */ + private suspend fun storageTable(): StorageTable = + BackendEnvironment.getInterface(Storage::class)!! + .getTable(JourneyTableSpec) + + /** Derives the storage key without persisting raw credential or device identifiers. */ + private fun parseReaderKey(paymentInstrumentId: String, deviceInstanceId: String): String = + MessageDigest.getInstance("SHA-256") + .digest("$paymentInstrumentId:$deviceInstanceId".encodeToByteArray()) + .toBase64Url() + + override suspend fun checkIn( + paymentInstrumentId: String, + deviceInstanceId: String, + entryStation: String, + fareClass: String, + ): StoredJourney { + if (paymentInstrumentId.isBlank() || deviceInstanceId.isBlank()) { + throw InvalidRequestException("Payment instrument id and device instance id are required") + } + + val journeys = storageTable() + val key = parseReaderKey(paymentInstrumentId, deviceInstanceId) + val existingJourney = journeys.get(key)?.let { StoredJourney.fromCbor(it.toByteArray()) } + + if (existingJourney != null) { + return when (existingJourney.state) { + JourneyStates.OPEN.name, + JourneyStates.READY_FOR_CHECKOUT.name -> existingJourney + + JourneyStates.PAYMENT_PENDING.name -> throw InvalidRequestException( + "Journey payment is already in progress; complete or recover that payment first" + ) + + JourneyStates.SETTLED.name -> StoredJourney( + entryStation = entryStation, + fareClass = fareClass, + state = JourneyStates.OPEN.name, + ).also { journey -> + journeys.update( + key = key, + data = ByteString(journey.toCbor()), + expiration = Clock.System.now() + OPEN_JOURNEY_LIFETIME, + ) + } + + else -> throw InvalidRequestException( + "Journey has an unsupported state: ${existingJourney.state}" + ) + } + } + + val journey = StoredJourney( + entryStation = entryStation, + fareClass = fareClass, + state = JourneyStates.OPEN.name, + ) + + try { + journeys.insert( + key = key, + data = ByteString(journey.toCbor()), + expiration = Clock.System.now() + OPEN_JOURNEY_LIFETIME, + ) + } catch (e: KeyExistsStorageException) { + // A concurrent gate created it after the read above. Return its current record, + // giving the caller the same resume behavior as the normal existing-journey path. + return journeys.get(key)?.let { StoredJourney.fromCbor(it.toByteArray()) } + ?: throw InvalidRequestException(e.message ?: "Could not create or resume journey") + } + return journey + } + + override suspend fun selectExit( + paymentInstrumentId: String, + deviceInstanceId: String, + exitStation: String, + fareCents: Long, + ): StoredJourney = updateJourney( + paymentInstrumentId, + deviceInstanceId, + JourneyStates.OPEN.name, + ) { journey -> + if (fareCents < 0) { + throw InvalidRequestException("Fare cannot be negative") + } + journey.copy( + exitStation = exitStation, + fareCents = fareCents, + state = JourneyStates.READY_FOR_CHECKOUT.name, + ) + } + + override suspend fun beginCheckout(paymentInstrumentId: String, deviceInstanceId: String): StoredJourney = + updateJourney( + paymentInstrumentId, + deviceInstanceId, + JourneyStates.READY_FOR_CHECKOUT.name + ) { journey -> + journey.copy( + state = JourneyStates.PAYMENT_PENDING.name + ) + } + + override suspend fun settle(paymentInstrumentId: String, deviceInstanceId: String): StoredJourney = + updateJourney( + paymentInstrumentId, + deviceInstanceId, + JourneyStates.PAYMENT_PENDING.name, + SETTLED_JOURNEY_LIFETIME + ) { journey -> + journey.copy(state = JourneyStates.SETTLED.name) + } + + /** + * Loads a journey, verifies its expected lifecycle state, transforms it, and refreshes its + * retention deadline. Invalid state transitions are returned to the client as RPC errors. + */ + private suspend fun updateJourney( + paymentInstrumentId: String, + deviceInstanceId: String, + expectedState: String, + expiration: kotlin.time.Duration = OPEN_JOURNEY_LIFETIME, + transform: (StoredJourney) -> StoredJourney, + ): StoredJourney { + if (paymentInstrumentId.isBlank() || deviceInstanceId.isBlank()) { + throw InvalidRequestException("Payment instrument id and device instance id are required") + } + val key = parseReaderKey(paymentInstrumentId, deviceInstanceId) + val journeys = storageTable() + val current = journeys.get(key)?.let { StoredJourney.fromCbor(it.toByteArray()) } + ?: throw InvalidRequestException("No active journey for this payment instrument") + if (current.state != expectedState) { + throw InvalidRequestException( + "Journey is ${current.state}; expected $expectedState" + ) + } + return transform(current).also { updated -> + journeys.update( + key, + ByteString(updated.toCbor()), + expiration = Clock.System.now() + expiration + ) + } + } + + companion object +} diff --git a/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalPaymentProcessor.kt b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalPaymentProcessor.kt new file mode 100644 index 00000000..c3b50f98 --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/src/main/java/org/multipaz/transit/backend/TerminalPaymentProcessor.kt @@ -0,0 +1,65 @@ +package org.multipaz.transit.backend + +import kotlinx.coroutines.withContext +import org.multipaz.cbor.annotation.CborSerializable +import org.multipaz.rpc.annotation.RpcState +import org.multipaz.rpc.backend.BackendEnvironment +import org.multipaz.rpc.backend.Configuration +import org.multipaz.rpc.backend.RpcAuthBackendDelegate +import org.multipaz.rpc.client.RpcAuthorizedServerClient +import org.multipaz.rpc.handler.RpcAuthClientSession +import org.multipaz.rpc.handler.RpcAuthInspector +import org.multipaz.rpc.handler.RpcExceptionMap +import org.multipaz.rpc.handler.RpcNotifier +import org.multipaz.server.common.getBaseUrl +import org.multipaz.server.enrollment.ServerIdentity +import org.multipaz.server.enrollment.getServerIdentity +import org.multipaz.server.payment.PaymentProcessor +import org.multipaz.server.payment.PaymentProcessorStub +import org.multipaz.server.payment.PaymentTransactionData +import org.multipaz.server.payment.PaymentTransactionRequest +import org.multipaz.verification.PresentmentRecord + +/** + * The merchant terminal's backend front door. It implements the same [PaymentProcessor] RPC the + * records server (SoR) exposes, but guards it with **device attestation** — `RpcAuthInspector by + * RpcAuthBackendDelegate` resolves to the environment's `RpcAuthInspectorAssertion`, so every call + * must come from an app instance that registered a valid [org.multipaz.device.DeviceAttestation] + * matching this server's `client_requirements` (the POS app's signing-cert digest + package). + * + * On a valid call it forwards to the SoR's `PaymentProcessor`, signing with the terminal's + * `PAYMENT_PROCESSOR` key ([getServerIdentity]) — the key that used to live in the app now lives + * only here. This is the wallet's app→backend→server split: the app proves it's genuine, the backend + * holds the money-moving key. + */ +@RpcState( + endpoint = "pos", + creatable = true +) +@CborSerializable +class TerminalPaymentProcessor: PaymentProcessor, RpcAuthInspector by RpcAuthBackendDelegate { + override suspend fun createTransaction( + request: PaymentTransactionRequest + ): PaymentTransactionData = withRecordsProcessor { it.createTransaction(request) } + + override suspend fun commitTransaction( + presentmentRecord: PresentmentRecord + ): String = withRecordsProcessor { it.commitTransaction(presentmentRecord) } + + private suspend fun withRecordsProcessor(block: suspend (PaymentProcessor) -> T): T { + val configuration = BackendEnvironment.getInterface(Configuration::class)!! + val recordsUrl = configuration.getValue("records_server_url") + ?: throw IllegalStateException("'records_server_url' is not configured") + val dispatcher = RpcAuthorizedServerClient.connect( + exceptionMap = RpcExceptionMap.Builder().build(), + rpcEndpointUrl = "$recordsUrl/rpc", + callingServerUrl = BackendEnvironment.getBaseUrl(), + signingKey = getServerIdentity(ServerIdentity.PAYMENT_PROCESSOR), + ) + return withContext(RpcAuthClientSession()) { + block(PaymentProcessorStub("payment", dispatcher, RpcNotifier.SILENT)) + } + } + + companion object +} diff --git a/MultipazTransitTerminal/transitBackend/src/main/resources/resources/default_configuration.json b/MultipazTransitTerminal/transitBackend/src/main/resources/resources/default_configuration.json new file mode 100644 index 00000000..f680d1d1 --- /dev/null +++ b/MultipazTransitTerminal/transitBackend/src/main/resources/resources/default_configuration.json @@ -0,0 +1,32 @@ +{ + "server_port": 8011, + "database_engine": "jdbc", + "admin_password": "multipaz", + "records_server_url": "https://utopia.multipaz.org/registry", + "client_requirements": { + "android": { + "gms_attestation": false, + "verified_boot_green": false, + "keystore_security_level": "software", + "app_signature_certificate_digests": [ + "E3:41:87:7A:41:BD:70:23:81:3E:F2:60:A2:1F:81:0D:C8:BF:53:13:98:CB:16:17:5E:75:5B:97:8C:A6:A1:EF" + ], + "app_packages": [ + "org.multipaz.transit" + ] + } + }, + "server_identities": { + "payment_processor": { + "kty": "EC", + "crv": "P-256", + "d": "IqO7LT38dvq64Nz7OGfZXFDAmD-n5qIg0JXf6MDRUIM", + "x": "80qy3tYlMDy5T0k6ADVqcnRIlTFM2Gtb7Mq72pcRHjY", + "y": "jlgW9XBUA3-czFyIfwWidfH2gYpU1VBeezakh9b0v0U", + "x5c": [ + "MIICSDCCAe6gAwIBAgIRAJE36gvLp1Mq0rCQvdkGK0YwCgYIKoZIzj0EAwIwQzELMAkGA1UEBgwCVVMxNDAyBgNVBAMMK1V0b3BpYSBXaG9sZXNhbGUgUE9TIFBheW1lbnQgUHJvY2Vzc29yIFJvb3QwHhcNMjYwOTE0MTY0ODQ1WhcNMzYwOTE0MTY0ODQ1WjA7MQswCQYDVQQGDAJVUzEsMCoGA1UEAwwjTXVsdGlwYXogVXRvcGlhIFRyYW5zaXQgVGVybWluYWwgMDEwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATzSrLe1iUwPLlPSToANWpydEiVMUzYa1vsyrvalxEeNo5YFvVwVAN/nMxciH8FonXx9oGKVNVQXns2pIfW9L9Fo4HKMIHHMB8GA1UdIwQYMBaAFDdMACOK5ilwaubo7HZbSyHC5Yj+MA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUBAf8ECzAJBgcogYxdBQECMCAGA1UdEgQZMBeGFWh0dHA6Ly9sb2NhbGhvc3Q6ODAwNDA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vbG9jYWxob3N0OjgwMDQvY3JsL3BheW1lbnRfcHJvY2Vzc29yMB0GA1UdDgQWBBRqQQrV0SzWqnTT+4p+FtiEHHlpvjAKBggqhkjOPQQDAgNIADBFAiEAtLt2+Vzl+icX4b83+YGYI+0fEk5YuyszR6ze2rcpkLACIDQG9ZOF9IQvFOYmem7MVe87t4rkc7MPMibF71CsGPfJ", + "MIICTDCCAfKgAwIBAgIQYyUBB3RwBoVrKgA3k2j80zAKBggqhkjOPQQDAjBDMQswCQYDVQQGDAJVUzE0MDIGA1UEAwwrVXRvcGlhIFdob2xlc2FsZSBQT1MgUGF5bWVudCBQcm9jZXNzb3IgUm9vdDAeFw0yNjA4MjUxMTUwNDZaFw0zNjA4MjUxMTUwNDZaMEMxCzAJBgNVBAYMAlVTMTQwMgYDVQQDDCtVdG9waWEgV2hvbGVzYWxlIFBPUyBQYXltZW50IFByb2Nlc3NvciBSb290MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKvcWEUrHYOzfTHjTJIEw7zhBDZLGmrOR9Eqy6kBdwBX2LY4oCZwOAYEwZz04IgbbY2VVCv30xYjed0/5iUGHtaOBxzCBxDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAgBgNVHRIEGTAXhhVodHRwOi8vbG9jYWxob3N0OjgwMDQwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2xvY2FsaG9zdDo4MDA0L2NybC9wYXltZW50X3Byb2Nlc3NvcjAdBgNVHQ4EFgQUN0wAI4rmKXBq5ujsdltLIcLliP4wHwYDVR0jBBgwFoAUN0wAI4rmKXBq5ujsdltLIcLliP4wCgYIKoZIzj0EAwIDSAAwRQIgCv69wBSYmNX0LRhJEPe0tGv3hok9kyX2mUEK66Pft0oCIQC2o2CnhcfXWZ5KJTzKDjLejUfG2HFVBdysNP0RsQ6BiQ==" + ] + } + } +} diff --git a/MultipazWholesalePOS/README.md b/MultipazWholesalePOS/README.md index 674be14c..03bd0ae5 100644 --- a/MultipazWholesalePOS/README.md +++ b/MultipazWholesalePOS/README.md @@ -134,7 +134,7 @@ cd /path/to/multipaz-utopia ./gradlew run ``` -- SoR link in this case directly (matches the backend's committed default of `http://localhost:8004`) +- Override the backend's committed Utopia Registry default when running a local direct Registry. **Docker Utopia stack:** @@ -161,6 +161,10 @@ itself: No arguments needed for the direct-Registry path — everything (including `pp-leaf`) is in its baked `default_configuration.json`. It listens on **:8110**. +The Android app defaults to its public terminal URL, +`https://utopia.multipaz.org/pos-terminal/rpc`. For local `adb reverse` +development, temporarily switch `DEFAULT_TERMINAL_URL` to `http://localhost:8110/rpc`. + ### Step 3 — build, install, and bridge the port ``` @@ -196,7 +200,7 @@ Open the Registry front-end and drill into the merchant identity ("Utopia Wholes "server_port": 8110, "database_engine": "ephemeral", // no db file; re-registers clients each run "admin_password": "multipaz", - "records_server_url": "http://localhost:8004", // the SoR; override via -param for Docker + "records_server_url": "https://utopia.multipaz.org/registry", // deployed Utopia SoR; override locally "client_requirements": { // GATE 1 — who may call this backend "android": { "gms_attestation": false, // no Play Integrity (dev) @@ -210,17 +214,46 @@ Open the Registry front-end and drill into the merchant identity ("Utopia Wholes } ``` -Get your APK's signing digest (debug builds use `~/.android/debug.keystore`): +### Android app signing + +Both terminal apps use one shared Android signing key for **debug and release** builds. Gradle reads +the key and its configuration from the repository-level `keys/` directory: +```text +keys/keystore.jks +keys/keystore.properties ``` -keytool -list -v -keystore ~/.android/debug.keystore -storepass android | grep SHA256 + +`keystore.properties` contains the signing configuration: + +```properties +storePassword=... +keyAlias=... +keyPassword=... ``` +The key files are ignored by Git and must not be committed. The POS backend is pinned to this +certificate's SHA-256 digest in `client_requirements`: + +```text +E3:41:87:7A:41:BD:70:23:81:3E:F2:60:A2:1F:81:0D:C8:BF:53:13:98:CB:16:17:5E:75:5B:97:8C:A6:A1:EF +``` + +Verify the local certificate from the repository root: + +```bash +keytool -list -v -keystore keys/keystore.jks -alias "$(sed -n 's/^keyAlias=//p' keys/keystore.properties)" | grep SHA256 +``` + +If the keystore or package name changes, update +`client_requirements.android.app_signature_certificate_digests` and `app_packages` in the terminal +backend configuration, otherwise app attestation will fail. + ### App (`shared/…/Constants.kt`) -- `DEFAULT_TERMINAL_URL = http://localhost:8110/rpc` — the terminal backend (via `adb reverse`). - A commented-out `trycloudflare.com` URL is kept alongside it for tunnelling to a non-local - backend. +- `DEFAULT_TERMINAL_URL = https://utopia.multipaz.org/pos-terminal/rpc` — the deployed terminal + backend. For local development via `adb reverse`, temporarily change it to + `http://localhost:8110/rpc`. - `DEFAULT_PAYEE_ACCOUNT = 20000001` — the merchant account sent in `createTransaction`. - `TERMINAL_PAYEE_NAME` / `TERMINAL_PAYEE_ID` / `TERMINAL_CURRENCY` — what goes into the device-signed `transaction_data` payee and currency. @@ -250,6 +283,30 @@ What is *already* production-shaped: the app holds no key and is verified by att payment key is server-side; settlement is card-bound and authoritative on the SoR; the mdoc issuer + device signatures are verified. +## CI release APKs + +GitHub Actions runs [Build terminal apps](../.github/workflows/build-terminal-apps.yml) manually or +when changes are pushed to `main`. It builds only the signed release APK: + +```bash +./gradlew :androidApp:assembleRelease +``` + +The workflow restores the shared signing files from two repository secrets: + +- `ANDROID_KEYSTORE_B64` — Base64-encoded `keys/keystore.jks`. +- `ANDROID_KEYSTORE_PROPERTIES_B64` — Base64-encoded `keys/keystore.properties`. + +Create both secret values as single lines from the repository root: + +```bash +base64 -w 0 keys/keystore.jks +base64 -w 0 keys/keystore.properties +``` + +On macOS, use `base64 -i | tr -d '\n'` instead. The workflow uploads the result as the +`multipaz-wholesale-pos` artifact. + --- ## Troubleshooting diff --git a/MultipazWholesalePOS/androidApp/build.gradle.kts b/MultipazWholesalePOS/androidApp/build.gradle.kts index 2b1bacf9..6475e3d4 100644 --- a/MultipazWholesalePOS/androidApp/build.gradle.kts +++ b/MultipazWholesalePOS/androidApp/build.gradle.kts @@ -1,4 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import java.io.FileInputStream +import java.util.Properties plugins { alias(libs.plugins.androidApplication) @@ -26,6 +28,14 @@ dependencies { debugImplementation(libs.compose.uiTooling) } +val releaseVersionCode = providers.gradleProperty("releaseVersionCode").orNull?.toIntOrNull() ?: 1 +val sourceRevision = providers.exec { + commandLine("git", "rev-parse", "--short=7", "HEAD") +}.standardOutput.asText.map { it.trim() } +val releaseVersionName = providers.gradleProperty("releaseVersionName") + .orElse(sourceRevision) + .getOrElse("dev") + android { namespace = "org.multipaz.pos" compileSdk = libs.versions.android.compileSdk.get().toInt() @@ -34,14 +44,26 @@ android { applicationId = "org.multipaz.pos" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() - versionCode = 1 - versionName = "1.0" + versionCode = releaseVersionCode + versionName = releaseVersionName } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } + signingConfigs { + val keystorePropertiesFile = rootProject.file("../keys/keystore.properties") + val keystoreProperties = Properties().apply { + load(FileInputStream(keystorePropertiesFile)) + } + create("signing") { + storeFile = file("$rootDir/../keys/keystore.jks") + storePassword = keystoreProperties["storePassword"] as String + keyAlias = keystoreProperties["keyAlias"] as String + keyPassword = keystoreProperties["keyPassword"] as String + } + } buildTypes { release { isMinifyEnabled = false @@ -49,6 +71,10 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + signingConfig = signingConfigs["signing"] + } + debug { + signingConfig = signingConfigs["signing"] } } compileOptions { @@ -58,4 +84,4 @@ android { buildFeatures { compose = true } -} \ No newline at end of file +} diff --git a/MultipazWholesalePOS/build.gradle.kts b/MultipazWholesalePOS/build.gradle.kts index 4e97e89f..6d3b9c37 100644 --- a/MultipazWholesalePOS/build.gradle.kts +++ b/MultipazWholesalePOS/build.gradle.kts @@ -7,7 +7,10 @@ plugins { alias(libs.plugins.composeCompiler) apply false alias(libs.plugins.kotlinMultiplatform) apply false +<<<<<<<< HEAD:MultipazWholesalePOS/build.gradle.kts // terminalBackend (JVM server) plugins. +======== +>>>>>>>> main:MultipazTransitTerminal/build.gradle.kts alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.kotlinSerialization) apply false alias(libs.plugins.ksp) apply false diff --git a/MultipazWholesalePOS/gradle/libs.versions.toml b/MultipazWholesalePOS/gradle/libs.versions.toml index 68f445c8..59b1f516 100644 --- a/MultipazWholesalePOS/gradle/libs.versions.toml +++ b/MultipazWholesalePOS/gradle/libs.versions.toml @@ -10,7 +10,7 @@ composeMultiplatform = "1.11.1" junit = "4.13.2" kotlin = "2.4.10" material3 = "1.11.0-alpha07" -multipaz = "0.101.0-SNAPSHOT" +multipaz = "0.101.0" ktor = "3.3.3" ksp = "2.3.11" diff --git a/MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj b/MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj index 3620d2f1..164a765c 100644 --- a/MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXFileReference section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj <<<<<<<< HEAD:MultipazCodelab/Reader/iosApp/iosApp.xcodeproj/project.pbxproj B9DA97B12DC1472C00A4DA20 /* Multipaz Identity Reader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Multipaz Identity Reader.app"; sourceTree = BUILT_PRODUCTS_DIR; }; ======== @@ -16,24 +17,46 @@ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ 61BA76442560A7D724374B64 /* Exceptions for "iosApp" folder in "iosApp" target */ = { +======== + E02ABEB2EB1D43D85D18569E /* Multipaz Transit Terminal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Multipaz Transit Terminal.app"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + A1456089DC26795EA2EDDEE8 /* Exceptions for "iosApp" folder in "iosApp" target */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Info.plist, ); +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj target = A659AE47B7CBAB1EA44376BB /* iosApp */; +======== + target = 6A0C7FEEBE34757D80590999 /* iosApp */; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj }; /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj AC30AD6F4ED4A2A655BFD5D9 /* iosApp */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( 61BA76442560A7D724374B64 /* Exceptions for "iosApp" folder in "iosApp" target */, +======== + 626910E1A809B3B9770C8A42 /* iosApp */ = { + isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + A1456089DC26795EA2EDDEE8 /* Exceptions for "iosApp" folder in "iosApp" target */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); path = iosApp; sourceTree = ""; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 6E679B557F95C4456C556C2F /* Configuration */ = { +======== + A1067D736BAA233A6EB22998 /* Configuration */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXFileSystemSynchronizedRootGroup; path = Configuration; sourceTree = ""; @@ -41,7 +64,11 @@ /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 8FF964F6CCBCC7654B8D9CA0 /* Frameworks */ = { +======== + F77152032CD1DF5F8E6C519B /* Frameworks */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -51,6 +78,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj F4AEB2ED202CBF751CC41BF0 = { isa = PBXGroup; children = ( @@ -68,6 +96,21 @@ ======== 1EABEF9A9246903062356E7D /* Multipaz Wholesale POS.app */, >>>>>>>> main:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj +======== + 9D49B9DFB2308EF2100B6F0F = { + isa = PBXGroup; + children = ( + A1067D736BAA233A6EB22998 /* Configuration */, + 626910E1A809B3B9770C8A42 /* iosApp */, + CB3D144116969B3D9FE66C3A /* Products */, + ); + sourceTree = ""; + }; + CB3D144116969B3D9FE66C3A /* Products */ = { + isa = PBXGroup; + children = ( + E02ABEB2EB1D43D85D18569E /* Multipaz Transit Terminal.app */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); name = Products; sourceTree = ""; @@ -75,6 +118,7 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj A659AE47B7CBAB1EA44376BB /* iosApp */ = { isa = PBXNativeTarget; buildConfigurationList = 6E45293E9CA330C2404FF1B8 /* Build configuration list for PBXNativeTarget "iosApp" */; @@ -83,47 +127,78 @@ 7C3E4237C500F151231370F7 /* Sources */, 8FF964F6CCBCC7654B8D9CA0 /* Frameworks */, EA778AA15FEBCFC2515D0D1C /* Resources */, +======== + 6A0C7FEEBE34757D80590999 /* iosApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 834B8654D68AA7372E40F353 /* Build configuration list for PBXNativeTarget "iosApp" */; + buildPhases = ( + 7E3C602DBCE9FC54F8430ABE /* Compile Kotlin Framework */, + 2C35F9EEF274172B85E54645 /* Sources */, + F77152032CD1DF5F8E6C519B /* Frameworks */, + B78BF0B8F5C2F5B75C539044 /* Resources */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); buildRules = ( ); dependencies = ( ); fileSystemSynchronizedGroups = ( +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj AC30AD6F4ED4A2A655BFD5D9 /* iosApp */, +======== + 626910E1A809B3B9770C8A42 /* iosApp */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); name = iosApp; packageProductDependencies = ( ); productName = iosApp; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj <<<<<<<< HEAD:MultipazCodelab/Reader/iosApp/iosApp.xcodeproj/project.pbxproj productReference = B9DA97B12DC1472C00A4DA20 /* Multipaz Identity Reader.app */; ======== productReference = 1EABEF9A9246903062356E7D /* Multipaz Wholesale POS.app */; >>>>>>>> main:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj +======== + productReference = E02ABEB2EB1D43D85D18569E /* Multipaz Transit Terminal.app */; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj DF47D23CEB7620B66141C8A1 /* Project object */ = { +======== + F62FA47A1291B8ECB6442708 /* Project object */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1620; LastUpgradeCheck = 1620; TargetAttributes = { +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj A659AE47B7CBAB1EA44376BB = { +======== + 6A0C7FEEBE34757D80590999 = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj CreatedOnToolsVersion = 16.2; }; }; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj buildConfigurationList = 19930D1838582E1CC52B78B8 /* Build configuration list for PBXProject "iosApp" */; +======== + buildConfigurationList = 0C96231287C7EDCF79317504 /* Build configuration list for PBXProject "iosApp" */; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, ); +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj mainGroup = F4AEB2ED202CBF751CC41BF0; minimizedProjectReferenceProxies = 1; preferredProjectObjectVersion = 77; @@ -132,12 +207,26 @@ projectRoot = ""; targets = ( A659AE47B7CBAB1EA44376BB /* iosApp */, +======== + mainGroup = 9D49B9DFB2308EF2100B6F0F; + minimizedProjectReferenceProxies = 1; + preferredProjectObjectVersion = 77; + productRefGroup = CB3D144116969B3D9FE66C3A /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 6A0C7FEEBE34757D80590999 /* iosApp */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj EA778AA15FEBCFC2515D0D1C /* Resources */ = { +======== + B78BF0B8F5C2F5B75C539044 /* Resources */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -147,7 +236,11 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 71FB1B3D8DF518D37A93B199 /* Compile Kotlin Framework */ = { +======== + 7E3C602DBCE9FC54F8430ABE /* Compile Kotlin Framework */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -169,7 +262,11 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 7C3E4237C500F151231370F7 /* Sources */ = { +======== + 2C35F9EEF274172B85E54645 /* Sources */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -179,9 +276,15 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 0CACD237CD61E8A9F6D941AB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReferenceAnchor = 6E679B557F95C4456C556C2F /* Configuration */; +======== + 5A055CBF7DAB6A553F990950 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = A1067D736BAA233A6EB22998 /* Configuration */; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -244,9 +347,15 @@ }; name = Debug; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj D0AA476B8BBE1EF8024FBB39 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReferenceAnchor = 6E679B557F95C4456C556C2F /* Configuration */; +======== + 926A335DF62FA70D5CB69B7D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = A1067D736BAA233A6EB22998 /* Configuration */; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -302,7 +411,11 @@ }; name = Release; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj FF072A27C3A22FCA14EAA6D7 /* Debug */ = { +======== + CC551F08204624AF725670D5 /* Debug */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = XCBuildConfiguration; buildSettings = { ARCHS = arm64; @@ -310,13 +423,18 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj <<<<<<<< HEAD:MultipazCodelab/Reader/iosApp/iosApp.xcodeproj/project.pbxproj DEVELOPMENT_TEAM = VKE2G3K56V; ======== DEVELOPMENT_TEAM = "${TEAM_ID}"; >>>>>>>> main:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj +======== + DEVELOPMENT_TEAM = "${TEAM_ID}"; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iosApp/Info.plist; @@ -335,7 +453,11 @@ }; name = Debug; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 6EA61D96B07BCA837E8EE799 /* Release */ = { +======== + 3466C66A956604C45705C0A1 /* Release */ = { +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj isa = XCBuildConfiguration; buildSettings = { ARCHS = arm64; @@ -343,13 +465,18 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj <<<<<<<< HEAD:MultipazCodelab/Reader/iosApp/iosApp.xcodeproj/project.pbxproj DEVELOPMENT_TEAM = VKE2G3K56V; ======== DEVELOPMENT_TEAM = "${TEAM_ID}"; >>>>>>>> main:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj +======== + DEVELOPMENT_TEAM = "${TEAM_ID}"; +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iosApp/Info.plist; @@ -371,25 +498,46 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 19930D1838582E1CC52B78B8 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 0CACD237CD61E8A9F6D941AB /* Debug */, D0AA476B8BBE1EF8024FBB39 /* Release */, +======== + 0C96231287C7EDCF79317504 /* Build configuration list for PBXProject "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5A055CBF7DAB6A553F990950 /* Debug */, + 926A335DF62FA70D5CB69B7D /* Release */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj 6E45293E9CA330C2404FF1B8 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( FF072A27C3A22FCA14EAA6D7 /* Debug */, 6EA61D96B07BCA837E8EE799 /* Release */, +======== + 834B8654D68AA7372E40F353 /* Build configuration list for PBXNativeTarget "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CC551F08204624AF725670D5 /* Debug */, + 3466C66A956604C45705C0A1 /* Release */, +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; +<<<<<<<< HEAD:MultipazWholesalePOS/iosApp/iosApp.xcodeproj/project.pbxproj rootObject = DF47D23CEB7620B66141C8A1 /* Project object */; -} \ No newline at end of file +} +======== + rootObject = F62FA47A1291B8ECB6442708 /* Project object */; +} +>>>>>>>> main:MultipazTransitTerminal/iosApp/iosApp.xcodeproj/project.pbxproj diff --git a/MultipazWholesalePOS/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/MultipazWholesalePOS/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json index 73c00596..4aa7c535 100644 --- a/MultipazWholesalePOS/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json +++ b/MultipazWholesalePOS/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -3,4 +3,4 @@ "author" : "xcode", "version" : 1 } -} +} \ No newline at end of file diff --git a/MultipazWholesalePOS/settings.gradle.kts b/MultipazWholesalePOS/settings.gradle.kts index b1028842..0f03549c 100644 --- a/MultipazWholesalePOS/settings.gradle.kts +++ b/MultipazWholesalePOS/settings.gradle.kts @@ -1,9 +1,13 @@ +<<<<<<<< HEAD:MultipazWholesalePOS/settings.gradle.kts <<<<<<<< HEAD:MultipazCodelab/Reader/settings.gradle.kts rootProject.name = "MultipazPhotoIDIdentityReader" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") ======== rootProject.name = "MultipazWholesalePOS" >>>>>>>> main:MultipazWholesalePOS/settings.gradle.kts +======== +rootProject.name = "MultipazTransitTerminal" +>>>>>>>> main:MultipazTransitTerminal/settings.gradle.kts pluginManagement { repositories { @@ -12,6 +16,7 @@ pluginManagement { includeGroupAndSubgroups("androidx") includeGroupAndSubgroups("com.android") includeGroupAndSubgroups("com.google") +<<<<<<<< HEAD:MultipazWholesalePOS/settings.gradle.kts includeGroupAndSubgroups("org.multipaz") } } @@ -51,3 +56,32 @@ include(":shared") include(":terminalBackend") >>>>>>>> main:MultipazWholesalePOS/settings.gradle.kts +======== + } + } + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositories { + mavenLocal() + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } + mavenCentral() + maven { + url = uri("https://central.sonatype.com/repository/maven-snapshots/") + } + } +} + +include(":androidApp") +include(":shared") +include(":transitBackend") +>>>>>>>> main:MultipazTransitTerminal/settings.gradle.kts diff --git a/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/Constants.kt b/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/Constants.kt index f5f9e2c2..0ca272d5 100644 --- a/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/Constants.kt +++ b/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/Constants.kt @@ -1,12 +1,13 @@ package org.multipaz.pos object Constants { - // const val DEFAULT_TERMINAL_URL = "https://.trycloudflare.com/rpc" - const val DEFAULT_TERMINAL_URL = "http://localhost:8110/rpc" + // For local development with `adb reverse tcp:8110 tcp:8110`, use: + // const val DEFAULT_TERMINAL_URL = "http://localhost:8110/rpc" + const val DEFAULT_TERMINAL_URL = "https://utopia.multipaz.org/pos-terminal/rpc" const val DEFAULT_PAYEE_ACCOUNT = "20000001" const val TERMINAL_PAYEE_NAME = "Utopia Wholesale POS" const val TERMINAL_PAYEE_ID = "utopia-wholesale-pos-terminal-01" const val TERMINAL_CURRENCY = "USD" -} \ No newline at end of file +} diff --git a/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/proximity/VerificationProximityTransferScreen.kt b/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/proximity/VerificationProximityTransferScreen.kt index 76ed0c22..8a1fcafb 100644 --- a/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/proximity/VerificationProximityTransferScreen.kt +++ b/MultipazWholesalePOS/shared/src/commonMain/kotlin/org/multipaz/pos/proximity/VerificationProximityTransferScreen.kt @@ -68,7 +68,7 @@ import org.multipaz.compose.permissions.rememberBluetoothEnabledState import org.multipaz.compose.permissions.rememberBluetoothPermissionState import org.multipaz.compose.permissions.rememberCameraPermissionState import org.multipaz.compose.qrcode.QrCodeScanner -import org.multipaz.crypto.SecurityException +import org.multipaz.documenttype.ISO_18013_TRANSACTION_DATA_NAMESPACE import org.multipaz.documenttype.knowntypes.PaymentTransaction import org.multipaz.mdoc.connectionmethod.MdocConnectionMethodBle import org.multipaz.mdoc.nfc.MdocReaderNfcHandoverOptions @@ -161,7 +161,12 @@ fun VerificationProximityTransferScreen( } val nfcTagReader = NfcTagReader.getReaders().firstOrNull() - LaunchedEffect(scanMode) { + LaunchedEffect(scanMode, blePermissionState.isGranted, bleEnabledState.isEnabled) { + + if (!blePermissionState.isGranted || !bleEnabledState.isEnabled) { + return@LaunchedEffect + } + if (proximityReaderModel.state.value == ProximityReaderModel.State.IDLE && scanMode == ProximityScanMode.NFC && onNfcHandover != null) { if (nfcTagReader != null && !nfcTagReader.dialogAlwaysShown) { withContext(promptModel) { @@ -192,18 +197,12 @@ fun VerificationProximityTransferScreen( if (scanResult != null) { break } - } catch (e: Throwable) { - if (!isActive) { - Logger.e( - TAG, "Caught exception while scanning and scope isn't active", e - ) - break - } else if (e is SecurityException) { - Logger.e(TAG, "SecurityException while scanning, stopping scan", e) - break - } else { - Logger.e(TAG, "Caught exception while scanning. Retrying", e) - } + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Logger.e(TAG, "Error scanning, stopping scan", e) + onTransferError(e) + break } } } @@ -298,7 +297,7 @@ private suspend fun createPaymentDeviceRequest( id = Constants.TERMINAL_PAYEE_ID, ), ) - val transactionSerialized: DataItem = PaymentTransaction.serializeCbor(payload) + val transactionSerialized: DataItem = PaymentTransaction.serializeIso18013Request(payload) return buildDeviceRequest( sessionTranscript = sessionTranscript @@ -313,19 +312,22 @@ private suspend fun createPaymentDeviceRequest( "payment_instrument_id", "issue_date", "expiry_date", - ).associateWith { false }), - docRequestInfo = DocRequestInfo( - transactions = TransactionsInfo( - data = mapOf( - PaymentTransaction.mdocRequestInfoIdentifier to transactionSerialized + ).associateWith { false }, + ISO_18013_TRANSACTION_DATA_NAMESPACE to mapOf(PaymentTransaction.identifier to true) + ), + docRequestInfo = + DocRequestInfo( + transactionData = TransactionsInfo( + data = mapOf( + PaymentTransaction.identifier to transactionSerialized + ) ) ) - ), ) + // addReaderAuthAll(key) } } - /** * Delivers the outcome of a completed proximity transfer, reporting the failure to * [onTransferError] or handing the resulting presentment record to [onTransferComplete] diff --git a/MultipazWholesalePOS/terminalBackend/Dockerfile b/MultipazWholesalePOS/terminalBackend/Dockerfile new file mode 100644 index 00000000..18fe12ce --- /dev/null +++ b/MultipazWholesalePOS/terminalBackend/Dockerfile @@ -0,0 +1,17 @@ +# Build the backend JAR first: +# ./gradlew :terminalBackend:buildFatJar +# +# The Docker build context is this terminalBackend directory, so the prebuilt +# JAR is available at build/libs/. +FROM eclipse-temurin:17-jre-jammy + +RUN groupadd --system multipaz && useradd --system --gid multipaz multipaz + +WORKDIR /app +COPY build/libs/*-all.jar /app/pos-terminal.jar + +USER multipaz + +EXPOSE 8110 + +ENTRYPOINT ["java", "-jar", "/app/pos-terminal.jar"] diff --git a/MultipazWholesalePOS/terminalBackend/build.gradle.kts b/MultipazWholesalePOS/terminalBackend/build.gradle.kts index 824c33cf..deff2caf 100644 --- a/MultipazWholesalePOS/terminalBackend/build.gradle.kts +++ b/MultipazWholesalePOS/terminalBackend/build.gradle.kts @@ -6,6 +6,25 @@ plugins { alias(libs.plugins.ktor) } +val dockerImage = providers.gradleProperty("dockerImage") + .orElse("multipaz-pos-terminal") +val dockerImageTag = providers.gradleProperty("imageTag") + .orElse("dev") + +tasks.register("buildDockerImageAmd64") { + group = "distribution" + description = "Builds the POS terminal backend fat JAR and loads a linux/amd64 Docker image locally." + dependsOn("buildFatJar") + workingDir = projectDir + commandLine( + "docker", "build", + "--platform", "linux/amd64", + "--tag", "${dockerImage.get()}:${dockerImageTag.get()}", + ".", + ) + outputs.upToDateWhen { false } +} + application { mainClass.set("org.multipaz.pos.terminal.Main") } diff --git a/MultipazWholesalePOS/terminalBackend/src/main/resources/resources/default_configuration.json b/MultipazWholesalePOS/terminalBackend/src/main/resources/resources/default_configuration.json index d66a33bd..f4a3e1c8 100644 --- a/MultipazWholesalePOS/terminalBackend/src/main/resources/resources/default_configuration.json +++ b/MultipazWholesalePOS/terminalBackend/src/main/resources/resources/default_configuration.json @@ -2,14 +2,14 @@ "server_port": 8110, "database_engine": "ephemeral", "admin_password": "multipaz", - "records_server_url": "http://localhost:8004", + "records_server_url": "https://utopia.multipaz.org/registry", "client_requirements": { "android": { "gms_attestation": false, "verified_boot_green": false, "keystore_security_level": "software", "app_signature_certificate_digests": [ - "66:BA:A1:9A:34:33:AD:09:08:7B:4B:87:67:15:C3:08:B0:E8:C7:3B:CD:08:22:28:9C:F2:4F:49:F8:A6:5B:EE" + "E3:41:87:7A:41:BD:70:23:81:3E:F2:60:A2:1F:81:0D:C8:BF:53:13:98:CB:16:17:5E:75:5B:97:8C:A6:A1:EF" ], "app_packages": [ "org.multipaz.pos" @@ -29,4 +29,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keys/.gitignore b/keys/.gitignore new file mode 100644 index 00000000..4cdedd9e --- /dev/null +++ b/keys/.gitignore @@ -0,0 +1,3 @@ +keystore.jks +keystore.properties +