Merge branch 'main' into fix-build

walt-id · Feb 17, 2025 · 868a09e · 868a09e
2 parents 194c9de + 8332dc8
commit 868a09e
Show file tree

Hide file tree

Showing 192 changed files with 424 additions and 668 deletions.
diff --git a/.github/actions/gradle-setup-action/action.yml b/.github/actions/gradle-setup-action/action.yml
@@ -17,7 +17,7 @@ runs:
       with:
         distribution: 'temurin'
         java-version: '21'
-    - name: Gradle wrapper validation
-      uses: gradle/actions/wrapper-validation@v4
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
+    - name: Gradle wrapper validation
+      uses: gradle/actions/wrapper-validation@v4
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
   version:
     uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Configure gradle
-        uses: ./.github/actions/gradle-setup-action@266f5c09359450c39019a6da38f2b331e7122918
+        uses: walt-id/waltid-identity/.github/actions/gradle-setup-action@f7b46c8ae1c27f1a0873a5ca8dfb0440c77381ec
       - name: Set version
         run: |
           sed -i "s/1.0.0-SNAPSHOT/${{ inputs.version }}/g" build.gradle.kts

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       suffix: -SNAPSHOT
   gradle:
-    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
     secrets: inherit
     needs: version
     with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     with:
       preferred: ${{ inputs.release_version }}
   gradle:
-    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
     secrets: inherit
     needs: version
     with:

diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -12,7 +12,7 @@ jobs:
     with:
       preferred: ${{ inputs.release_version }}
   gradle:
-    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
+    uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
     secrets: inherit
     needs: version
     with:

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/WaltIdCmd.kt
@@ -1,10 +1,6 @@
 package id.walt.cli
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.installMordantMarkdown
-import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 import id.walt.cli.commands.*
 import id.walt.cli.util.WaltIdCmdHelpOptionMessage

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/DidCreateCmd.kt
@@ -1,10 +1,6 @@
 package id.walt.cli.commands
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.installMordantMarkdown
-import com.github.ajalt.clikt.core.terminal
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/KeyGenerateCmd.kt
@@ -1,10 +1,6 @@
 package id.walt.cli.commands
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.installMordantMarkdown
-import com.github.ajalt.clikt.core.terminal
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.groups.provideDelegate
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.help

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPCreateCmd.kt
@@ -1,10 +1,6 @@
 package id.walt.cli.commands
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.installMordantMarkdown
-import com.github.ajalt.clikt.core.terminal
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.path

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/commands/VPVerifyCmd.kt
@@ -1,10 +1,6 @@
 package id.walt.cli.commands
 
-import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.core.Context
-import com.github.ajalt.clikt.core.MissingOption
-import com.github.ajalt.clikt.core.context
-import com.github.ajalt.clikt.core.installMordantMarkdown
+import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.*
 import com.github.ajalt.clikt.parameters.types.choice
 import com.github.ajalt.clikt.parameters.types.path

diff --git a/...ns/waltid-cli/src/commonMain/kotlin/id/walt/cli/presexch/PresentationSubmissionBuilder.kt b/...ns/waltid-cli/src/commonMain/kotlin/id/walt/cli/presexch/PresentationSubmissionBuilder.kt
@@ -3,7 +3,10 @@ package id.walt.cli.presexch
 import id.walt.cli.models.Credential
 import id.walt.credentials.utils.VCFormat
 import id.walt.crypto.utils.JwsUtils.decodeJws
