Skip to content
This repository has been archived by the owner on Jan 9, 2024. It is now read-only.

Commit

Permalink
Correctly present basic SD-JWTs
Browse files Browse the repository at this point in the history
  • Loading branch information
@waltkb
waltkb committed Nov 22, 2023
1 parent be237eb commit 46e2811
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 55 deletions.
4 changes: 3 additions & 1 deletion src/main/kotlin/id/walt/service/SSIKit2WalletService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,12 @@ class SSIKit2WalletService(accountId: UUID, walletId: UUID) : WalletService(acco

val disclosuresString = disclosures.joinToString("~")

val credentialWithoutDisclosures = credential.substringBefore("~")

WalletCredential(
wallet = walletId,
id = credentialId,
document = credential,
document = credentialWithoutDisclosures,
disclosures = disclosuresString,
addedOn = Clock.System.now()
)
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/id/walt/service/oidc4vc/TestCredentialWallet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ class TestCredentialWallet(
val selectedDisclosures =
HACK_outsideMappedSelectedDisclosuresPerSession[session.authorizationRequest!!.state + session.authorizationRequest.presentationDefinition]!!

println("Selected credentials: $selectedCredentials")
val matchedCredentials = walletService.getCredentialsByIds(selectedCredentials)
println("Matched credentials: $matchedCredentials")

val vp = Json.encodeToString(
mapOf(
Expand Down
6 changes: 4 additions & 2 deletions src/main/kotlin/id/walt/web/controllers/ExchangeController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ fun Application.exchange() = walletRoute {
@Serializable
data class UsePresentationRequest(
val did: String? = null,
val selectedCredentials: List<String>,
val presentationRequest: String
val presentationRequest: String,

val selectedCredentials: List<String>, // todo: automatically choose matching
val disclosures: Map<String, List<String>>? = null,
)
2 changes: 1 addition & 1 deletion web/src/composables/disclosures.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export function parseDisclosures(disclosureString: string) {
}

export function encodeDisclosure(disclosure: any[]): string {
return encodeUtf8ToBase64(JSON.stringify(disclosure))
return encodeUtf8ToBase64(JSON.stringify(disclosure)).replaceAll("=", "")
}
76 changes: 25 additions & 51 deletions web/src/pages/wallet/[wallet]/exchange/presentation.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,6 @@
<div class="min-w-0 flex-1 text-sm leading-6">
<div class="font-medium select-none text-gray-900">
<label :for="`credential-${credential.id}`">

<!-- <div class="flex items-center gap-1">-->
<!-- <CredentialIcon :credentialType="credential.parsedDocument.type.at(-1)" class="h-6 w-6 flex-none rounded-full bg-gray-50"></CredentialIcon>-->
<!-- {{ credential.parsedDocument.type.at(-1) }}-->
<!-- </div>-->

<!-- <div class="min-w-0 items-center">-->
<!-- <p class="text-lg font-semibold leading-6 text-gray-900">{{ credential?.parsedDocument?.name }}</p>-->
<!-- <p class="ml-1 truncate text-sm leading-5 text-gray-800">{{ credential.id }}</p>-->
<!-- </div>-->

<VerifiableCredentialCard
:class="[selection[credential.id] == true ? 'shadow-xl shadow-primary-400' : 'shadow-2xl']"
:credential="credential.parsedDocument"
Expand All @@ -88,7 +77,7 @@

</label>
</div>
<div v-if="credential.disclosures" class="mt-3">
<div v-if="credential.disclosures && selection[credential.id]" class="mt-6 border rounded-xl p-2">
<fieldset>
<legend class="text-base font-semibold leading-6 text-gray-900">Selectively disclosable attributes
</legend>
Expand All @@ -111,7 +100,7 @@
<div class="ml-3 flex h-6 items-center">
<input :id="`disclosure-${credential.id}-${disclosure[0]}`"
:name="`disclosure-${disclosure[0]}`"
class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600"
class="h-4 w-4 rounded border-gray-300 text-primary-400 focus:ring-primary-500"
type="checkbox"
@click="$event.target.checked ? addDisclosure(credential.id, disclosure) : removeDisclosure(credential.id, disclosure) "
/>
Expand All @@ -127,7 +116,6 @@
</div>
</fieldset>


<Disclosure>
<DisclosureButton class="py-2">
<ButtonsWaltButton class="bg-gray-50 text-black">View presentation definition JSON</ButtonsWaltButton>
Expand All @@ -137,30 +125,6 @@
</DisclosurePanel>
</Disclosure>

<!--
<ul>
<li v-for="credential of matchedCredentials">
- {{ credential }}
</li>
</ul>
<div aria-label="Credential list" class="h-full overflow-y-auto shadow-xl">
<div v-for="group in groupedCredentialTypes.keys()" :key="group.id" class="relative">
<div class="sticky top-0 z-10 border-y border-b-gray-200 border-t-gray-100 bg-gray-50 px-3 py-1.5 text-sm font-semibold leading-6 text-gray-900">
<h3>{{ group }}s:</h3>
</div>
<ul class="divide-y divide-gray-100" role="list">
<li v-for="credential in groupedCredentialTypes.get(group)" :key="credential" class="flex gap-x-4 px-3 py-5">
<CredentialIcon :credentialType="credential.name" class="h-6 w-6 flex-none rounded-full bg-gray-50"></CredentialIcon>
<div class="min-w-0 flex flex-row items-center">
<span class="text-lg font-semibold leading-6 text-gray-900">{{ credential.id }}.</span>
<span class="ml-1 truncate text-sm leading-5 text-gray-800">{{ credential.name }}</span>
</div>
</li>
</ul>
</div>
</div>-->
</CenterMain>
</div>
</template>
Expand All @@ -175,7 +139,7 @@ import { useTitle } from "@vueuse/core";
import VerifiableCredentialCard from "~/components/credentials/VerifiableCredentialCard.vue";
import { Disclosure, DisclosureButton, DisclosurePanel } from "@headlessui/vue";
import { parseDisclosures } from "../../../../composables/disclosures";
import { encodeDisclosure, parseDisclosures } from "../../../../composables/disclosures";
const currentWallet = useCurrentWallet();
Expand Down Expand Up @@ -231,18 +195,27 @@ const matchedCredentials = await $fetch(`/r/wallet/${currentWallet.value}/exchan
});
const selection = ref({});
const selectedCredentialIds = computed(() => {
const _selectedCredentialIds = [];
const selectedCredentialIds = computed(() => Object.entries(selection.value).filter((it) => it[1]).map((it) => it[0]))
for (let credentialId in selection.value) {
if (selection.value[credentialId] === true)
_selectedCredentialIds.push(credentialId);
}
const disclosures = ref({});
//const encodedDisclosures = computed(() => Object.keys(disclosures.value).map((cred) => disclosures.values[cred].map((disclosure) => encodeDisclosure(disclosure))))
const encodedDisclosures = computed(() => {
if (JSON.stringify(disclosures.value) === "{}") return null
const m = {}
for (let credId in disclosures.value) {
if (m[credId] === undefined) {
m[credId] = []
}
return _selectedCredentialIds;
});
for (let disclosure of disclosures.value[credId]) {
console.log("DISC ", disclosure)
m[credId].push(encodeDisclosure(disclosure))
}
}
const disclosures = ref({});
return m
})
function addDisclosure(credentialId: string, disclosure: string) {
if (disclosures.value[credentialId] === undefined) {
Expand All @@ -258,9 +231,10 @@ function removeDisclosure(credentialId: string, disclosure: string) {
async function acceptPresentation() {
const req = {
//did: String,
//did: String, // todo: choose DID of shared credential
presentationRequest: request,
selectedCredentials: selectedCredentialIds.value,
presentationRequest: request
disclosures: encodedDisclosures.value
};
const response = await fetch(`/r/wallet/${currentWallet.value}/exchange/usePresentationRequest`, {
Expand Down Expand Up @@ -292,7 +266,7 @@ async function acceptPresentation() {
failMessage.value = error.message;
console.log("Error response: " + JSON.stringify(error));
// window.alert(error.message)
window.alert(error.errorMessage)
if (error.redirectUri != null) {
navigateTo(error.redirectUri as string, {
Expand Down

0 comments on commit 46e2811

Please sign in to comment.