Sync dc4eu-rome with wwWallet/master

.buildignore

@@ -9,4 +9,4 @@ tsconfig.json
 .buildignore
 *.gz
 *.tar
-yarn.lock
+yarn.lock

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig: https://EditorConfig.org
+
+[*]
+charset = utf-8
+insert_final_newline = true # Type of newline is managed by git in .gitattributes
+trim_trailing_whitespace = true
+
+[{*.{Dockerfile,css,js,jsx,ts,tsx},Dockerfile}]
+indent_style = tab
+
+[*.{yml,yaml}] # YAML does not allow tab indentation
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,8 @@
+# Auto-detect text files
+* text=auto
+
+# Always treat these as LF
+*.sh text eol=lf
+
+# Always treat these as CRLF
+*.bat text eol=crlf

.github/workflows/code-formatting.yml

@@ -0,0 +1,26 @@
+# This name is shown in status badges
+name: code-formatting
+
+on:
+  push:
+    branches-ignore:
+      - 'tmp**'
+  pull_request:
+    branches-ignore:
+      - 'tmp**'
+
+jobs:
+  editorconfig:
+    name: Check EditorConfig compliance
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v3
+
+    - name: Set up editorconfig-checker
+      uses: editorconfig-checker/action-editorconfig-checker@v2
+
+    - name: Check code formatting
+      run: editorconfig-checker

.vscode/settings.json

@@ -2,4 +2,4 @@
     "editor.tabSize": 2,
     "editor.detectIndentation": false,
     "editor.insertSpaces": false
-}
+}

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY . .
 RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
-    apt-get update -y && apt-get install g++ python3 make -y && yarn cache clean && yarn install && yarn build
+	apt-get update -y && apt-get install g++ python3 make -y && yarn cache clean && yarn install && yarn build
 
 # Production stage
 FROM node:18-bullseye-slim AS production
@@ -17,10 +17,10 @@ COPY --from=builder /app/public ./public
 
 
 RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
-    apt-get update -y && apt-get install g++ python3 make -y && yarn install --production
+	apt-get update -y && apt-get install g++ python3 make -y && yarn install --production
 
 ENV NODE_ENV production
 
 EXPOSE 8002
 
-CMD ["node", "./dist/src/app.js"]
+CMD ["node", "./dist/src/app.js"]

README.md

@@ -9,7 +9,7 @@ yarn install
 ## Change configuration
 
 Edit `config/config.dev.ts` file to change the configuration of the app.
