diff --git a/examples/vue-app/package-lock.json b/examples/vue-app/package-lock.json
index 2e6ce55c..d185bc76 100644
--- a/examples/vue-app/package-lock.json
+++ b/examples/vue-app/package-lock.json
@@ -43,18 +43,18 @@
     },
     "../..": {
       "name": "@toruslabs/customauth",
-      "version": "17.1.0",
+      "version": "19.0.0-alpha.7",
       "license": "MIT",
       "dependencies": {
         "@chaitanyapotti/register-service-worker": "^1.7.4",
-        "@toruslabs/broadcast-channel": "^10.0.1",
+        "@toruslabs/broadcast-channel": "^10.0.2",
         "@toruslabs/constants": "^13.2.0",
         "@toruslabs/eccrypto": "^4.0.0",
         "@toruslabs/fetch-node-details": "^13.2.0",
         "@toruslabs/http-helpers": "^6.1.0",
         "@toruslabs/metadata-helpers": "^5.1.0",
         "@toruslabs/openlogin-session-manager": "^3.1.1",
-        "@toruslabs/torus.js": "^12.2.0",
+        "@toruslabs/torus.js": "13.0.0-alpha.7",
         "base64url": "^3.0.1",
         "bowser": "^2.11.0",
         "events": "^3.3.0",
diff --git a/examples/vue-app/public/serviceworker/redirect.html b/examples/vue-app/public/serviceworker/redirect.html
deleted file mode 100644
index 576fd226..00000000
--- a/examples/vue-app/public/serviceworker/redirect.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <title>Redirect</title>
-    <style>
-      * {
-        box-sizing: border-box;
-      }
-
-      html,
-      body {
-        background: #fcfcfc;
-        height: 100%;
-        padding: 0;
-        margin: 0;
-      }
-
-      .container {
-        width: 100%;
-        height: 100%;
-
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-      }
-
-      h1.title {
-        font-size: 14px;
-        color: #0f1222;
-        font-family: "Roboto", sans-serif !important;
-        margin: 0;
-        text-align: center;
-      }
-
-      .spinner .beat {
-        background-color: #0364ff;
-        height: 12px;
-        width: 12px;
-        margin: 24px 2px 10px;
-        border-radius: 100%;
-        -webkit-animation: beatStretchDelay 0.7s infinite linear;
-        animation: beatStretchDelay 0.7s infinite linear;
-        -webkit-animation-fill-mode: both;
-        animation-fill-mode: both;
-        display: inline-block;
-      }
-
-      .spinner .beat-odd {
-        animation-delay: 0s;
-      }
-
-      .spinner .beat-even {
-        animation-delay: 0.35s;
-      }
-
-      @-webkit-keyframes beatStretchDelay {
-        50% {
-          -webkit-transform: scale(0.75);
-          transform: scale(0.75);
-          -webkit-opacity: 0.2;
-          opacity: 0.2;
-        }
-
-        100% {
-          -webkit-transform: scale(1);
-          transform: scale(1);
-          -webkit-opacity: 1;
-          opacity: 1;
-        }
-      }
-
-      @keyframes beatStretchDelay {
-        50% {
-          -webkit-transform: scale(0.75);
-          transform: scale(0.75);
-          -webkit-opacity: 0.2;
-          opacity: 0.2;
-        }
-
-        100% {
-          -webkit-transform: scale(1);
-          transform: scale(1);
-          -webkit-opacity: 1;
-          opacity: 1;
-        }
-      }
-
-      @media (min-width: 768px) {
-        h1.title {
-          font-size: 14px;
-        }
-        p.info {
-          font-size: 28px;
-        }
-
-        .spinner .beat {
-          height: 12px;
-          width: 12px;
-        }
-      }
-    </style>
-  </head>
-
-  <body>
-    <div id="message" class="container">
-      <div class="spinner content" id="spinner">
-        <div class="beat beat-odd"></div>
-        <div class="beat beat-even"></div>
-        <div class="beat beat-odd"></div>
-      </div>
-      <h1 class="title content" id="closeText" style="display: none">You can close this window now</h1>
-    </div>
-    <script
-      src="https://cdn.jsdelivr.net/npm/@toruslabs/broadcast-channel@10.0.2/dist/broadcastChannel.umd.min.js"
-      integrity="sha256-q78HZzZl8u46uVK0a+t5vzPyAevMwEWHi43ok+P7/O8="
-      crossorigin="anonymous"
-    ></script>
-    <script>
-      function storageAvailable(type) {
-        var storage;
-        try {
-          storage = window[type];
-          var x = "__storage_test__";
-          storage.setItem(x, x);
-          storage.removeItem(x);
-          return true;
-        } catch (e) {
-          return (
-            e &&
-            // everything except Firefox
-            (e.code === 22 ||
-              // Firefox
-              e.code === 1014 ||
-              // test name field too, because code might not be present
-              // everything except Firefox
-              e.name === "QuotaExceededError" ||
-              // Firefox
-              e.name === "NS_ERROR_DOM_QUOTA_REACHED") &&
-            // acknowledge QuotaExceededError only if there's something already stored
-            storage &&
-            storage.length !== 0
-          );
-        }
-      }
-      function showCloseText() {
-        var closeText = document.getElementById("closeText");
-        var spinner = document.getElementById("spinner");
-        if (closeText) {
-          closeText.style.display = "block";
-        }
-        if (spinner) {
-          spinner.style.display = "none";
-        }
-      }
-      var isLocalStorageAvailable = storageAvailable("localStorage");
-      // set theme
-      let theme = "light";
-      if (isLocalStorageAvailable) {
-        var torusTheme = localStorage.getItem("torus-theme");
-        if (torusTheme) {
-          theme = torusTheme.split("-")[0];
-        }
-      }
-
-      if (theme === "dark") {
-        document.querySelector("body").style.backgroundColor = "#24252A";
-      }
-      var bc;
-      var broadcastChannelOptions = {
-        // type: 'localstorage', // (optional) enforce a type, oneOf['native', 'idb', 'localstorage', 'node'
-        webWorkerSupport: false, // (optional) set this to false if you know that your channel will never be used in a WebWorker (increase performance)
-      };
-      var instanceParams = {};
-      var preopenInstanceId = new URL(window.location.href).searchParams.get("preopenInstanceId");
-      if (!preopenInstanceId) {
-        document.getElementById("message").style.visibility = "visible";
-        // in general oauth redirect
-        try {
-          var url = new URL(location.href);
-          var hash = url.hash.substr(1);
-          var hashParams = {};
-          if (hash) {
-            hashParams = hash.split("&").reduce(function (result, item) {
-              var parts = item.split("=");
-              result[parts[0]] = parts[1];
-              return result;
-            }, {});
-          }
-          var queryParams = {};
-          for (var key of url.searchParams.keys()) {
-            queryParams[key] = url.searchParams.get(key);
-          }
-          var error = "";
-          try {
-            if (Object.keys(hashParams).length > 0 && hashParams.state) {
-              instanceParams = JSON.parse(base64urlLib.decode(decodeURIComponent(decodeURIComponent(hashParams.state)))) || {};
-              if (hashParams.error) error = hashParams.error;
-            } else if (Object.keys(queryParams).length > 0 && queryParams.state) {
-              instanceParams = JSON.parse(base64urlLib.decode(decodeURIComponent(decodeURIComponent(queryParams.state)))) || {};
-              if (queryParams.error) error = queryParams.error;
-            }
-          } catch (e) {
-            console.error(e);
-          }
-          if (instanceParams.redirectToOpener) {
-            // communicate to window.opener
-            window.opener.postMessage(
-              {
-                channel: "redirect_channel_" + instanceParams.instanceId,
-                data: {
-                  instanceParams: instanceParams,
-                  hashParams: hashParams,
-                  queryParams: queryParams,
-                },
-                error: error,
-              },
-              "http://localhost:3000",
-            );
-          } else {
-            // communicate via broadcast channel
-            bc = new broadcastChannelLib.BroadcastChannel("redirect_channel_" + instanceParams.instanceId, broadcastChannelOptions);
-            bc.postMessage({
-              data: {
-                instanceParams: instanceParams,
-                hashParams: hashParams,
-                queryParams: queryParams,
-              },
-              error: error,
-            }).then(function () {
-              bc.close();
-              console.log("posted", {
-                queryParams,
-                instanceParams,
-                hashParams,
-              });
-              setTimeout(function () {
-                window.close();
-                showCloseText();
-              }, 5000);
-            });
-          }
-        } catch (err) {
-          console.error(err, "service worker error in redirect");
-          bc && bc.close();
-          window.close();
-          showCloseText();
-        }
-      } else {
-        // in preopen, awaiting redirect
-        try {
-          bc = new broadcastChannelLib.BroadcastChannel("preopen_channel_" + preopenInstanceId, broadcastChannelOptions);
-          bc.onmessage = function (ev) {
-            var { preopenInstanceId: oldId, payload, message } = ev.data;
-            if (oldId === preopenInstanceId && payload && payload.url) {
-              window.location.href = payload.url;
-            } else if (oldId === preopenInstanceId && message === "setup_complete") {
-              bc.postMessage({
-                data: {
-                  preopenInstanceId: preopenInstanceId,
-                  message: "popup_loaded",
-                },
-              });
-            }
-            if (ev.error && ev.error !== "") {
-              console.error(ev.error);
-              bc.close();
-            }
-          };
-        } catch (err) {
-          console.error(err, "service worker error in preopen");
-          bc && bc.close();
-          window.close();
-          showCloseText();
-        }
-      }
-    </script>
-  </body>
-</html>
diff --git a/examples/vue-app/public/serviceworker/sw.js b/examples/vue-app/public/serviceworker/sw.js
deleted file mode 100644
index a863c8d7..00000000
--- a/examples/vue-app/public/serviceworker/sw.js
+++ /dev/null
@@ -1,315 +0,0 @@
-/* eslint-disable */
-function getScope() {
-  return self.registration.scope;
-}
-
-self.addEventListener("message", function (event) {
-  if (event.data && event.data.type === "SKIP_WAITING") {
-    self.skipWaiting();
-  }
-});
-
-self.addEventListener("fetch", function (event) {
-  try {
-    const url = new URL(event.request.url);
-    if (url.pathname.includes("redirect") && url.href.includes(getScope())) {
-      event.respondWith(
-        new Response(
-          new Blob(
-            [
-              `
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <title>Redirect</title>
-    <style>
-      * {
-        box-sizing: border-box;
-      }
-
-      html,
-      body {
-        background: #fcfcfc;
-        height: 100%;
-        padding: 0;
-        margin: 0;
-      }
-
-      .container {
-        width: 100%;
-        height: 100%;
-
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-      }
-
-      h1.title {
-        font-size: 14px;
-        color: #0f1222;
-        font-family: "Roboto", sans-serif !important;
-        margin: 0;
-        text-align: center;
-      }
-
-      .spinner .beat {
-        background-color: #0364ff;
-        height: 12px;
-        width: 12px;
-        margin: 24px 2px 10px;
-        border-radius: 100%;
-        -webkit-animation: beatStretchDelay 0.7s infinite linear;
-        animation: beatStretchDelay 0.7s infinite linear;
-        -webkit-animation-fill-mode: both;
-        animation-fill-mode: both;
-        display: inline-block;
-      }
-
-      .spinner .beat-odd {
-        animation-delay: 0s;
-      }
-
-      .spinner .beat-even {
-        animation-delay: 0.35s;
-      }
-
-      @-webkit-keyframes beatStretchDelay {
-        50% {
-          -webkit-transform: scale(0.75);
-          transform: scale(0.75);
-          -webkit-opacity: 0.2;
-          opacity: 0.2;
-        }
-
-        100% {
-          -webkit-transform: scale(1);
-          transform: scale(1);
-          -webkit-opacity: 1;
-          opacity: 1;
-        }
-      }
-
-      @keyframes beatStretchDelay {
-        50% {
-          -webkit-transform: scale(0.75);
-          transform: scale(0.75);
-          -webkit-opacity: 0.2;
-          opacity: 0.2;
-        }
-
-        100% {
-          -webkit-transform: scale(1);
-          transform: scale(1);
-          -webkit-opacity: 1;
-          opacity: 1;
-        }
-      }
-
-      @media (min-width: 768px) {
-        h1.title {
-          font-size: 14px;
-        }
-        p.info {
-          font-size: 28px;
-        }
-
-        .spinner .beat {
-          height: 12px;
-          width: 12px;
-        }
-      }
-    </style>
-  </head>
-
-  <body>
-    <div id="message" class="container">
-      <div class="spinner content" id="spinner">
-        <div class="beat beat-odd"></div>
-        <div class="beat beat-even"></div>
-        <div class="beat beat-odd"></div>
-      </div>
-      <h1 class="title content" id="closeText" style="display: none;">You can close this window now</h1>
-    </div>
-    <script
-      src="https://cdn.jsdelivr.net/npm/@toruslabs/broadcast-channel@10.0.2/dist/broadcastChannel.umd.min.js"
-      integrity="sha256-q78HZzZl8u46uVK0a+t5vzPyAevMwEWHi43ok+P7/O8="
-      crossorigin="anonymous"
-    ></script>
-    <script>
-      function storageAvailable(type) {
-        var storage;
-        try {
-          storage = window[type];
-          var x = "__storage_test__";
-          storage.setItem(x, x);
-          storage.removeItem(x);
-          return true;
-        } catch (e) {
-          return (
-            e &&
-            // everything except Firefox
-            (e.code === 22 ||
-              // Firefox
-              e.code === 1014 ||
-              // test name field too, because code might not be present
-              // everything except Firefox
-              e.name === "QuotaExceededError" ||
-              // Firefox
-              e.name === "NS_ERROR_DOM_QUOTA_REACHED") &&
-            // acknowledge QuotaExceededError only if there's something already stored
-            storage &&
-            storage.length !== 0
-          );
-        }
-      }
-      function showCloseText() {
-        var closeText = document.getElementById("closeText");
-        var spinner = document.getElementById("spinner");
-        if (closeText) {
-          closeText.style.display = "block";
-        }
-        if (spinner) {
-          spinner.style.display = "none";
-        }
-      }
-      var isLocalStorageAvailable = storageAvailable("localStorage");
-      // set theme
-      let theme = "light";
-      if (isLocalStorageAvailable) {
-        var torusTheme = localStorage.getItem("torus-theme");
-        if (torusTheme) {
-          theme = torusTheme.split("-")[0];
-        }
-      }
-
-      if (theme === "dark") {
-        document.querySelector("body").style.backgroundColor = "#24252A";
-      }
-      var bc;
-      var broadcastChannelOptions = {
-        // type: 'localstorage', // (optional) enforce a type, oneOf['native', 'idb', 'localstorage', 'node'
-        webWorkerSupport: false, // (optional) set this to false if you know that your channel will never be used in a WebWorker (increase performance)
-      };
-      var instanceParams = {};
-      var preopenInstanceId = new URL(window.location.href).searchParams.get("preopenInstanceId");
-      if (!preopenInstanceId) {
-        document.getElementById("message").style.visibility = "visible";
-        // in general oauth redirect
-        try {
-          var url = new URL(location.href);
-          var hash = url.hash.substr(1);
-          var hashParams = {};
-          if (hash) {
-            hashParams = hash.split("&").reduce(function (result, item) {
-              var parts = item.split("=");
-              result[parts[0]] = parts[1];
-              return result;
-            }, {});
-          }
-          var queryParams = {};
-          for (var key of url.searchParams.keys()) {
-            queryParams[key] = url.searchParams.get(key);
-          }
-          var error = "";
-          try {
-            if (Object.keys(hashParams).length > 0 && hashParams.state) {
-              instanceParams = JSON.parse(base64urlLib.decode(decodeURIComponent(decodeURIComponent(hashParams.state)))) || {};
-              if (hashParams.error) error = hashParams.error;
-            } else if (Object.keys(queryParams).length > 0 && queryParams.state) {
-              instanceParams = JSON.parse(base64urlLib.decode(decodeURIComponent(decodeURIComponent(queryParams.state)))) || {};
-              if (queryParams.error) error = queryParams.error;
-            }
-          } catch (e) {
-            console.error(e);
-          }
-          if (instanceParams.redirectToOpener) {
-            // communicate to window.opener
-            window.opener.postMessage(
-              {
-                channel: "redirect_channel_" + instanceParams.instanceId,
-                data: {
-                  instanceParams: instanceParams,
-                  hashParams: hashParams,
-                  queryParams: queryParams,
-                },
-                error: error,
-              },
-              "http://localhost:3000"
-            );
-          } else {
-            // communicate via broadcast channel
-            bc = new broadcastChannelLib.BroadcastChannel("redirect_channel_" + instanceParams.instanceId, broadcastChannelOptions);
-            bc.postMessage({
-              data: {
-                instanceParams: instanceParams,
-                hashParams: hashParams,
-                queryParams: queryParams,
-              },
-              error: error,
-            }).then(function () {
-              bc.close();
-              console.log("posted", {
-                queryParams,
-                instanceParams,
-                hashParams,
-              });
-              setTimeout(function () {
-                window.close();
-                showCloseText();
-              }, 5000);
-            });
-          }
-        } catch (err) {
-          console.error(err, "service worker error in redirect");
-          bc && bc.close();
-          window.close();
-          showCloseText();
-        }
-      } else {
-        // in preopen, awaiting redirect
-        try {
-          bc = new broadcastChannelLib.BroadcastChannel("preopen_channel_" + preopenInstanceId, broadcastChannelOptions);
-          bc.onmessage = function (ev) {
-            var { preopenInstanceId: oldId, payload, message } = ev.data;
-            if (oldId === preopenInstanceId && payload && payload.url) {
-              window.location.href = payload.url;
-            } else if (oldId === preopenInstanceId && message === "setup_complete") {
-              bc.postMessage({
-                data: {
-                  preopenInstanceId: preopenInstanceId,
-                  message: "popup_loaded",
-                },
-              });
-            }
-            if (ev.error && ev.error !== "") {
-              console.error(ev.error);
-              bc.close();
-            }
-          };
-        } catch (err) {
-          console.error(err, "service worker error in preopen");
-          bc && bc.close();
-          window.close();
-          showCloseText();
-        }
-      }
-    </script>
-  </body>
-</html>
-                        
-${""}
-  `,
-            ],
-            { type: "text/html" },
-          ),
-        ),
-      );
-    }
-  } catch (error) {
-    console.error(error);
-  }
-});
diff --git a/examples/vue-app/vue.config.js b/examples/vue-app/vue.config.js
index 78f61066..f808098d 100644
--- a/examples/vue-app/vue.config.js
+++ b/examples/vue-app/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
       new ProvidePlugin({
         process: "process/browser",
         Buffer: ["buffer", "Buffer"],
-      })
+      }),
     );
     config.resolve.fallback = {
       ...(config.resolve.fallback || {}),
@@ -35,5 +35,11 @@ module.exports = {
       stream: false,
       zlib: false,
     };
+    config.devServer = {
+      static: {
+        directory: path.join(__dirname, "node_modules/@toruslabs/customauth/serviceworker"),
+        publicPath: "/serviceworker",
+      },
+    };
   },
 };
diff --git a/serviceworker/sw.js b/serviceworker/sw.js
index de1d0881..bb7767a1 100644
--- a/serviceworker/sw.js
+++ b/serviceworker/sw.js
@@ -299,10 +299,7 @@ self.addEventListener("fetch", function (event) {
       }
     </script>
   </body>
-</html>
-                        
-${""}
-  `,
+</html>`,
             ],
             { type: "text/html" }
           )
