diff --git a/build.gradle.kts b/build.gradle.kts index ae08f0c..357f925 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,14 +26,15 @@ dependencies { implementation("io.javalin:javalin-bundle:4.6.6") implementation("com.github.kmehrunes:javalin-jwt:0.3") implementation("com.beust:klaxon:5.6") - implementation("com.nimbusds:oauth2-oidc-sdk:9.41") + //implementation("com.nimbusds:oauth2-oidc-sdk:9.41") + implementation("com.nimbusds:oauth2-oidc-sdk:9.43.1") // CLI implementation("com.github.ajalt.clikt:clikt-jvm:3.5.0") implementation("com.github.ajalt.clikt:clikt:3.5.0") // SSIKIT - implementation("id.walt:waltid-ssi-kit:1.13.0-SNAPSHOT6") + implementation("id.walt:waltid-ssikit:1.SNAPSHOT") implementation("id.walt:waltid-walletkit:0.7.0-SNAPSHOT") // Service-Matrix diff --git a/config/idp-config.json b/config/idp-config.json index cf19f76..49923af 100644 --- a/config/idp-config.json +++ b/config/idp-config.json @@ -1,6 +1,6 @@ { - "externalUrl": "http://localhost:5000", - "jsProjectExternalUrl":"http://localhost:4000", + "externalUrl": "http://localhost:7777", + "jsProjectExternalUrl":"http://localhost:7777", "claimConfig": { "vc_mappings": [ { diff --git a/config/verifier-config.json b/config/verifier-config.json index 4029a95..fdb0f0f 100644 --- a/config/verifier-config.json +++ b/config/verifier-config.json @@ -1,14 +1,21 @@ { - "verifierUiUrl": "", - "verifierApiUrl": "http://localhost:8080/api/siop/default", + "verifierUiUrl": "http://localhost:7777/sharecredential?state=", + "verifierApiUrl": "http://localhost:7777/api/siop/default", "wallets": { "walt.id": { - "id": "walt.id", - "url": "https://wallet.walt-test.cloud", + "id": "waltid", + "url": "http://localhost:3000", "presentPath": "api/siop/initiatePresentation/", "receivePath" : "api/siop/initiateIssuance/", - "description": "localhost wallet" + "description": "walt.id web wallet" + }, + "local": { + "id": "local", + "url": "http://localhost:3000", + "presentPath": "api/siop/initiatePresentation/", + "receivePath" : "api/siop/initiateIssuance/", + "description": "local wallet" } } } diff --git a/src/main/kotlin/id/walt/idp/Main.kt b/src/main/kotlin/id/walt/idp/Main.kt index c6e980d..59fc491 100644 --- a/src/main/kotlin/id/walt/idp/Main.kt +++ b/src/main/kotlin/id/walt/idp/Main.kt @@ -2,6 +2,7 @@ package id.walt.idp import com.github.ajalt.clikt.core.subcommands import id.walt.cli.* +import id.walt.cli.did.* import id.walt.idp.cli.* import id.walt.servicematrix.ServiceMatrix import id.walt.servicematrix.ServiceRegistry diff --git a/src/main/kotlin/id/walt/idp/nfts/NFTManager.kt b/src/main/kotlin/id/walt/idp/nfts/NFTManager.kt index acc981a..acc8a28 100644 --- a/src/main/kotlin/id/walt/idp/nfts/NFTManager.kt +++ b/src/main/kotlin/id/walt/idp/nfts/NFTManager.kt @@ -1,7 +1,5 @@ package id.walt.idp.nfts -import com.nimbusds.jose.shaded.json.JSONObject -import com.nimbusds.jose.shaded.json.parser.JSONParser import com.nimbusds.oauth2.sdk.AuthorizationRequest import id.walt.common.KlaxonWithConverters import id.walt.idp.config.IDPConfig @@ -11,6 +9,8 @@ import id.walt.nftkit.opa.DynamicPolicy import id.walt.nftkit.services.* import id.walt.nftkit.utilis.Common import mu.KotlinLogging +import net.minidev.json.JSONObject +import net.minidev.json.parser.JSONParser import java.math.BigInteger import java.net.URI diff --git a/src/main/kotlin/id/walt/idp/oidc/OIDCManager.kt b/src/main/kotlin/id/walt/idp/oidc/OIDCManager.kt index f65dce9..67c5424 100644 --- a/src/main/kotlin/id/walt/idp/oidc/OIDCManager.kt +++ b/src/main/kotlin/id/walt/idp/oidc/OIDCManager.kt @@ -295,7 +295,7 @@ object OIDCManager : IDPManager { URI.create("${walletUrl}?state=${SIOPState(idpType, session.id).encode()}") } else { val siopReq = verifierManager.newRequest( - walletUrl = walletUrl, + walletUrl = walletUrl.toString(), presentationDefinition = session.presentationDefinition!!, //state = session.id state = SIOPState(idpType, session.id).encode(), diff --git a/web/waltid-idpkit-ui/nuxt.config.js b/web/waltid-idpkit-ui/nuxt.config.js index 6f146db..dd7b97d 100644 --- a/web/waltid-idpkit-ui/nuxt.config.js +++ b/web/waltid-idpkit-ui/nuxt.config.js @@ -96,12 +96,12 @@ export default { // }, proxy: { - '/verifier-api/': "http://localhost:8080/", - '/api/': "http://localhost:8080/", - '/webjars/': "http://localhost:8080/" + '/verifier-api/': "http://localhost:7776/", + '/api/': "http://localhost:7776/", + '/webjars/': "http://localhost:7776/" }, server: { - port: 5000 + port: 7777 } }