diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/Dockerfile b/AliceFaberAcmeDemo/controllers/acme-controller/Dockerfile index 9811e86..e22fc3e 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/Dockerfile +++ b/AliceFaberAcmeDemo/controllers/acme-controller/Dockerfile @@ -1,4 +1,18 @@ -FROM node:22 as build -COPY . . +FROM node:22 + +WORKDIR /app + +# Copy package.json and package-lock.json +COPY package*.json ./ + +# Install dependencies RUN npm install -ENTRYPOINT [ "npm", "start" ] + +# Copy the rest of the application files +COPY . . + +# Expose the port the app runs on +EXPOSE 80 + +# Start the application +CMD ["node", "app.js"] diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/app.js b/AliceFaberAcmeDemo/controllers/acme-controller/app.js index 2b33249..ba1a231 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/app.js +++ b/AliceFaberAcmeDemo/controllers/acme-controller/app.js @@ -1,57 +1,66 @@ -var createError = require('http-errors'); -const express = require('express'); -const path = require('path'); -const cookieParser = require('cookie-parser'); -const logger = require('morgan'); -const { engine } = require('express-handlebars'); -const helpers = require('handlebars-helpers'); - -const indexRouter = require('./routes/index'); -const connectionRouter = require('./routes/connection'); -const proofRouter = require('./routes/proof'); +var createError = require("http-errors"); +const express = require("express"); +const path = require("path"); +const cookieParser = require("cookie-parser"); +const logger = require("morgan"); +const { engine } = require("express-handlebars"); +const helpers = require("handlebars-helpers"); + +const indexRouter = require("./routes/index"); +const connectionRouter = require("./routes/connection"); +const proofRouter = require("./routes/proof"); const app = express(); // view engine setup -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', 'hbs'); -app.engine('hbs', engine({ - extname: 'hbs', - defaultView: 'default', - layoutsDir: path.join(__dirname, '/views/layouts/'), - partialsDir: [ - path.join(__dirname, '/views/partials'), - path.join(__dirname, '/views/partials/connection'), - path.join(__dirname, '/views/partials/home'), - path.join(__dirname, '/views/partials/proof'), - ], - helpers: helpers(['array', 'comparison']) -})); - -app.use(logger('dev')); +app.set("views", path.join(__dirname, "views")); +app.set("view engine", "hbs"); +app.engine( + "hbs", + engine({ + extname: "hbs", + defaultView: "default", + layoutsDir: path.join(__dirname, "/views/layouts/"), + partialsDir: [ + path.join(__dirname, "/views/partials"), + path.join(__dirname, "/views/partials/connection"), + path.join(__dirname, "/views/partials/home"), + path.join(__dirname, "/views/partials/proof"), + ], + helpers: helpers(["array", "comparison"]), + }) +); + +app.use(logger("dev")); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(__dirname, 'public'))); +app.use(express.static(path.join(__dirname, "public"))); -app.use('/', indexRouter); -app.use('/connections', connectionRouter); -app.use('/proofs', proofRouter); +app.use("/", indexRouter); +app.use("/connections", connectionRouter); +app.use("/proofs", proofRouter); // catch 404 and forward to error handler -app.use(function(req, res, next) { +app.use(function (req, res, next) { next(createError(404)); }); // error handler -app.use(function(err, req, res, next) { +app.use(function (err, req, res, next) { // set locals, only providing error in development res.locals.message = err.message; - res.locals.error = req.app.get('env') === 'development' ? err : {}; + res.locals.error = req.app.get("env") === "development" ? err : {}; // render the error page res.status(err.status || 500); - res.render('error'); + res.render("error"); +}); + +// Start the server +const PORT = process.env.PORT || 80; +app.listen(PORT, () => { + console.log(`Server is running on port ${PORT}`); }); module.exports = app; diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/docker-compose.yml b/AliceFaberAcmeDemo/controllers/acme-controller/docker-compose.yml new file mode 100644 index 0000000..2710c38 --- /dev/null +++ b/AliceFaberAcmeDemo/controllers/acme-controller/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3" +services: + acme-controller: + build: . + ports: + - "8140:80" # Expose a different port for the controller + environment: + - AGENT_HOST=host.docker.internal + - AGENT_PORT=8040 + networks: + - aca +networks: + aca: diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/package.json b/AliceFaberAcmeDemo/controllers/acme-controller/package.json index a6463ba..1483437 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/package.json +++ b/AliceFaberAcmeDemo/controllers/acme-controller/package.json @@ -10,6 +10,7 @@ "ext": "js,json,hbs,css" }, "dependencies": { + "axios": "^1.8.3", "cookie-parser": "^1.4.7", "debug": "^2.6.9", "express": "^4.21.1", diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/routes/connection.js b/AliceFaberAcmeDemo/controllers/acme-controller/routes/connection.js index 259dd59..369ac48 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/routes/connection.js +++ b/AliceFaberAcmeDemo/controllers/acme-controller/routes/connection.js @@ -1,133 +1,156 @@ -const express = require('express'); +const express = require("express"); const router = express.Router(); -const { check, validationResult } = require('express-validator'); +const { check, validationResult } = require("express-validator"); -const NavLinkService = require('../services/NavLinkService'); +const NavLinkService = require("../services/NavLinkService"); const navLinkService = new NavLinkService(); navLinkService.registerCustomLinks([ - { "label": "Active", "url": "/connections/active" }, - { "label": "Pending", "url": "/connections/pending" }, - { "label": "New", "url": "/connections/new" }, - { "label": "Accept", "url": "/connections/accept" } + { label: "Active", url: "/connections/active" }, + { label: "Pending", url: "/connections/pending" }, + { label: "New", url: "/connections/new" }, + { label: "Accept", url: "/connections/accept" }, ]); router.use(function (req, res, next) { - navLinkService.clearLinkClasses(); - navLinkService.setNavLinkActive('/connections'); - next(); + navLinkService.clearLinkClasses(); + navLinkService.setNavLinkActive("/connections"); + next(); }); -router.get('/', async function (req, res, next) { - res.redirect('/connections/active'); +router.get("/", async function (req, res, next) { + res.redirect("/connections/active"); }); -router.get('/active', async function (req, res, next) { - const agentService = require('../services/AgentService'); - const allConnections = await agentService.getConnections(); - const connections = allConnections.filter(connection => connection.state === 'active' || connection.state === 'request'); - - navLinkService.setCustomNavLinkActive('/connections/active'); - res.render('connection', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - connections - }); +router.get("/active", async function (req, res, next) { + const agentService = require("../services/AgentService"); + const allConnections = await agentService.getConnections(); + const connections = allConnections.filter( + (connection) => + connection.state === "active" || connection.state === "request" + ); + + navLinkService.setCustomNavLinkActive("/connections/active"); + res.render("connection", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + connections, + }); }); -router.get('/pending', async function (req, res, next) { - const agentService = require('../services/AgentService'); - const allConnections = await agentService.getConnections(); - const connections = allConnections.filter(connection => connection.state === 'invitation'); - - navLinkService.setCustomNavLinkActive('/connections/pending'); - res.render('connection', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - connections - }); +router.get("/pending", async function (req, res, next) { + const agentService = require("../services/AgentService"); + const allConnections = await agentService.getConnections(); + const connections = allConnections.filter( + (connection) => connection.state === "invitation" + ); + + navLinkService.setCustomNavLinkActive("/connections/pending"); + res.render("connection", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + connections, + }); }); -router.get('/new', handleNewConnectionGet); +router.get("/new", handleNewConnectionGet); -router.post('/new', handleNewConnectionPost, handleNewConnectionGet); +router.post("/new", handleNewConnectionPost, handleNewConnectionGet); async function handleNewConnectionGet(req, res, next) { - navLinkService.setCustomNavLinkActive('/connections/new'); - res.render('new_connection', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - invitation: req.invitation - }); + navLinkService.setCustomNavLinkActive("/connections/new"); + res.render("new_connection", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + invitation: req.invitation, + }); } async function handleNewConnectionPost(req, res, next) { - const agentService = require('../services/AgentService'); - - const invitation = await agentService.createInvitation(); - if (invitation) { - invitation.invitation = JSON.stringify(invitation.invitation, null, 4); - } - req.invitation = invitation - next(); + const agentService = require("../services/AgentService"); + + const invitation = await agentService.createInvitation(); + console.log("Invitation Object:", invitation); // Debugging log + if (invitation) { + invitation.invitation = JSON.stringify(invitation.invitation, null, 4); + } + req.invitation = invitation; + next(); } -router.get('/accept', handleAcceptConnectionGet); - -router.post('/accept', [ - check('invitation_object') - .notEmpty() - .withMessage('Invitation object is required'), - check('invitation_object') - .custom((value) => { - try { - JSON.parse(value); - return true; - } catch (error) { - throw new Error(`Invalid object: ${error.message}`); - } - }) -], handleAcceptConnectionPost, handleAcceptConnectionGet); +router.get("/accept", handleAcceptConnectionGet); + +router.post( + "/accept", + [ + check("invitation_object") + .notEmpty() + .withMessage("Invitation object is required"), + check("invitation_object").custom((value) => { + try { + JSON.parse(value); + return true; + } catch (error) { + throw new Error(`Invalid object: ${error.message}`); + } + }), + ], + handleAcceptConnectionPost, + handleAcceptConnectionGet +); async function handleAcceptConnectionGet(req, res, next) { - navLinkService.setCustomNavLinkActive('/connections/accept'); - - if (req.errors) { - res.status(422); - } - - res.render('accept_connection', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - errors: req.errors || null, - invitation: req.errors && req.invitaion || null - }); + navLinkService.setCustomNavLinkActive("/connections/accept"); + + if (req.errors) { + res.status(422); + } + + res.render("accept_connection", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + errors: req.errors || null, + invitation: (req.errors && req.invitaion) || null, + }); } async function handleAcceptConnectionPost(req, res, next) { - const agentService = require('../services/AgentService'); - - const errors = validationResult(req); - if (!errors.isEmpty()) { - req.errors = errors.array({ onlyFirstError: true }); - req.invitaion = req.body; - return next(); - } - - await agentService.receiveInvitation(req.body.invitation_object); - res.status(201).redirect('/connections/active'); + const agentService = require("../services/AgentService"); + + const errors = validationResult(req); + if (!errors.isEmpty()) { + req.errors = errors.array({ onlyFirstError: true }); + req.invitation = req.body; + console.error("Validation errors:", req.errors); // Debugging log + return next(); + } + + console.log("Received invitation object:", req.body.invitation_object); // Debugging log + + try { + const response = await agentService.receiveInvitation( + req.body.invitation_object + ); + console.log("API response from receiveInvitation:", response); // Debugging log + res.status(201).redirect("/connections/active"); + } catch (error) { + console.error("Error in handleAcceptConnectionPost:", error); // Debugging log + res.status(500).send("Failed to process invitation"); + } } -router.get('/:id/remove', async function (req, res, next) { - const connectionId = req.params.id; - const state = req.query.state || ''; +router.get("/:id/remove", async function (req, res, next) { + const connectionId = req.params.id; + const state = req.query.state || ""; - if (connectionId) { - const agentService = require('../services/AgentService'); - await agentService.removeConnection(connectionId); - } + if (connectionId) { + const agentService = require("../services/AgentService"); + await agentService.removeConnection(connectionId); + } - const redirectUrl = `/connections/${state === 'invitation' ? 'pending' : 'active'}`; - res.redirect(redirectUrl); + const redirectUrl = `/connections/${ + state === "invitation" ? "pending" : "active" + }`; + res.redirect(redirectUrl); }); -module.exports = router; \ No newline at end of file +module.exports = router; diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/routes/proof.js b/AliceFaberAcmeDemo/controllers/acme-controller/routes/proof.js index d1d4813..f4797ce 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/routes/proof.js +++ b/AliceFaberAcmeDemo/controllers/acme-controller/routes/proof.js @@ -1,131 +1,142 @@ -const express = require('express'); +const express = require("express"); const router = express.Router(); -const { check, validationResult } = require('express-validator'); +const { check, validationResult } = require("express-validator"); -const NavLinkService = require('../services/NavLinkService'); +const NavLinkService = require("../services/NavLinkService"); const navLinkService = new NavLinkService(); navLinkService.registerCustomLinks([ - { "label": "Proofs", "url": "/proofs" }, - { "label": "Request Proof", "url": "/proofs/request" } + { label: "Proofs", url: "/proofs" }, + { label: "Request Proof", url: "/proofs/request" }, ]); const proofJSON = { - "connection_id": "", - "proof_request": { - "name": "Proof of Education", - "version": "1.0", - "requested_attributes": { + comment: "This is a comment about the reason for the proof", + connection_id: "", + presentation_request: { + indy: { + name: "Proof of Education", + version: "1.0", + requested_attributes: { "0_name_uuid": { - "name": "name", - "restrictions": [ + name: "name", + restrictions: [ { - "cred_def_id": "" - } - ] + cred_def_id: "", + }, + ], }, "0_date_uuid": { - "name": "date", - "restrictions": [ + name: "date", + restrictions: [ { - "cred_def_id": "" - } - ] + cred_def_id: "", + }, + ], }, "0_degree_uuid": { - "name": "degree", - "restrictions": [ + name: "degree", + restrictions: [ { - "cred_def_id": "" - } - ] + cred_def_id: "", + }, + ], }, "0_self_attested_thing_uuid": { - "name": "self_attested_thing" - } + name: "self_attested_thing", + }, }, - "requested_predicates": { + requested_predicates: { "0_age_GE_uuid": { - "name": "birthdate_dateint", - "p_type": ">=", - "p_value": 18, - "restrictions": [ + name: "birthdate_dateint", + p_type: ">=", + p_value: 18, + restrictions: [ { - "cred_def_id": "" - } - ] - } - } - } - } + cred_def_id: "", + }, + ], + }, + }, + }, + }, +}; router.use(function (req, res, next) { - navLinkService.clearLinkClasses(); - navLinkService.setNavLinkActive('/proofs'); - next(); + navLinkService.clearLinkClasses(); + navLinkService.setNavLinkActive("/proofs"); + next(); }); -router.get('/', async function(req, res, next) { - const agentService = require('../services/AgentService'); +router.get("/", async function (req, res, next) { + const agentService = require("../services/AgentService"); - const proofs = await agentService.getProofRequests(); + const proofs = await agentService.getProofRequests(); - navLinkService.setCustomNavLinkActive('/proofs'); - res.render('proof', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - proofs: proofs - }); + navLinkService.setCustomNavLinkActive("/proofs"); + res.render("proof", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + proofs: proofs, + }); }); -router.get('/request', handleRequestProofGet); +router.get("/request", handleRequestProofGet); -router.post('/request', [ - check('connection_id') - .notEmpty() - .withMessage('Connection ID is required'), - check('credential_definition_id') - .notEmpty() - .withMessage('Credential Definition ID is required'), -], handleRequestProofPost, handleRequestProofGet); +router.post( + "/request", + [ + check("connection_id").notEmpty().withMessage("Connection ID is required"), + check("credential_definition_id") + .notEmpty() + .withMessage("Credential Definition ID is required"), + ], + handleRequestProofPost, + handleRequestProofGet +); async function handleRequestProofGet(req, res, next) { - const agentService = require('../services/AgentService'); - const allConnections = await agentService.getConnections(); - const connections = allConnections.filter(connection => connection.state === 'active' || connection.state === 'request'); - - if (req.errors) { - res.status(422); - } - - navLinkService.setCustomNavLinkActive('/proofs/request'); - - res.render('request_proof', { - navLinks: navLinkService.getNavLinks(), - customNavLinks: navLinkService.getCustomNavLinks(), - connections, - errors: req.errors || null, - error_keys: (req.errors || []).map(error => error.param), - proof: { - proof: (req.errors && req.proof.proof_object) || JSON.stringify(proofJSON, null, 4), - connectionId: req.errors && req.proof.connection_id, - credentialDefinitionId: req.errors && req.proof.credential_definition_id, - } - }); + const agentService = require("../services/AgentService"); + const allConnections = await agentService.getConnections(); + const connections = allConnections.filter( + (connection) => + connection.state === "active" || connection.state === "request" + ); + + if (req.errors) { + res.status(422); + } + + navLinkService.setCustomNavLinkActive("/proofs/request"); + + res.render("request_proof", { + navLinks: navLinkService.getNavLinks(), + customNavLinks: navLinkService.getCustomNavLinks(), + connections, + errors: req.errors || null, + error_keys: (req.errors || []).map((error) => error.param), + proof: { + proof: + (req.errors && req.proof.proof_object) || + JSON.stringify(proofJSON, null, 4), + connectionId: req.errors && req.proof.connection_id, + credentialDefinitionId: req.errors && req.proof.credential_definition_id, + }, + }); } async function handleRequestProofPost(req, res, next) { - const agentService = require('../services/AgentService'); + const agentService = require("../services/AgentService"); - const errors = validationResult(req); + const errors = validationResult(req); - if (!errors.isEmpty()) { - req.errors = errors.array(); - req.proof = req.body; - return next(); - } + if (!errors.isEmpty()) { + req.errors = errors.array(); + req.proof = req.body; + return next(); + } - await agentService.sendProofRequest(req.body.proof_object); - res.status(201).redirect('/proofs'); + await agentService.sendProofRequest(req.body.proof_object); + res.status(201).redirect("/proofs"); } -module.exports = router; \ No newline at end of file +module.exports = router; diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/services/AgentService.js b/AliceFaberAcmeDemo/controllers/acme-controller/services/AgentService.js index ccf1a61..4a61e2a 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/services/AgentService.js +++ b/AliceFaberAcmeDemo/controllers/acme-controller/services/AgentService.js @@ -1,159 +1,143 @@ -const http = require('http'); +const http = require("http"); +const axios = require("axios"); -const hostname = process.env.ACME_AGENT_HOST || 'localhost'; +const hostname = process.env.ACME_AGENT_HOST || "host.docker.internal"; const port = 8041; -console.log('Agent is running on: ' + `http://${hostname}:${port}`); - -function httpAsync(options, body) { - return new Promise(function (resolve, reject) { - const req = http.request(options, (res) => { - const { statusCode } = res; - const contentType = res.headers['content-type']; - - let e; - if (statusCode !== 200) { - e = new Error('Request Failed.\n' + `Status Code: ${statusCode}`); - } else if (!/^application\/json/.test(contentType)) { - e = new Error('Invalid content-type.\n' + `Expected application/json but received ${contentType}`); - } - if (e) { - // Consume response data to free up memory - res.resume(); - return reject(e); - } - - res.setEncoding('utf8'); - let rawData = ''; - res.on('data', (chunk) => { rawData += chunk; }); - res.on('end', () => { - try { - const parsedData = JSON.parse(rawData); - return resolve(parsedData); - } catch (e) { - return reject(e); - } - }); - }).on('error', (e) => { - return reject(e); - }); - - if (body) { - req.write(body || ''); - } - - req.end(); - }); -} +console.log("Agent is running on: " + `http://${hostname}:${port}`); class AgentService { - async getStatus() { - try { - const response = await httpAsync({ - hostname: hostname, - port: port, - path: '/status', - method: 'GET' - }); - return response; - } catch (error) { - console.error(error); - return null; - } + async getStatus() { + try { + const response = await axios.get(`http://${hostname}:${port}/status`); + return response.data; + } catch (error) { + console.error(error); + return null; } + } - async getConnections() { - try { - const response = await httpAsync({ - hostname: hostname, - port: port, - path: '/connections', - method: 'GET' - }); - return response.results; - } catch (error) { - console.error(error); - return []; - } + async getConnections() { + try { + const response = await axios.get( + `http://${hostname}:${port}/connections` + ); + return response.data.results; + } catch (error) { + console.error(error); + return []; } + } - async createInvitation() { - try { - const response = await httpAsync({ - hostname: hostname, - port: port, - path: '/connections/create-invitation', - method: 'POST' - }); - return response; - } catch (error) { - console.error(error); - return {}; + async createInvitation() { + try { + // Define the request payload + const invitationRequest = { + handshake_protocols: ["https://didcomm.org/didexchange/1.1"], + }; + + // Make the POST request using axios + const response = await axios.post( + `http://${hostname}:${port}/out-of-band/create-invitation`, + invitationRequest, + { + headers: { + "Content-Type": "application/json", + }, } + ); + + // Log the invitation data + console.log("Invitation created successfully:", response.data); + + return response.data; + } catch (error) { + // Log any errors + console.error("Error creating invitation:", error.message); + return {}; } + } - async receiveInvitation(invitation) { - try { - const response = await httpAsync({ - hostname: hostname, - port: port, - path: '/connections/receive-invitation', - method: 'POST' - }, invitation); - return response; - } catch (error) { - console.error(error); - return; - } + async receiveInvitation(invitation) { + try { + // Step 1: Receive the invitation + const receiveInvitationUrl = `http://${hostname}:${port}/out-of-band/receive-invitation`; + console.log( + "Sending request to /out-of-band/receive-invitation with URL:", + receiveInvitationUrl + ); + console.log("Request body:", JSON.stringify(invitation)); + + const response = await axios.post(receiveInvitationUrl, invitation, { + headers: { + "Content-Type": "application/json", + }, + }); + + console.log( + "API response from /out-of-band/receive-invitation:", + response.data + ); + + return response.data; // Return only the response from receive-invitation + } catch (error) { + console.error("Error in receiveInvitation:", error.message); + if (error.response) { + console.error("Response data:", error.response.data); + console.error("Response status:", error.response.status); + } + throw error; // Propagate the error to the caller } + } - async removeConnection(connectionId) { - try { - await httpAsync({ - hostname: hostname, - port: port, - path: `/connections/${connectionId}/remove`, - method: 'POST' - }); - } catch (error) { - console.error(error); - } finally { - return; - } + async removeConnection(connectionId) { + if (!connectionId) { + console.error("Must provide a connection ID"); + return; } - async getProofRequests() { - try { - const response = await httpAsync({ - hostname: hostname, - port: port, - path: '/present-proof/records', - method: 'GET' - }); - return response.results; - } catch (error) { - console.error(error); - return []; - } + console.log(`Removing connection with ID: ${connectionId}`); + + try { + await axios.delete( + `http://${hostname}:${port}/connections/${connectionId}` + ); + console.log(`Connection with ID ${connectionId} removed successfully`); + } catch (error) { + console.error( + `Failed to remove connection with ID ${connectionId}:`, + error + ); + } + } + + async getProofRequests() { + try { + const response = await axios.get( + `http://${hostname}:${port}/present-proof-2.0/records` + ); + return response.data.results; + } catch (error) { + console.error(error); + return []; } + } - async sendProofRequest(proofRequest) { - try { - await httpAsync({ - hostname: hostname, - port: port, - path: '/present-proof/send-request', - method: 'POST', - headers: { - 'Content-Type': 'application/json' - } - }, proofRequest); - } catch (error) { - console.error(error); - } finally { - return; + async sendProofRequest(proofRequest) { + try { + await axios.post( + `http://${hostname}:${port}/present-proof-2.0/send-request`, + proofRequest, + { + headers: { + "Content-Type": "application/json", + }, } + ); + } catch (error) { + console.error(error); } + } } -module.exports = new AgentService(); \ No newline at end of file +module.exports = new AgentService(); diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/views/accept_connection.hbs b/AliceFaberAcmeDemo/controllers/acme-controller/views/accept_connection.hbs index 4637d35..5431b33 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/views/accept_connection.hbs +++ b/AliceFaberAcmeDemo/controllers/acme-controller/views/accept_connection.hbs @@ -83,19 +83,28 @@ } } } - + function decode(e) { - try { - const value = e.target.value; - if (!value) { - return; - } - const url = new URL(value); - const invitationParam = url.searchParams.get('c_i'); - if (!invitationParam) { - throw new Error(); - } + try { + const value = e.target.value; + if (!value) { + return; + } + const url = new URL(value); + + // Try to get the 'c_i' parameter first + let invitationParam = url.searchParams.get('c_i'); + + // If 'c_i' is not found, try to get the 'oob' parameter + if (!invitationParam) { + invitationParam = url.searchParams.get('oob'); + } + + if (!invitationParam) { + throw new Error('No valid invitation parameter found in the URL.'); + } + // Decode the Base64-encoded invitation parameter objectInput.value = JSON.stringify(JSON.parse(atob(invitationParam)), null, 4); removeInvalidObjectErr(); } catch (error) { diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/views/partials/proof/proof_card.hbs b/AliceFaberAcmeDemo/controllers/acme-controller/views/partials/proof/proof_card.hbs index ed40a7c..cb80c10 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/views/partials/proof/proof_card.hbs +++ b/AliceFaberAcmeDemo/controllers/acme-controller/views/partials/proof/proof_card.hbs @@ -2,9 +2,9 @@
- {{ proof.presentation_request.name }} - {{#if proof.presentation_request.version}} -  ({{ proof.presentation_request.version }}) + {{ proof.by_format.pres_request.indy.name }} + {{#if proof.by_format.pres_request.indy.version}} +  ({{ proof.by_format.pres_request.indy.version }}) {{/if}}
@@ -17,11 +17,46 @@ {{ proof.created_at }}
+
Presentation Exchange ID:  -

{{ proof.presentation_exchange_id }}

+

{{ proof.pres_ex_id }}

+ + {{#if proof.by_format.pres_request.indy.requested_attributes}} +
+ Requested Attributes: +
    + {{#each proof.by_format.pres_request.indy.requested_attributes}} +
  • {{this.name}}
    • + {{/each}} +
+
+ {{/if}} + + {{#if proof.by_format.pres.indy.requested_proof.revealed_attrs}} +
+ Revealed Attributes: +
    + {{#each proof.by_format.pres.indy.requested_proof.revealed_attrs}} +
  • {{@key}}: {{this.raw}}
    • + {{/each}} +
+
+ {{/if}} + + {{#if proof.by_format.pres.indy.requested_proof.self_attested_attrs}} +
+ Self-Attested Attributes: +
    + {{#each proof.by_format.pres.indy.requested_proof.self_attested_attrs}} +
  • {{@key}}: {{this}}
    • + {{/each}} +
+
+ {{/if}} + {{#eq proof.verified 'true'}}
@@ -30,9 +65,28 @@   Verified
+ {{else}} + {{#if (or (eq proof.state 'done') (eq proof.state 'abandoned'))}} +
+ + + +   + Rejected +
+ {{else}} +
+ + + +   + Processing +
+ {{/if}} {{/eq}}
+

Updated at {{ proof.updated_at }} diff --git a/AliceFaberAcmeDemo/controllers/acme-controller/views/request_proof.hbs b/AliceFaberAcmeDemo/controllers/acme-controller/views/request_proof.hbs index 41b9880..79b76fa 100644 --- a/AliceFaberAcmeDemo/controllers/acme-controller/views/request_proof.hbs +++ b/AliceFaberAcmeDemo/controllers/acme-controller/views/request_proof.hbs @@ -88,20 +88,22 @@ const value = e.target.value || ''; const proof = JSON.parse(proofObject.value); - Object.keys(proof.proof_request.requested_attributes) - .filter(attr => proof.proof_request.requested_attributes[attr].restrictions) + // Fix the correct path + Object.keys(proof.presentation_request.indy.requested_attributes) + .filter(attr => proof.presentation_request.indy.requested_attributes[attr].restrictions) .forEach(attr => { - proof.proof_request.requested_attributes[attr].restrictions[0].cred_def_id = value + proof.presentation_request.indy.requested_attributes[attr].restrictions[0].cred_def_id = value; }); - Object.keys(proof.proof_request.requested_predicates) - .filter(attr => proof.proof_request.requested_predicates[attr].restrictions) + + Object.keys(proof.presentation_request.indy.requested_predicates) + .filter(attr => proof.presentation_request.indy.requested_predicates[attr].restrictions) .forEach(attr => { - proof.proof_request.requested_predicates[attr].restrictions[0].cred_def_id = value + proof.presentation_request.indy.requested_predicates[attr].restrictions[0].cred_def_id = value; }); + proofObject.value = JSON.stringify(proof, null, 4); } catch (error) { - console.error(error); - return; + console.error("Error updating credential definition ID:", error); } }, 300); diff --git a/AliceFaberAcmeDemo/controllers/alice-controller/docker-compose.yml b/AliceFaberAcmeDemo/controllers/alice-controller/docker-compose.yml new file mode 100644 index 0000000..1e7f705 --- /dev/null +++ b/AliceFaberAcmeDemo/controllers/alice-controller/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3" +services: + alice-controller: + build: . + ports: + - "8130:80" # Expose a different port for the controller + environment: + - AGENT_HOST=host.docker.internal + - AGENT_PORT=8030 + networks: + - aca +networks: + aca: diff --git a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/connection/components/accept-connection/accept-connection.component.ts b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/connection/components/accept-connection/accept-connection.component.ts index 1f0d7e4..2ee6f63 100644 --- a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/connection/components/accept-connection/accept-connection.component.ts +++ b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/connection/components/accept-connection/accept-connection.component.ts @@ -1,51 +1,67 @@ -import { Component, OnInit } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormGroup, Validators, UntypedFormControl, AsyncValidatorFn, ValidationErrors } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit } from "@angular/core"; +import { + UntypedFormBuilder, + UntypedFormGroup, + Validators, + UntypedFormControl, + AsyncValidatorFn, + ValidationErrors, +} from "@angular/forms"; +import { Router } from "@angular/router"; -import { AgentService } from 'src/app/services/agent.service'; +import { AgentService } from "src/app/services/agent.service"; -import { map, debounceTime, distinctUntilChanged, filter, tap } from 'rxjs/operators'; -import { Observable, timer, BehaviorSubject } from 'rxjs'; +import { + map, + debounceTime, + distinctUntilChanged, + filter, + tap, +} from "rxjs/operators"; +import { Observable, timer, BehaviorSubject } from "rxjs"; function debouncedInvitationValidator(): AsyncValidatorFn { return (control: UntypedFormControl): Observable => { - return timer(300) - .pipe( - map(() => { - try { - JSON.parse(control.value); - return null; - } catch (error) { - return { json: error.message }; - } - }) - ); + return timer(300).pipe( + map(() => { + try { + JSON.parse(control.value); + return null; + } catch (error) { + return { json: error.message }; + } + }) + ); }; } @Component({ - selector: 'app-accept-connection', - templateUrl: './accept-connection.component.html', - styleUrls: ['./accept-connection.component.scss'] + selector: "app-accept-connection", + templateUrl: "./accept-connection.component.html", + styleUrls: ["./accept-connection.component.scss"], }) export class AcceptConnectionComponent implements OnInit { form: UntypedFormGroup; invitationUrlError$ = new BehaviorSubject(null); - constructor(private agentService: AgentService, private fb: UntypedFormBuilder, private router: Router) { + constructor( + private agentService: AgentService, + private fb: UntypedFormBuilder, + private router: Router + ) { this.form = this.fb.group({ invitation: [null, Validators.required, debouncedInvitationValidator()], - invitationUrl: [null, Validators.nullValidator] + invitationUrl: [null, Validators.nullValidator], }); } public get invitation(): UntypedFormControl { - return this.form && this.form.get('invitation') as UntypedFormControl; + return this.form && (this.form.get("invitation") as UntypedFormControl); } public get invitationUrl(): UntypedFormControl { - return this.form && this.form.get('invitationUrl') as UntypedFormControl; + return this.form && (this.form.get("invitationUrl") as UntypedFormControl); } ngOnInit() { @@ -58,18 +74,31 @@ export class AcceptConnectionComponent implements OnInit { map((value: string) => { try { const url = new URL(value); - const invitationParam = url.searchParams.get('c_i'); + + // Try to get the 'c_i' parameter first + let invitationParam = url.searchParams.get("c_i"); + + // If 'c_i' is not found, try to get the 'oob' parameter if (!invitationParam) { - throw new Error(); + invitationParam = url.searchParams.get("oob"); } - this.invitation.setValue(JSON.stringify(JSON.parse(atob(invitationParam)), null, 4)); + if (!invitationParam) { + throw new Error( + "No valid invitation parameter found in the URL." + ); + } + + // Decode the Base64-encoded invitation parameter + this.invitation.setValue( + JSON.stringify(JSON.parse(atob(invitationParam)), null, 4) + ); this.invitation.markAsDirty(); this.invitation.updateValueAndValidity(); } catch (error) { - this.invitationUrlError$.next('Invalid invitation URL'); + this.invitationUrlError$.next("Invalid invitation URL"); } - }), + }) ) .subscribe(); } @@ -78,11 +107,9 @@ export class AcceptConnectionComponent implements OnInit { if (!this.form.valid) { return; } - this.agentService.receiveInvitation(this.invitation.value) - .pipe( - map(() => this.router.navigateByUrl('/connections')) - ) + this.agentService + .receiveInvitation(this.invitation.value) + .pipe(map(() => this.router.navigateByUrl("/connections"))) .subscribe(); } - } diff --git a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/proof/components/proof-card/proof-card.component.html b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/proof/components/proof-card/proof-card.component.html index 230dd28..33f3a5a 100644 --- a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/proof/components/proof-card/proof-card.component.html +++ b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/proof/components/proof-card/proof-card.component.html @@ -1,27 +1,32 @@

-
-
-
- {{ proof?.presentation_request?.name }} -  ({{ proof?.presentation_request?.version }}) -
- - Sent  - Received  - - {{ proof?.created_at | toDate | date:'medium' }} -
-
-
- Presentation Exchange ID:  -

{{ proof?.presentation_exchange_id }}

-
-
+
+
+
+ {{ proof?.by_format?.pres_request?.indy?.name }} + +  ({{ proof?.by_format?.pres_request?.indy?.version }}) + +
+ + Sent  + Received  + + {{ + proof?.created_at | toDate | date : "medium" + }}
-
-

- Updated at {{ proof?.updated_at | toDate | date:'medium' }} -

+
+
+ Presentation Exchange ID:  +

{{ proof?.pres_ex_id }}

+
-
\ No newline at end of file +
+
+

+ Updated at {{ proof?.updated_at | toDate | date : "medium" }} +

+
+
diff --git a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/services/agent.service.ts b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/services/agent.service.ts index c56141b..f7a35d1 100644 --- a/AliceFaberAcmeDemo/controllers/alice-controller/src/app/services/agent.service.ts +++ b/AliceFaberAcmeDemo/controllers/alice-controller/src/app/services/agent.service.ts @@ -1,79 +1,111 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { Injectable } from "@angular/core"; +import { HttpClient, HttpHeaders } from "@angular/common/http"; -import { AgentStatus } from '../enums/agent-status.enum'; +import { AgentStatus } from "../enums/agent-status.enum"; -import { Observable, of } from 'rxjs'; -import { catchError, switchMap } from 'rxjs/operators'; +import { Observable, of } from "rxjs"; +import { catchError, switchMap, tap } from "rxjs/operators"; @Injectable({ - providedIn: 'root' + providedIn: "root", }) export class AgentService { - - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) {} getStatus(): Observable { - return this.http.get('/status') - .pipe( - switchMap(() => of(AgentStatus.Up)), - catchError(this.handleError('getStatus', AgentStatus.Down)) - ); + console.log("Getting agent status..."); + return this.http.get("/status").pipe( + tap((response) => console.log("Status response:", response)), + switchMap(() => of(AgentStatus.Up)), + catchError(this.handleError("getStatus", AgentStatus.Down)) + ); } getConnections(): Observable { - return this.http.get('/connections') - .pipe( - switchMap((response: any) => of(response.results)), - catchError(this.handleError('getConnections', [])) - ); + console.log("Getting connections..."); + return this.http.get("/connections").pipe( + tap((response) => console.log("Connections response:", response)), + switchMap((response: any) => of(response.results)), + catchError(this.handleError("getConnections", [])) + ); } removeConnection(connectionId: string): Observable { if (!connectionId) { - console.error('Must provide a connection ID'); - return; + console.error("Must provide a connection ID"); + return of(null); // Return an observable with null if no connection ID is provided } - return this.http.post(`/connections/${connectionId}/remove`, {}) + + console.log(`Removing connection with ID: ${connectionId}`); + + const headers = new HttpHeaders({ + "Content-Type": "application/json", + Accept: "application/json", + }); + + return this.http + .delete(`/connections/${connectionId}`, { headers }) .pipe( + tap(() => + console.log(`Connection with ID ${connectionId} removed successfully`) + ), switchMap(() => of(connectionId)), - catchError(this.handleError('removeConnection', null)) + catchError(this.handleError("removeConnection", null)) ); } createInvitation(): Observable { - return this.http.post('/connections/create-invitation', {}) + console.log("Creating invitation2.2..."); + const invitationRequest = { + handshake_protocols: ["https://didcomm.org/didexchange/1.1"], + use_public_did: false, + }; + return this.http + .post("/out-of-band/create-invitation", invitationRequest) .pipe( + tap((response) => console.log("Create invitation response:", response)), switchMap((response: any) => of(response)), - catchError(this.handleError('createInvitation', null)) + catchError(this.handleError("createInvitation", null)) ); } receiveInvitation(invitation: any): Observable { - return this.http.post('/connections/receive-invitation', invitation) + console.log("Receiving invitation..."); + + const headers = new HttpHeaders({ + "Content-Type": "application/json", + Accept: "application/json", + }); + + return this.http + .post("/out-of-band/receive-invitation", invitation, { headers }) .pipe( - switchMap((response: any) => of(response)), - catchError(this.handleError('receiveInvitation', null)) + tap((response) => + console.log("Receive invitation response:", response) + ), + catchError(this.handleError("receiveInvitation", null)) ); } getCredentials(): Observable { - return this.http.get('/credentials') - .pipe( - switchMap((response: any) => of(response.results)), - catchError(this.handleError('getCredentials', [])) - ); + console.log("Getting credentials..."); + return this.http.get("/credentials").pipe( + tap((response) => console.log("Credentials response:", response)), + switchMap((response: any) => of(response.results)), + catchError(this.handleError("getCredentials", [])) + ); } getProofs(): Observable { - return this.http.get('/present-proof/records') - .pipe( - switchMap((response: any) => of(response.results)), - catchError(this.handleError('getProofs', [])) - ); + console.log("Getting proofs..."); + return this.http.get("/present-proof-2.0/records").pipe( + tap((response) => console.log("Proofs response:", response)), + switchMap((response: any) => of(response.results)), + catchError(this.handleError("getProofs", [])) + ); } - private handleError(operation = 'operation', result?: T) { + private handleError(operation = "operation", result?: T) { return (error: any): Observable => { console.error(`${operation} failed: ${error.message}`); // Prevent application from completely erroring out. diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/AcceptConnection.razor b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/AcceptConnection.razor index 63653b7..be4251c 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/AcceptConnection.razor +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/AcceptConnection.razor @@ -16,7 +16,7 @@
+ @bind-Value="_acceptConnectionModel.InvitationObject" cols="30" rows="10">
@@ -25,7 +25,7 @@
+ @bind-Value="_acceptConnectionModel.InvitationUrl" @oninput="_parseInvitationUrl"> @if (_invitationUrlError) { @@ -54,21 +54,30 @@ { _invitationUrlError = false; var value = e.Value.ToString(); - if (value == null || value == "") + if (string.IsNullOrEmpty(value)) { return; } try { var uri = new Uri(value); + // Try to get the 'c_i' parameter first var invitationParam = HttpUtility.ParseQueryString(uri.Query).Get("c_i"); - if (invitationParam == null || invitationParam == "") + + // If 'c_i' is not found, try to get the 'oob' parameter + if (string.IsNullOrEmpty(invitationParam)) + { + invitationParam = HttpUtility.ParseQueryString(uri.Query).Get("oob"); + } + + if (string.IsNullOrEmpty(invitationParam)) { - throw new Exception(); + throw new Exception("No valid invitation parameter found in the URL."); } + // Decode the Base64-encoded invitation parameter var data = System.Convert.FromBase64String(invitationParam); - var invitationObject = JsonConvert.DeserializeObject(System.Text.ASCIIEncoding.ASCII.GetString(data)); + var invitationObject = JsonConvert.DeserializeObject(System.Text.Encoding.UTF8.GetString(data)); _acceptConnectionModel.InvitationObject = invitationObject.ToString(); } catch (Exception ex) diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/NewConnection.razor b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/NewConnection.razor index 85c1d41..30434b3 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/NewConnection.razor +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Connection/Components/NewConnection.razor @@ -42,7 +42,7 @@
- +
@@ -62,8 +62,23 @@ if (Invitation != null && Invitation.HasValues) { InvitationObject = Invitation["invitation"].ToString(); - InvitationUrl = Invitation["invitation_url"].ToString(); - QrCodeContent = GenerateQrCode(InvitationUrl); + try + { + InvitationUrl = Invitation["invitation_url"].ToString(); + QrCodeContent = GenerateQrCode(InvitationUrl); + } + catch (UriFormatException ex) + { + Console.Error.WriteLine("Invalid URI: " + ex.Message); + InvitationUrl = "Error: Invalid URI"; + QrCodeContent = string.Empty; + } + catch (Exception ex) + { + Console.Error.WriteLine("An error occurred: " + ex.Message); + InvitationUrl = "Error: Unable to load invitation"; + QrCodeContent = string.Empty; + } } base.StateHasChanged(); } @@ -75,9 +90,11 @@ private string GenerateQrCode(string invitationUrl) { - var qrValue = invitationUrl; + try + { + var qrValue = invitationUrl; - var barcodeWriter = new BarcodeWriterSvg + var barcodeWriter = new BarcodeWriterSvg { Format = BarcodeFormat.QR_CODE, Options = new QrCodeEncodingOptions @@ -86,10 +103,16 @@ Width = 300 } }; + + var qrCodeImage = barcodeWriter.Write(qrValue); + var qrCodeContent = qrCodeImage.Content; - var qrCodeImage = barcodeWriter.Write(qrValue); - var qrCodeContent = qrCodeImage.Content; - - return qrCodeContent; + return qrCodeContent; + } + catch (UriFormatException ex) + { + Console.Error.WriteLine("Invalid URI: " + ex.Message); + return string.Empty; + } } } diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Credential/Credential.razor b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Credential/Credential.razor index 6fa468b..4e2ab99 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Credential/Credential.razor +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Credential/Credential.razor @@ -80,18 +80,24 @@ public JArray Connections = new JArray(); private static string _defaultCredential = @"{ - 'comment': 'string', - 'credential_proposal': { - '@type': 'did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/issue-credential/1.0/credential-preview', + 'auto_remove': true, + 'comment': 'This is your degree', + 'connection_id': '', + 'credential_preview': { + '@type': 'issue-credential/2.0/credential-preview', 'attributes': [] }, - 'schema_issuer_did': '', - 'connection_id': '', - 'schema_version': '', - 'schema_id': '', - 'issuer_did': '', - 'cred_def_id': '', - 'schema_name': '' + 'filter': { + 'indy': { + 'cred_def_id': '', + 'issuer_did': '', + 'schema_id': '', + 'schema_issuer_did': '', + 'schema_name': '', + 'schema_version': '' + } + }, + 'trace': false }"; private async void _handleValidSubmit() @@ -101,18 +107,18 @@ var credentialDefinitionId = _newCredentialModel.CredentialDefinitionId; var schemaArr = schemaId.Split(":"); - credential["schema_issuer_did"] = schemaArr[0]; - credential["schema_version"] = schemaArr[3]; - credential["schema_id"] = schemaId; - credential["schema_name"] = schemaArr[2]; + credential["filter"]["indy"]["schema_issuer_did"] = schemaArr[0]; + credential["filter"]["indy"]["schema_version"] = schemaArr[3]; + credential["filter"]["indy"]["schema_id"] = schemaId; + credential["filter"]["indy"]["schema_name"] = schemaArr[2]; var credDefArr = credentialDefinitionId.Split(":"); - credential["issuer_did"] = credDefArr[0]; - credential["cred_def_id"] = credentialDefinitionId; + credential["filter"]["indy"]["issuer_did"] = credDefArr[0]; + credential["filter"]["indy"]["cred_def_id"] = credentialDefinitionId; credential["connection_id"] = _newCredentialModel.ConnectionId; - credential["credential_proposal"]["attributes"] = JArray.Parse(_newCredentialModel.CredentialAttributesObject); + credential["credential_preview"]["attributes"] = JArray.Parse(_newCredentialModel.CredentialAttributesObject); await AgentService.SendCredential(credential.ToString()); Navigation.NavigateTo("/connections/active"); @@ -169,3 +175,4 @@ } } + diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/FaberController.csproj b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/FaberController.csproj index 0b012c9..73cfd81 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/FaberController.csproj +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/FaberController.csproj @@ -27,5 +27,7 @@ + + \ No newline at end of file diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Services/FCAgentService.cs b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Services/FCAgentService.cs index a91a7a5..e9989df 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Services/FCAgentService.cs +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Services/FCAgentService.cs @@ -4,19 +4,20 @@ using System.Text; using System.Threading.Tasks; using FaberController.Enums; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace FaberController.Services { public class FCAgentService { - public FCAgentService(HttpClient Http) + private readonly HttpClient _http; + + public FCAgentService(HttpClient http) { - _http = Http; + _http = http; } - private HttpClient _http { get; } - public async Task GetStatus() { try @@ -52,23 +53,28 @@ public async Task GetConnections() public async Task RemoveConnection(string connectionId) { - if (connectionId == null || connectionId == "") + if (string.IsNullOrEmpty(connectionId)) { Console.Error.WriteLine("Must provide a connection ID"); return new JObject(); } + try { - using var content = new StringContent(""); - var response = await _http.PostAsync(string.Format("/connections/{0}/remove", connectionId), content); + var response = await _http.DeleteAsync($"/connections/{connectionId}"); response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); - return JObject.Parse(responseString); + return !string.IsNullOrEmpty(responseString) ? JObject.Parse(responseString) : new JObject(); + } + catch (HttpRequestException httpEx) + { + Console.Error.WriteLine($"HTTP Request Error: {httpEx.Message}"); + return new JObject(); } catch (Exception ex) { - Console.Error.WriteLine(ex); + Console.Error.WriteLine($"Error: {ex.Message}"); return new JObject(); } } @@ -77,12 +83,20 @@ public async Task CreateInvitation() { try { - using var content = new StringContent(""); - var response = await _http.PostAsync("/connections/create-invitation", content); + var invitationRequest = new + { + handshake_protocols = new[] { "https://didcomm.org/didexchange/1.1" } + }; + + var content = new StringContent(JsonConvert.SerializeObject(invitationRequest), Encoding.UTF8, "application/json"); + var response = await _http.PostAsync("/out-of-band/create-invitation", content); response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); - return JObject.Parse(responseString); + var invitation = JObject.Parse(responseString); + + Console.WriteLine("Invitation created successfully: " + invitation.ToString()); + return invitation; } catch (Exception ex) { @@ -95,18 +109,19 @@ public async Task ReceiveInvitation(string invitation) { try { - - using var content = new StringContent(invitation); - var response = await _http.PostAsync("/connections/receive-invitation", content); - + using var content = new StringContent(invitation, Encoding.UTF8, "application/json"); + var response = await _http.PostAsync("/out-of-band/receive-invitation", content); response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); - return JObject.Parse(responseString); + var invitationResponse = JObject.Parse(responseString); + + Console.WriteLine("Invitation received successfully."); + return invitationResponse; } catch (Exception ex) { - Console.Error.WriteLine(ex); + Console.Error.WriteLine($"Error in ReceiveInvitation: {ex.Message}"); return new JObject(); } } @@ -121,7 +136,6 @@ public async Task GetSchemas() var responseString = await response.Content.ReadAsStringAsync(); var jsonResponse = JObject.Parse(responseString); return jsonResponse.Value("schema_ids"); - } catch (Exception ex) { @@ -134,7 +148,7 @@ public async Task GetSchema(string schemaId) { try { - var response = await _http.GetAsync(string.Format("/schemas/{0}", schemaId)); + var response = await _http.GetAsync($"/schemas/{schemaId}"); response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); @@ -157,7 +171,6 @@ public async Task GetCredentialDefinitions() var responseString = await response.Content.ReadAsStringAsync(); var jsonResponse = JObject.Parse(responseString); return jsonResponse.Value("credential_definition_ids"); - } catch (Exception ex) { @@ -170,7 +183,7 @@ public async Task GetCredentialDefinition(string credentialDefinitionId { try { - var response = await _http.GetAsync(string.Format("/credential-definitions/{0}", credentialDefinitionId)); + var response = await _http.GetAsync($"/credential-definitions/{credentialDefinitionId}"); response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); @@ -188,11 +201,15 @@ public async Task SendCredential(string credential) { try { + Console.WriteLine("Sending Credential Request:"); + Console.WriteLine(credential); + using var content = new StringContent(credential, Encoding.UTF8, "application/json"); - content.Headers.ContentType = new MediaTypeHeaderValue("application/json"); - var response = await _http.PostAsync("/issue-credential/send", content); - response.EnsureSuccessStatusCode(); - var result = await response.Content.ReadAsStringAsync(); + Console.WriteLine("Sending Content Request:"); + Console.WriteLine(content); + + var response = await _http.PostAsync("/issue-credential-2.0/send-offer", content); + response.EnsureSuccessStatusCode(); var responseString = await response.Content.ReadAsStringAsync(); return JObject.Parse(responseString); diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Startup.cs b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Startup.cs index 24f9d3d..7e8c278 100644 --- a/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Startup.cs +++ b/AliceFaberAcmeDemo/controllers/faber-controller/FaberController/Startup.cs @@ -30,13 +30,8 @@ public void ConfigureServices(IServiceCollection services) services.AddServerSideBlazor(); services.AddHttpClient(c => { - var agentUrl = Environment.GetEnvironmentVariable("FABER_AGENT_HOST"); + var agentUrl = "host.docker.internal"; var port = 8021; - - if (agentUrl == null || agentUrl == "") { - agentUrl = "localhost"; - } - var formattedAgentUrl = String.Format("http://{0}:{1}", agentUrl, port); Console.WriteLine("Agent is running on: " + formattedAgentUrl); @@ -46,6 +41,15 @@ public void ConfigureServices(IServiceCollection services) c.DefaultRequestHeaders.Add("User-Agent", "FaberController"); }); services.AddTransient(); + + // Add CORS policy + services.AddCors(options => + { + options.AddPolicy("AllowSpecificOrigin", + builder => builder.WithOrigins("http://localhost:8130") + .AllowAnyHeader() + .AllowAnyMethod()); + }); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -67,6 +71,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseRouting(); + // Use CORS policy + app.UseCors("AllowSpecificOrigin"); + + app.UseAuthorization(); + app.UseEndpoints(endpoints => { endpoints.MapBlazorHub(); diff --git a/AliceFaberAcmeDemo/controllers/faber-controller/docker-compose.yml b/AliceFaberAcmeDemo/controllers/faber-controller/docker-compose.yml new file mode 100644 index 0000000..da157be --- /dev/null +++ b/AliceFaberAcmeDemo/controllers/faber-controller/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3" +services: + faber-controller: + build: . + ports: + - "8120:80" # Expose a different port for the controller + environment: + - AGENT_HOST=host.docker.internal + - AGENT_PORT=8020 + networks: + - aca +networks: + aca: diff --git a/AliceFaberAcmeDemo/run_demo b/AliceFaberAcmeDemo/run_demo index 8b0a201..456529d 100755 --- a/AliceFaberAcmeDemo/run_demo +++ b/AliceFaberAcmeDemo/run_demo @@ -4,90 +4,119 @@ . /dev/stdin <<<"$(cat <(curl -s --raw https://raw.githubusercontent.com/bcgov/DITP-DevOps/main/code/snippets/getDockerHost))" function start_logs() { - cd ./docker - docker-compose logs -f --tail ${TAIL:-10} + cd ./docker + docker compose logs -f --tail ${TAIL:-10} +} + +function start_faber() { + echo "Starting Faber controller..." + cd controllers/faber-controller + docker compose up -d + cd - +} + +function start_alice() { + echo "Starting Alice controller..." + cd controllers/alice-controller + docker compose up -d + cd - +} + +function start_acme() { + echo "Starting Acme controller..." + cd controllers/acme-controller + docker compose up -d + cd - } function web_start() { - echo "Starting all agents and controllers, this may take a moment." - - FABER_AGENT_HOST="faber-agent" - ALICE_AGENT_HOST=${ALICE_AGENT_HOST:-"localhost"} - ACME_AGENT_HOST="acme-agent" - - if [ -z "${PWD_HOST_FQDN}" ]; then - DOCKERHOST=$(getDockerHost) - RUNMODE="docker" - else - PWD_HOST="${PWD_HOST_FQDN}" - if [ "$PWD_HOST_FQDN" = "labs.play-with-docker.com" ]; then - export ETH_CONFIG="eth1" - elif [ "$PWD_HOST_FQDN" = "play-with-docker.vonx.io" ]; then - export ETH_CONFIG="eth0" - else - export ETH_CONFIG="eth0" - fi - MY_HOST=$(ifconfig ${ETH_CONFIG} | grep inet | cut -d':' -f2 | cut -d' ' -f1 | sed 's/\./\-/g') - ALICE_AGENT_HOST="ip${MY_HOST}-${SESSION_ID}-8031.direct.${PWD_HOST_FQDN}" - DOCKERHOST="ip${MY_HOST}-${SESSION_ID}-{PORT}.direct.${PWD_HOST_FQDN}" - RUNMODE="pwd" - fi - - AGENT_URLS="FABER_AGENT_HOST=${FABER_AGENT_HOST} ALICE_AGENT_HOST=${ALICE_AGENT_HOST} ACME_AGENT_HOST=${ACME_AGENT_HOST}" - DOCKER_ENV="$AGENT_URLS RUNMODE=${RUNMODE} DOCKERHOST=${DOCKERHOST}" - - echo "Agent Hosts: ${AGENT_URLS}" - - if ! [ -z "$LEDGER_URL" ]; then - GENESIS_URL="${LEDGER_URL}/genesis" - DOCKER_ENV="$DOCKER_ENV LEDGER_URL=${LEDGER_URL} GENESIS_URL=${GENESIS_URL}" - fi - - export $DOCKER_ENV - - docker-compose -f ./docker/docker-compose.yml up -d - if [ "$LOGS" ]; then - start_logs - fi - exit 0 + echo "Starting all agents and controllers, this may take a moment." + + FABER_AGENT_HOST="localhost" + ALICE_AGENT_HOST="localhost" + ACME_AGENT_HOST="localhost" + + AGENT_URLS="FABER_AGENT_HOST=${FABER_AGENT_HOST} ALICE_AGENT_HOST=${ALICE_AGENT_HOST} ACME_AGENT_HOST=${ACME_AGENT_HOST}" + DOCKER_ENV="$AGENT_URLS" + + echo "Agent Hosts: ${AGENT_URLS}" + + export $DOCKER_ENV + + start_faber + start_alice + start_acme + + if [ "$LOGS" ]; then + start_logs + fi + exit 0 } function web_down() { - docker-compose -f ./docker/docker-compose.yml down - exit 0 + cd controllers/faber-controller + docker compose down + cd - + cd controllers/alice-controller + docker compose down + cd - + cd controllers/acme-controller + docker compose down + cd - + exit 0 } function build() { - docker-compose -f ./docker/docker-compose.yml build --no-cache - exit $? + cd controllers/faber-controller + docker compose build --no-cache + cd - + cd controllers/alice-controller + docker compose build --no-cache + cd - + cd controllers/acme-controller + docker compose build --no-cache + cd - + exit $? } function display_help() { - help="$(basename "$0") [build|webstart|webdown|logs] [-h|--help] [-l|--logs] + help="$(basename "$0") [build|webstart|webdown|logs|start_faber|start_alice|start_acme] [-h|--help] [-l|--logs] 1) webstart will start all agents and controllers in detached mode. - Passing the additional logging option (-l|--logs) will follow and output logs to the terminal. + Passing the additional logging option (-l|--logs) will follow and output logs to the terminal. - Example usage: ./run_demo webstart [-l|logs] + Example usage: ./run_demo webstart [-l|logs] 2) webdown will stop all agents and controllers - - Example usage: ./run_demo webdown + + Example usage: ./run_demo webdown -3) logs will will attach to a currently running demo and output logs to the terminal - Note: this will only work for an already running demo. +3) logs will attach to a currently running demo and output logs to the terminal + Note: this will only work for an already running demo. - Example: ./run_demo logs + Example: ./run_demo logs 4) build will do a '--no-cache' docker compose build. Not normally needed as 'webstart' does a build, but the "no-cache" option can be useful in some cases with docker caching. - Example: ./run_demo build + Example: ./run_demo build + +5) start_faber will start only the Faber controller. + + Example: ./run_demo start_faber + +6) start_alice will start only the Alice controller. + + Example: ./run_demo start_alice + +7) start_acme will start only the Acme controller. + + Example: ./run_demo start_acme Options: - -h|--help Help - -l|--logs Display and follow log output in terminal" - echo "$help" + -h|--help Help + -l|--logs Display and follow log output in terminal" + echo "$help" } shopt -s nocasematch @@ -96,32 +125,38 @@ cd $(dirname $0) for i in "$@" do - case $i in - -h|--help) - display_help - exit 0 - ;; - -l|--logs) - LOGS=1 - ;; - webstart|webdown) - DEMO=$i - ;; - build) - build - ;; - logs) - start_logs - exit 0 - ;; - esac + case $i in + -h|--help) + display_help + exit 0 + ;; + -l|--logs) + LOGS=1 + ;; + webstart|webdown|start_faber|start_alice|start_acme) + DEMO=$i + ;; + build) + build + ;; + logs) + start_logs + exit 0 + ;; + esac done if [ "$DEMO" = "webstart" ]; then - web_start + web_start elif [ "$DEMO" = "webdown" ]; then - web_down + web_down +elif [ "$DEMO" = "start_faber" ]; then + start_faber +elif [ "$DEMO" = "start_alice" ]; then + start_alice +elif [ "$DEMO" = "start_acme" ]; then + start_acme else - display_help - exit 1 -fi + display_help + exit 1 +fi \ No newline at end of file