Merge pull request #5 from gunet/wwwallet-sync

Wwwallet sync

.env.template

@@ -3,6 +3,7 @@ PORT=3000
 REACT_APP_WS_URL=ws://wallet-backend-server:8002
 REACT_APP_WALLET_BACKEND_URL=http://wallet-backend-server:8002
 REACT_APP_LOGIN_WITH_PASSWORD=false
+REACT_APP_FIREBASE_ENABLED=false
 REACT_APP_FIREBASE_VAPIDKEY=<Your_Vapid_Key>
 REACT_APP_FIREBASE_API_KEY=<Your_Firebase_API_Key>
 REACT_APP_FIREBASE_AUTH_DOMAIN=<Your_Firebase_Auth_Domain>

src/components/Popups/RedirectPopup.js

@@ -40,19 +40,19 @@ const RedirectPopup = ({ loading, availableCredentialConfigurations, onClose, ha
 
 			{configurationsCount > 1 && Object.keys(availableCredentialConfigurations).map((credentialConfigurationId, index) => {
 				return (
-					<div class="flex items-center mb-4">
+					<div key={credentialConfigurationId} className="flex items-center mb-4">
 						<input
 							id={"radio-" + index}
 							onChange={handleOptionChange}
 							type="radio"
 							value={credentialConfigurationId}
 							name="default-radio"
-							class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
+							className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
 							checked={selectedConfiguration === credentialConfigurationId}
 							aria-label={`Option ${credentialConfigurationId}`}
 						/>
-						<label for={"radio-" + index} class="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">
-							{(availableCredentialConfigurations[credentialConfigurationId]?.display ? availableCredentialConfigurations[credentialConfigurationId]?.display.filter((d) => d.locale === locale)[0].name : null) ?? credentialConfigurationId}
+						<label htmlFor={"radio-" + index} className="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">
+							{(availableCredentialConfigurations[credentialConfigurationId]?.display ? availableCredentialConfigurations[credentialConfigurationId]?.display.filter((d) => d.locale === locale)[0]?.name : null) ?? credentialConfigurationId}
 						</label>
 					</div>
 				)

src/config.ts

@@ -13,6 +13,7 @@ export const FIREBASE = {
 	projectId: process.env.REACT_APP_FIREBASE_PROJECT_ID,
 	storageBucket: process.env.REACT_APP_FIREBASE_STORAGE_BUCKET,
 };
+export const FIREBASE_ENABLED: boolean = process.env.REACT_APP_FIREBASE_ENABLED ? JSON.parse(process.env.REACT_APP_FIREBASE_ENABLED) === true : false;
 export const FIREBASE_VAPIDKEY = process.env.REACT_APP_FIREBASE_VAPIDKEY;
 export const INACTIVE_LOGOUT_MILLIS = (process.env.REACT_APP_INACTIVE_LOGOUT_SECONDS ? parseInt(process.env.REACT_APP_INACTIVE_LOGOUT_SECONDS, 10) : 60 * 15) * 1000
 export const LOGIN_WITH_PASSWORD: boolean = process.env.REACT_APP_LOGIN_WITH_PASSWORD ? JSON.parse(process.env.REACT_APP_LOGIN_WITH_PASSWORD) === true : false;

src/firebase.js

@@ -9,8 +9,12 @@ export const notificationApiIsSupported =
 	'serviceWorker' in navigator &&
 	'PushManager' in window;
 
+export async function isEnabledAndIsSupported() {
+	return config.FIREBASE_ENABLED && await isSupported();
+}
+
 export async function register() {
-	if (await isSupported() && 'serviceWorker' in navigator) {
+	if (await isEnabledAndIsSupported() && 'serviceWorker' in navigator) {
 		try {
 			const existingRegistration = await navigator.serviceWorker.getRegistration('/notifications/');
 			if (existingRegistration) {
@@ -28,7 +32,7 @@ export async function register() {
 };
 
 const requestForToken = async () => {
-	if (!await isSupported()) {
+	if (!await isEnabledAndIsSupported()) {
 		return null;
 	}
 	if (messaging) {
@@ -61,7 +65,7 @@ const requestForToken = async () => {
 };
 
 const reRegisterServiceWorkerAndGetToken = async () => {
-	if (!await isSupported()) {
+	if (!await isEnabledAndIsSupported()) {
 		return null;
 	}
 	if ('serviceWorker' in navigator) {
@@ -90,7 +94,7 @@ const reRegisterServiceWorkerAndGetToken = async () => {
 };
 
 export const fetchToken = async () => {
-	if (await isSupported() && messaging) {
+	if (await isEnabledAndIsSupported() && messaging) {
 		const token = await requestForToken();
 		console.log('token:', token);
 		if (token) {
@@ -112,7 +116,7 @@ export const fetchToken = async () => {
 
 export const onMessageListener = () =>
 	new Promise(async (resolve) => {
-		if (await isSupported()) {
+		if (await isEnabledAndIsSupported()) {
 			onMessage(messaging, (payload) => {
 				resolve(payload);
 			});
@@ -121,7 +125,7 @@ export const onMessageListener = () =>
 
 const initializeFirebaseAndMessaging = async () => {
 	if (notificationApiIsSupported) {
-		let supported = await isSupported();
+		let supported = await isEnabledAndIsSupported();
 		if (supported) {
 			initializeApp(config.FIREBASE);
 			messaging = getMessaging();

src/lib/services/OpenID4VPRelyingParty.ts

@@ -50,7 +50,7 @@ export class OpenID4VPRelyingParty implements IOpenID4VPRelyingParty {
 			const [header, payload] = requestObject.split('.');
 			const parsedHeader = JSON.parse(new TextDecoder().decode(base64url.decode(header)));
 
-			const publicKey = await importX509(getPublicKeyFromB64Cert(parsedHeader.x5c[0]), 'RS256');
+			const publicKey = await importX509(getPublicKeyFromB64Cert(parsedHeader.x5c[0]), parsedHeader.alg);
 			const verificationResult = await jwtVerify(requestObject, publicKey).catch(() => null);
 			if (verificationResult == null) {
 				console.log("Signature verification of request_uri failed");