-## Run in dev mode 
+## Run in dev mode
 
 ```
 yarn dev
@@ -70,7 +70,7 @@ rsync --rsh='ssh -p 65432' <snapshot_name>.tar.gz root@ip:/tmp
 cd /tmp
 rm -rf wallet-backend
 mkdir wallet-backend
-tar -xf <snapshot_name>.tar.gz -C wallet-backend 
+tar -xf <snapshot_name>.tar.gz -C wallet-backend
 cd wallet-backend
 chmod +x entrypoint.sh
 ./entrypoint.sh
@@ -80,5 +80,3 @@ Add `Listen 9002` below the `Listen 443` line on `/etc/apache2/ports.conf`
 and restart apache
 
 # 3 Logging
-
-

cli/.dockerignore

@@ -3,4 +3,4 @@ node_modules
 combined.log
 error.log
 *.gz
-./dist
+./dist

cli/Dockerfile

@@ -7,4 +7,4 @@ COPY . .
 RUN yarn cache clean && yarn install
 
 
-CMD ["tail", "-f", "/dev/null"]
+CMD ["tail", "-f", "/dev/null"]

config/config.template.ts

@@ -28,4 +28,4 @@ export = {
 		enabled: "NOTIFICATIONS_ENABLED",
 		serviceAccount: "firebaseConfig.json"
 	}
-}
+}

config/index.ts

@@ -2,4 +2,4 @@ require('dotenv').config()
 
 const env = process.env.NODE_ENV || 'development';
 const config: any = require('./config.' + env);
-export default config;
+export default config;

development.Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /dependencies
 # Install dependencies first so rebuild of these layers is only needed when dependencies change
 COPY package.json yarn.lock ./
 RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
-    yarn cache clean && yarn install
+		yarn cache clean && yarn install
 
 
 FROM node:16-bullseye-slim as cli-dependencies
@@ -15,7 +15,7 @@ WORKDIR /dependencies
 # Install dependencies first so rebuild of these layers is only needed when dependencies change
 COPY cli/package.json cli/yarn.lock ./
 RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
-    yarn cache clean && yarn install --frozen-lockfile
+		yarn cache clean && yarn install --frozen-lockfile
 
 
 FROM node:16-bullseye-slim as development

nodemon.json

@@ -10,4 +10,4 @@
         "."
     ],
     "ext": "ts,js"
-}
+}

samples/wallet-mock/app.js

@@ -77,7 +77,7 @@ app.get('/vp', async (req, res) => {
 			const payload = JSON.parse(base64url.decode(vpjwt.split('.')[1]));
 			return payload;
 		})
-	
+
 
 		res.render('presentations', {
 			vp_list: vp_list
@@ -121,7 +121,7 @@ app.get('/vp/:vp_id', async (req, res) => {
 		console.dir(vp, { depth: null})
 		const vpjwt = vp.presentation;
 		const payload = base64url.decode(vpjwt.split('.')[1]);
-		
+
 		res.render('vc', {
 			title: "Wallet Mock",
 			vc: payload
@@ -143,7 +143,7 @@ app.get('/init/issuance/:iss', async (req, res) => {
 	const selectedIssuerDID = iss == 'vid' ? vidTrustedIssuerDID : uoaTrustedIssuerDID;
 
 	try {
-		const issuanceInitiation = await axios.post(walletBackendUrl + '/issuance/generate/authorization/request', 
+		const issuanceInitiation = await axios.post(walletBackendUrl + '/issuance/generate/authorization/request',
 			{ legal_person_did: selectedIssuerDID },
 			{ headers: { "Authorization": `Bearer ${global.user.appToken}` }}
 		);
@@ -172,11 +172,11 @@ app.get('/init/verification/vid', async (req, res) => {
 
 
 /**
- * For OpenID 4 VCI (Issuance)
- * @param {*} req 
- * @param {*} res 
- * @param {*} next 
- */
+* For OpenID 4 VCI (Issuance)
+* @param {*} req
+* @param {*} res
+* @param {*} next
+*/
 async function handleCredentialOffer(req, res, next) {
 	const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
 
@@ -192,13 +192,13 @@ async function handleCredentialOffer(req, res, next) {
 }
 
 /**
- * For OpenID 4 VCI (Issuance)
- * @param {*} req 
- * @param {*} res 
- * @param {*} next 
- */
+* For OpenID 4 VCI (Issuance)
+* @param {*} req
+* @param {*} res
+* @param {*} next
+*/
 async function handleAuthorizationResponse(req, res, next) {
-  const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
+	const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
 
 	axios.post(walletBackendUrl + "/issuance/handle/authorization/response",
 		{ authorization_response_url: url },
@@ -214,13 +214,13 @@ async function handleAuthorizationResponse(req, res, next) {
 
 
 /**
- * For OpenID 4 VP (Verification)
- * @param {*} req 
- * @param {*} res 
- * @param {*} next 
- */
+* For OpenID 4 VP (Verification)
+* @param {*} req
+* @param {*} res
+* @param {*} next
+*/
 async function handleAuthorizationRequest(req, res, next) {
-  const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
+	const url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
 	console.log("URL = ", url)
 	axios.post(walletBackendUrl + "/presentation/handle/authorization/request",
 		{ authorization_request: url },
@@ -246,33 +246,33 @@ async function handleAuthorizationRequest(req, res, next) {
 app.post('/select-vc', async (req, res) => {
 	console.log("Req = ", req.body)
 	axios.post(walletBackendUrl + "/presentation/generate/authorization/response",
-			{ verifiable_credentials_map: req.body },
-			{ headers: { "Authorization": `Bearer ${global.user.appToken}` }}
-		).then(success => {
-			const { redirect_to } = success.data;
-			res.redirect(redirect_to);
-		}).catch(e => {
-			// console.error("Failed to generate authorization response")
-			// console.error(e.response.data);
-			res.render('error', { title: "Error", error: { status: 500 } })
-		});
+		{ verifiable_credentials_map: req.body },
+		{ headers: { "Authorization": `Bearer ${global.user.appToken}` }}
+	).then(success => {
+		const { redirect_to } = success.data;
+		res.redirect(redirect_to);
+	}).catch(e => {
+		// console.error("Failed to generate authorization response")
+		// console.error(e.response.data);
+		res.render('error', { title: "Error", error: { status: 500 } })
+	});
 })
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  next(createError(404));
+	next(createError(404));
 });
 
 
 // error handler
 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 : {};
+	// set locals, only providing error in development
+	res.locals.message = err.message;
+	res.locals.error = req.app.get('env') === 'development' ? err : {};
 
-  // render the error page
-  res.status(err.status || 500);
-  res.render('error');
+	// render the error page
+	res.status(err.status || 500);
+	res.render('error');
 });
 
 console.log("Started wallet mock server...")

samples/wallet-mock/config.js

@@ -3,4 +3,4 @@ module.exports = {
 	// trustedIssuerDID: "did:ebsi:zc6MhmU4NbKSAtAHx8XgpEW",
 	uoaTrustedIssuerDID: "did:ebsi:zpq1XFkNWgsGB6MuvJp21vA",
 	vidTrustedIssuerDID: "did:ebsi:zyhE5cJ7VVqYT4gZmoKadFt",
-}
+}

samples/wallet-mock/development.Dockerfile

@@ -17,4 +17,4 @@ ENV NODE_ENV development
 
 RUN chown -R node:node  /home/node/app/node_modules
 USER node
-CMD ["yarn", "dev"]
+CMD ["yarn", "dev"]

samples/wallet-mock/lib.js

@@ -21,4 +21,4 @@ async function registerUser() {
 
 module.exports = {
 	registerUser
-}
+}

samples/wallet-mock/nodemon.json

@@ -7,4 +7,4 @@
         "."
     ],
     "ext": "js"
-}
+}