-import id.walt.oid4vc.data.dif.*
+import id.walt.oid4vc.data.dif.DescriptorMapping
+import id.walt.oid4vc.data.dif.PresentationDefinition
+import id.walt.oid4vc.data.dif.PresentationSubmission
+import id.walt.oid4vc.data.dif.PresentationSubmissionSerializer
 import kotlinx.serialization.json.*
 
 class PresentationSubmissionBuilder(

diff --git a/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/util/VCUtil.kt b/waltid-applications/waltid-cli/src/commonMain/kotlin/id/walt/cli/util/VCUtil.kt
@@ -2,12 +2,12 @@ package id.walt.cli.util
 
 import id.walt.credentials.issuance.Issuer.mergingJwtIssue
 import id.walt.credentials.vc.vcs.W3CVC
+import id.walt.crypto.keys.jwk.JWKKey
+import id.walt.did.dids.DidService
 import id.walt.policies.PolicyManager
 import id.walt.policies.Verifier
 import id.walt.policies.models.PolicyRequest
 import id.walt.policies.models.PolicyResult
-import id.walt.crypto.keys.jwk.JWKKey
-import id.walt.did.dids.DidService
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement

diff --git a/...lications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/verifiers/ExpirationDatePolicyTest.kt b/...lications/waltid-cli/src/jvmTest/kotlin/id/walt/cli/verifiers/ExpirationDatePolicyTest.kt
@@ -1,11 +1,11 @@
 package id.walt.cli.verifiers
 
+import id.walt.crypto.utils.JwsUtils.decodeJws
 import id.walt.policies.ExpirationDatePolicyException
 import id.walt.policies.PolicyManager
 import id.walt.policies.Verifier
 import id.walt.policies.models.PolicyRequest
 import id.walt.policies.policies.ExpirationDatePolicy
-import id.walt.crypto.utils.JwsUtils.decodeJws
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject

diff --git a/...ns/waltid-openid4vc-ios-testApp/shared/src/iosMain/kotlin/id/walt/oid4vc/shared/Wallet.kt b/...ns/waltid-openid4vc-ios-testApp/shared/src/iosMain/kotlin/id/walt/oid4vc/shared/Wallet.kt
@@ -13,7 +13,7 @@ import id.walt.oid4vc.data.OpenIDProviderMetadata
 import id.walt.oid4vc.data.dif.DescriptorMapping
 import id.walt.oid4vc.data.dif.PresentationDefinition
 import id.walt.oid4vc.data.dif.PresentationSubmission
-import id.walt.oid4vc.data.dif.VCFormat
+import id.walt.credentials.utils.VCFormat
 import id.walt.oid4vc.errors.PresentationError
 import id.walt.oid4vc.interfaces.PresentationResult
 import id.walt.oid4vc.interfaces.SimpleHttpResponse
@@ -358,7 +358,7 @@ internal class TestCredentialWallet(
     }
 
     override val metadata: OpenIDProviderMetadata
-        get() = createDefaultProviderMetadata()
+        get() = createDefaultProviderMetadata() as OpenIDProviderMetadata.Draft13
 
     override fun getSession(id: String) = sessionCache[id]
     override fun getSessionByAuthServerState(authServerState: String): SIOPSession? {

diff --git a/waltid-applications/waltid-web-portal/components/sections/IssueSection.tsx b/waltid-applications/waltid-web-portal/components/sections/IssueSection.tsx
@@ -1,21 +1,17 @@
-import RowCredential from '@/components/walt/credential/RowCredential';
-import Dropdown from '@/components/walt/forms/Dropdown';
-import {
-  AuthenticationMethods,
-  AvailableCredential,
-  VpProfiles,
-} from '@/types/credentials';
-import Checkbox from '@/components/walt/forms/Checkbox';
-import InputField from '@/components/walt/forms/Input';
-import Button from '@/components/walt/button/Button';
-import WaltIcon from '@/components/walt/logo/WaltIcon';
-import { CredentialsContext, EnvContext } from '@/pages/_app';
-import React, { useState } from 'react';
-import { useRouter } from 'next/router';
-import { getOfferUrl } from '@/utils/getOfferUrl';
-import { sendToWebWallet } from '@/utils/sendToWebWallet';
-import nextConfig from '@/next.config';
-import { LockClosedIcon } from '@heroicons/react/24/outline';
+import RowCredential from "@/components/walt/credential/RowCredential";
+import Dropdown from "@/components/walt/forms/Dropdown";
+import { AuthenticationMethods, AvailableCredential, VpProfiles } from "@/types/credentials";
+import Checkbox from "@/components/walt/forms/Checkbox";
+import InputField from "@/components/walt/forms/Input";
+import Button from "@/components/walt/button/Button";
+import WaltIcon from "@/components/walt/logo/WaltIcon";
+import { CredentialsContext, EnvContext } from "@/pages/_app";
+import React, { useState } from "react";
+import { useRouter } from "next/router";
+import { getOfferUrl } from "@/utils/getOfferUrl";
+import { sendToWebWallet } from "@/utils/sendToWebWallet";
+import nextConfig from "@/next.config";
+import { LockClosedIcon } from "@heroicons/react/24/outline";
 
 export default function IssueSection() {
   const env = React.useContext(EnvContext);

diff --git a/waltid-applications/waltid-web-portal/components/sections/VerificationSection.tsx b/waltid-applications/waltid-web-portal/components/sections/VerificationSection.tsx
@@ -1,12 +1,12 @@
-import RowCredential from '@/components/walt/credential/RowCredential';
-import PolicyListItem from '@/components/walt/policy/PolicyListItem';
-import { AvailableCredential } from '@/types/credentials';
-import WaltIcon from '@/components/walt/logo/WaltIcon';
-import InputField from '@/components/walt/forms/Input';
-import Button from '@/components/walt/button/Button';
-import React, { useContext, useState } from 'react';
-import { CredentialsContext } from '@/pages/_app';
-import { useRouter } from 'next/router';
+import RowCredential from "@/components/walt/credential/RowCredential";
+import PolicyListItem from "@/components/walt/policy/PolicyListItem";
+import { AvailableCredential } from "@/types/credentials";
+import WaltIcon from "@/components/walt/logo/WaltIcon";
+import InputField from "@/components/walt/forms/Input";
+import Button from "@/components/walt/button/Button";
+import React, { useContext, useState } from "react";
+import { CredentialsContext } from "@/pages/_app";
+import { useRouter } from "next/router";
 
 export default function VerificationSection() {
   const router = useRouter();

diff --git a/waltid-applications/waltid-web-portal/components/walt/button/BackButton.tsx b/waltid-applications/waltid-web-portal/components/walt/button/BackButton.tsx
@@ -1,4 +1,4 @@
-import { useRouter } from 'next/router';
+import { useRouter } from "next/router";
 
 export default function BackButton() {
   const router = useRouter();

diff --git a/waltid-applications/waltid-web-portal/components/walt/button/Button.tsx b/waltid-applications/waltid-web-portal/components/walt/button/Button.tsx
@@ -1,5 +1,5 @@
-import { ReactNode } from 'react';
-import { AiOutlineLoading3Quarters } from 'react-icons/ai';
+import { ReactNode } from "react";
+import { AiOutlineLoading3Quarters } from "react-icons/ai";
 
 type ButtonSize = 'sm' | 'md' | 'lg' | 'xl';
 

diff --git a/waltid-applications/waltid-web-portal/components/walt/credential/Credential.tsx b/waltid-applications/waltid-web-portal/components/walt/credential/Credential.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import WaltIcon from '@/components/walt/logo/WaltIcon';
+import WaltIcon from "@/components/walt/logo/WaltIcon";
 
 type Props = {
   id: string;

diff --git a/waltid-applications/waltid-web-portal/components/walt/credential/RowCredential.tsx b/waltid-applications/waltid-web-portal/components/walt/credential/RowCredential.tsx
@@ -1,12 +1,8 @@
-import {
-  AvailableCredential,
-  CredentialFormats,
-  DIDMethods,
-} from '@/types/credentials';
-import EditCredentialModal from '../modal/EditCredentialModal';
-import { PencilSquareIcon } from '@heroicons/react/24/outline';
-import Dropdown from '@/components/walt/forms/Dropdown';
-import React from 'react';
+import { AvailableCredential, CredentialFormats, DIDMethods } from "@/types/credentials";
+import EditCredentialModal from "../modal/EditCredentialModal";
+import { PencilSquareIcon } from "@heroicons/react/24/outline";
+import Dropdown from "@/components/walt/forms/Dropdown";
+import React from "react";
 
 type Props = {
   credentialToEdit: AvailableCredential;

diff --git a/waltid-applications/waltid-web-portal/components/walt/forms/Checkbox.tsx b/waltid-applications/waltid-web-portal/components/walt/forms/Checkbox.tsx
@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { ReactNode } from "react";
 
 type Props = {
   value: boolean;

diff --git a/waltid-applications/waltid-web-portal/components/walt/forms/Dropdown.tsx b/waltid-applications/waltid-web-portal/components/walt/forms/Dropdown.tsx
@@ -1,6 +1,6 @@
-import { Fragment } from 'react';
-import { Listbox, Transition } from '@headlessui/react';
-import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/20/solid';
+import { Fragment } from "react";
+import { Listbox, Transition } from "@headlessui/react";
+import { CheckIcon, ChevronUpDownIcon } from "@heroicons/react/20/solid";
 
 type Props = {
   values: String[];

diff --git a/waltid-applications/waltid-web-portal/components/walt/forms/SelectButton.tsx b/waltid-applications/waltid-web-portal/components/walt/forms/SelectButton.tsx
@@ -1,4 +1,4 @@
-import { ReactNode } from 'react';
+import { ReactNode } from "react";
 
 type Props = {
   children: ReactNode;

diff --git a/waltid-applications/waltid-web-portal/components/walt/logo/Icon.tsx b/waltid-applications/waltid-web-portal/components/walt/logo/Icon.tsx
@@ -1,4 +1,4 @@
-import Image from 'next/image';
+import Image from "next/image";
 
 type Props = {
   height: number;

diff --git a/waltid-applications/waltid-web-portal/components/walt/modal/BaseModal.tsx b/waltid-applications/waltid-web-portal/components/walt/modal/BaseModal.tsx
@@ -1,8 +1,8 @@
-import { Fragment, ReactNode } from 'react';
-import { Dialog, Transition } from '@headlessui/react';
-import { ChevronLeftIcon, XMarkIcon } from '@heroicons/react/24/outline';
-import HSpacer from '@/components/walt/spacer/HSpacer';
-import WaltIcon from '@/components/walt/logo/WaltIcon';
+import { Fragment, ReactNode } from "react";
+import { Dialog, Transition } from "@headlessui/react";
+import { ChevronLeftIcon, XMarkIcon } from "@heroicons/react/24/outline";
+import HSpacer from "@/components/walt/spacer/HSpacer";
+import WaltIcon from "@/components/walt/logo/WaltIcon";
 
 type ModalProps = {
   show: boolean;

diff --git a/waltid-applications/waltid-web-portal/components/walt/modal/CustomCredentialModal.tsx b/waltid-applications/waltid-web-portal/components/walt/modal/CustomCredentialModal.tsx
@@ -1,7 +1,7 @@
-import BaseModal from '@/components/walt/modal/BaseModal';
-import { CredentialsContext } from '@/pages/_app';
-import Button from '../button/Button';
-import React, { useState } from 'react';
+import BaseModal from "@/components/walt/modal/BaseModal";
+import { CredentialsContext } from "@/pages/_app";
+import Button from "../button/Button";
+import React, { useState } from "react";
 
 type Props = {
   show: boolean;

diff --git a/waltid-applications/waltid-web-portal/components/walt/modal/EditCredentialModal.tsx b/waltid-applications/waltid-web-portal/components/walt/modal/EditCredentialModal.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
-import Button from '@/components/walt/button/Button';
-import BaseModal from '@/components/walt/modal/BaseModal';
+import React from "react";
+import Button from "@/components/walt/button/Button";
+import BaseModal from "@/components/walt/modal/BaseModal";
 
 type Props = {
   show: boolean;

diff --git a/waltid-applications/waltid-web-portal/components/walt/policy/PolicyListItem.tsx b/waltid-applications/waltid-web-portal/components/walt/policy/PolicyListItem.tsx
@@ -1,4 +1,4 @@
-import Checkbox from '@/components/walt/forms/Checkbox';
+import Checkbox from "@/components/walt/forms/Checkbox";
 
 type Props = {
   name: string;

diff --git a/waltid-applications/waltid-web-portal/components/walt/spacer/HSpacer.tsx b/waltid-applications/waltid-web-portal/components/walt/spacer/HSpacer.tsx
@@ -1,4 +1,4 @@
-import Spacer, { SpacerProps } from '@/components/walt/spacer/Spacer';
+import Spacer, { SpacerProps } from "@/components/walt/spacer/Spacer";
 
 type Props = Pick<SpacerProps, 'size'>;
 

diff --git a/waltid-applications/waltid-web-portal/components/walt/spacer/VSpacer.tsx b/waltid-applications/waltid-web-portal/components/walt/spacer/VSpacer.tsx
@@ -1,4 +1,4 @@
-import Spacer, { SpacerProps } from '@/components/walt/spacer/Spacer';
+import Spacer, { SpacerProps } from "@/components/walt/spacer/Spacer";
 
 type Props = Pick<SpacerProps, 'size'>;
 

diff --git a/waltid-applications/waltid-web-portal/k8s/deployment-dev.yaml b/waltid-applications/waltid-web-portal/k8s/deployment-dev.yaml
@@ -51,7 +51,12 @@ metadata:
   name: portal-ingress
   annotations:
     kubernetes.io/ingress.class: "nginx"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
+  tls:
+    - hosts:
+        - portal.test.waltid.cloud
+      secretName: web-portal-tls-secret
   rules:
     - host: portal.test.waltid.cloud
       http:

diff --git a/waltid-applications/waltid-web-portal/pages/_app.tsx b/waltid-applications/waltid-web-portal/pages/_app.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
-import axios from 'axios';
-import '@/styles/globals.css';
-import type { AppProps } from 'next/app';
-import { AvailableCredential } from '@/types/credentials';
+import React from "react";
+import axios from "axios";
+import "@/styles/globals.css";
+import type { AppProps } from "next/app";
+import { AvailableCredential } from "@/types/credentials";
 
 export const EnvContext = React.createContext({} as { [key: string]: string });
 export const CredentialsContext = React.createContext([

diff --git a/waltid-applications/waltid-web-portal/pages/_document.tsx b/waltid-applications/waltid-web-portal/pages/_document.tsx
@@ -1,5 +1,5 @@
-import { Head, Html, Main, NextScript } from 'next/document';
-import Footer from '@/components/sections/Footer';
+import { Head, Html, Main, NextScript } from "next/document";
+import Footer from "@/components/sections/Footer";
 
 export default function Document() {
   return (

diff --git a/waltid-applications/waltid-web-portal/pages/api/env.ts b/waltid-applications/waltid-web-portal/pages/api/env.ts
@@ -1,4 +1,4 @@
-import type { NextApiRequest, NextApiResponse } from 'next';
+import type { NextApiRequest, NextApiResponse } from "next";
 
 type ResponseData = {};