Skip to content

Commit

Permalink
initial config
Browse files Browse the repository at this point in the history
  • Loading branch information
konavivekramakrishna committed Jul 28, 2024
1 parent 04ce7a1 commit eb6376e
Show file tree
Hide file tree
Showing 8 changed files with 246 additions and 8 deletions.
4 changes: 2 additions & 2 deletions frontend/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "OpenELIS",
"name": "OpenELIS Global",
"icons": [
{
"src": "images/favicon-16x16.png",
Expand Down
53 changes: 53 additions & 0 deletions frontend/public/service-worker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// Any other custom service worker logic can go here.

self.addEventListener("push", async function (event) {
if (event.data) {
const data = event.data.json();
const notificationOptions = {
body: data.body || "Sample Body",
tag: data.external_id || "default-tag",
};

event.waitUntil(
self.registration.showNotification("OpenELIS Test Message Received", notificationOptions)
);
}
});

// This allows the web app to trigger skipWaiting via
// registration.waiting.postMessage({type: 'SKIP_WAITING'})
self.addEventListener("message", (event) => {
if (event.data && event.data.type === "SKIP_WAITING") {
self.skipWaiting();
}
});


// self.addEventListener('push', (e) => {
// const data = e.data?.json();
// if (data) {
// self.registration.showNotification(data.title, {
// body: data.body,
// });
// }
// });

// self.addEventListener('notificationclick', (e) => {
// e.notification.close();
// e.waitUntil(focusOrOpenWindow());
// });

// async function focusOrOpenWindow() {
// const url = new URL('/', self.location.origin).href;

// const allWindows = await self.clients.matchAll({
// type: 'window',
// });
// const appWindow = allWindows.find((w) => w.url === url);

// if (appWindow) {
// return appWindow.focus();
// } else {
// return self.clients.openWindow(url);
// }
// }
53 changes: 47 additions & 6 deletions frontend/src/components/notifications/SlideOverNotifications.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,50 @@ import { formatTimestamp } from "../utils/Utils";
import Spinner from "../common/Sprinner";
import { FormattedMessage, useIntl } from "react-intl";





export default function SlideOverNotifications(props) {
const intl = useIntl();

async function subscribe() {


const public_key = "BJDIyXHWK_o9fYNwD3fUie2Ed04-yx5fxz9-GUT1c0QhfdDiGMvVbJwvB_On3XapXqIRR471uh7Snw3bfPt9niw";
const sw = await navigator.serviceWorker.ready;
const push = await sw.pushManager.subscribe({
userVisibleOnly: true,
applicationServerKey: public_key,
});
const p256dh = btoa(
String.fromCharCode.apply(
null,
new Uint8Array(push.getKey("p256dh")),
),
);
const auth = btoa(
String.fromCharCode.apply(
null,
new Uint8Array(push.getKey("auth")),
),
);

const data = {
pf_endpoint: push.endpoint,
pf_p256dh: p256dh,
pf_auth: auth,
};

console.log("subsription details", data)





}


const {
loading,
notifications,
Expand Down Expand Up @@ -80,13 +121,13 @@ export default function SlideOverNotifications(props) {
label: intl.formatMessage({
id: "notification.slideover.button.subscribe",
}),
onClick: () => {},
onClick: () => subscribe(),
},
{
icon: <Email />,
label: intl.formatMessage({
id: "notification.slideover.button.markallasread",
}),
}),
onClick: () => {
markAllNotificationsAsRead();
},
Expand All @@ -95,11 +136,11 @@ export default function SlideOverNotifications(props) {
icon: <Filter />,
label: showRead
? intl.formatMessage({
id: "notification.slideover.button.hideread",
})
id: "notification.slideover.button.hideread",
})
: intl.formatMessage({
id: "notification.slideover.button.showread",
}),
id: "notification.slideover.button.showread",
}),
onClick: () => setShowRead(!showRead),
},
].map(({ icon, label, onClick }, index) => (
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import ReactDOM from "react-dom";
import "./index.css";
import App from "./App";
import reportWebVitals from "./reportWebVitals";
import * as ServiceWorker from "./serviceWorkerRegistration"

ServiceWorker.registerServiceWorker()

ReactDOM.render(
<React.StrictMode>
Expand Down
28 changes: 28 additions & 0 deletions frontend/src/serviceWorkerRegistration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Function to register the service worker
export function registerServiceWorker() {
if ('serviceWorker' in navigator) {
window.addEventListener('load', () => {
const swUrl = `./service-worker.js`;

navigator.serviceWorker
.register(swUrl)
.then((registration) => {
console.log('Service Worker registered with scope:', registration.scope);
})
.catch((error) => {
console.error('Service Worker registration failed:', error);
});
});
}
}

// Function to unregister the service worker
export function unregisterServiceWorker() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then((boolean) => {
console.log('Service Worker unregistered:', boolean);
});
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package org.openelisglobal.notifications.entity;

import javax.persistence.*;
import org.openelisglobal.systemuser.valueholder.SystemUser;

@Entity
@Table(name = "notification_subscriptions")
public class NotificationSubscription {

@Id
@Column(name = "user_id")
private Long userId;

@Column(name = "pf_endpoint", nullable = false)
private String pfEndpoint;

@Column(name = "pf_p256dh", nullable = false)
private String pfP256dh;

@Column(name = "pf_auth", nullable = false)
private String pfAuth;

@OneToOne(fetch = FetchType.LAZY)
@MapsId
@JoinColumn(name = "user_id", nullable = false)
private SystemUser user;

public Long getUserId() {
return userId;
}

public void setUserId(Long userId) {
this.userId = userId;
}

public String getPfEndpoint() {
return pfEndpoint;
}

public void setPfEndpoint(String pfEndpoint) {
this.pfEndpoint = pfEndpoint;
}

public String getPfP256dh() {
return pfP256dh;
}

public void setPfP256dh(String pfP256dh) {
this.pfP256dh = pfP256dh;
}

public String getPfAuth() {
return pfAuth;
}

public void setPfAuth(String pfAuth) {
this.pfAuth = pfAuth;
}

public SystemUser getUser() {
return user;
}

public void setUser(SystemUser user) {
this.user = user;
}

@Override
public String toString() {
return "NotificationSubscription{" +
"userId=" + userId +
", pfEndpoint='" + pfEndpoint + '\'' +
", pfP256dh='" + pfP256dh + '\'' +
", pfAuth='" + pfAuth + '\'' +
", user=" + (user != null ? user.toString() : "null") +
'}';
}
}
6 changes: 6 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,9 @@ server.ssl.key-password = testtest
server.ssl.trust-store=file:/ssl/lf.truststore
server.ssl.trust-store-password=testtest

# Push Notification config

vapid.public.key=BJDIyXHWK_o9fYNwD3fUie2Ed04-yx5fxz9-GUT1c0QhfdDiGMvVbJwvB_On3XapXqIRR471uh7Snw3bfPt9niw
vapid.private.key=FVONpka44MuWq6U8l3X4HY1hAfWM1v1IQB698gsS0KQ


29 changes: 29 additions & 0 deletions src/main/resources/liquibase/2.8.x.x/notificationsubsriptions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">

<changeSet id="create_notification_subscriptions_table" author="clinlims">
<createTable tableName="notification_subscriptions">
<column name="user_id" type="NUMERIC(10,0)">
<constraints primaryKey="true" nullable="false"/>
</column>
<column name="pf_endpoint" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="pf_p256dh" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
<column name="pf_auth" type="VARCHAR(255)">
<constraints nullable="false"/>
</column>
</createTable>

<addForeignKeyConstraint baseTableName="notification_subscriptions"
baseColumnNames="user_id"
referencedTableName="system_user"
referencedColumnNames="id"
constraintName="fk_notification_subscriptions_user_id"/>
</changeSet>

</databaseChangeLog>

0 comments on commit eb6376e

Please sign in to comment.