Fix/library subdoamin dappid (#135)

* fix: dappid for subdomains (#117) * fix: subdomain dappid
fairDataSociety · Apr 25, 2023 · e7f5729 · e7f5729
1 parent 1b7a878
commit e7f5729
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/library/src/utils/dapp.util.ts b/library/src/utils/dapp.util.ts
@@ -1,10 +1,15 @@
 const dappIdRegex = new RegExp('.+/bzz/([^/]+).*')
+const subdomainDappIdRegex = new RegExp('https?://(.+).swarm.localhost:.*')
 
 export function getDappId(): string | null {
   const url = window.location.href
 
   // extracts dApp ENS name from a bzz link (e.g http://localhost:1633/bzz/ENS/...)
-  const result = dappIdRegex.exec(url)
+  let result = dappIdRegex.exec(url)
+
+  if (!result || !result[1]) {
+    result = subdomainDappIdRegex.exec(url)
+  }
 
   if (!result || !result[1]) {
     return null