Skip to content

Commit

Permalink
Updated for CHEQD webinar
Browse files Browse the repository at this point in the history
  • Loading branch information
KBurgmann committed May 17, 2023
1 parent 2c99706 commit 7a38c23
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 16 deletions.
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/idp-config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"externalUrl": "http://localhost:5000",
"jsProjectExternalUrl":"http://localhost:4000",
"externalUrl": "http://localhost:7777",
"jsProjectExternalUrl":"http://localhost:7777",
"claimConfig": {
"vc_mappings": [
{
Expand Down
17 changes: 12 additions & 5 deletions config/verifier-config.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
1 change: 1 addition & 0 deletions src/main/kotlin/id/walt/idp/Main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/id/walt/idp/nfts/NFTManager.kt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/id/walt/idp/oidc/OIDCManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions web/waltid-idpkit-ui/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

0 comments on commit 7a38c23

Please sign in to comment.