Merge pull request #8 from torusresearch/feat/sw-changes

Change sw registration route

Author: YZhenY

README.md

@@ -7,17 +7,17 @@ To allow your web app to retrieve keys:
 1. Install the package
    `npm i @toruslabs/torus-direct-web-sdk`
 
-2. Serve [service worker](public/sw.js) from `baseUrl` where baseUrl is the one passed while instantiating `TorusSdk` for specific login (example http://localhost:3000/). If you're already using a sw, pls ensure to port over the fetch override from [our service worker](public/sw.js)
+2. Serve [service worker](public/sw.js) from `baseUrl` where baseUrl is the one passed while instantiating `TorusSdk` for specific login (example http://localhost:3000/serviceworker/). If you're already using a sw, pls ensure to port over the fetch override from [our service worker](public/sw.js)
 
-3. For browsers where service workers are not supported or if you wish to not use service workers, create and serve [redirect page](public/redirect.html) from `baseUrl/serviceworker/redirect` where baseUrl is the one passed while instantiating `TorusSdk` for specific login ( example http://localhost:3000/)
+3. For browsers where service workers are not supported or if you wish to not use service workers, create and serve [redirect page](public/redirect.html) from `baseUrl/redirect` where baseUrl is the one passed while instantiating `TorusSdk` for specific login ( example http://localhost:3000/serviceworker/)
 
-4. At verifier's interface (where you obtain client id), please use `baseUrl/serviceworker/redirect` (eg: http://localhost:3000/serviceworker/redirect) as the redirect_uri where baseUrl is the one passed while instantiating `TorusSdk`
+4. At verifier's interface (where you obtain client id), please use `baseUrl/redirect` (eg: http://localhost:3000/serviceworker/redirect) as the redirect_uri where baseUrl is the one passed while instantiating `TorusSdk`
 
 5. Instantiate the package with your own specific client-id
 
 ```js
 const torus = new TorusSdk({
-  baseUrl: "http://localhost:3000",
+  baseUrl: "http://localhost:3000/serviceworker/",
   GOOGLE_CLIENT_ID: "MY CLIENT ID GOOGLE",
   proxyContractAddress: "0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183", // details for test net
   network: "ropsten", // details for test net

examples/vue-app/public/sw.js renamed to examples/vue-app/public/serviceworker/sw.js

@@ -31,7 +31,7 @@ export default {
   methods: {
     async login() {
       try {
-        const torus = new TorusSdk({ baseUrl: "http://localhost:3000/", GOOGLE_CLIENT_ID: '876733105116-i0hj3s53qiio5k95prpfmj0hp0gmgtor.apps.googleusercontent.com' });
+        const torus = new TorusSdk({ baseUrl: "http://localhost:3000/serviceworker", GOOGLE_CLIENT_ID: '876733105116-i0hj3s53qiio5k95prpfmj0hp0gmgtor.apps.googleusercontent.com', enableLogging: true });
         await torus.init();
         const loginDetails = await torus.triggerLogin(this.selectedVerifier, this.selectedVerifier);
         this.console(loginDetails);  

examples/vue-app/src/App.vue

@@ -12,7 +12,7 @@ self.addEventListener("message", function (event) {
 self.addEventListener("fetch", function (event) {
   try {
     const url = new URL(event.request.url);
-    if (url.pathname.includes("/serviceworker/redirect") && url.href.includes(getScope())) {
+    if (url.pathname.includes("redirect") && url.href.includes(getScope())) {
       event.respondWith(
         new Response(
           new Blob(

public/sw.js

@@ -21,21 +21,22 @@ class DirectWebSDK {
     TWITCH_CLIENT_ID,
     REDDIT_CLIENT_ID,
     DISCORD_CLIENT_ID,
-    baseUrl,
+    baseUrl = "http://localhost:3000/serviceworker/",
     network = MAINNET,
     proxyContractAddress = "0x638646503746d5456209e33a2ff5e3226d698bea",
     enableLogging = false,
   } = {}) {
     this.isInitialized = false;
+    const baseUri = new URL(baseUrl);
     this.config = {
       GOOGLE_CLIENT_ID,
       FACEBOOK_APP_ID,
       TWITCH_CLIENT_ID,
       REDDIT_CLIENT_ID,
       DISCORD_CLIENT_ID,
-      baseUrl: baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`,
+      baseUrl: baseUri.href.endsWith("/") ? baseUri.href : `${baseUri.href}/`,
       get redirect_uri() {
-        return baseUrl.endsWith("/") ? `${baseUrl}serviceworker/redirect` : `${baseUrl}/serviceworker/redirect`;
+        return `${this.baseUrl}redirect`;
       },
     };
     const torus = new Torus();