fix: implement new remote config

Headbright · May 14, 2024 · 54e31e0 · 54e31e0
1 parent ac76184
commit 54e31e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 31 deletions.
diff --git a/main.js b/main.js
@@ -10,7 +10,7 @@ import {
   getMicrosoftStoreUrl,
 } from "./src/config.js";
 
-import { getRemoteConfig } from "./src/remoteConfig.js";
+import { resolveAndParseRemoteConfigToUrl } from "./src/remoteConfig.js";
 
 function renderFallBack(config) {
   let badges = ``;
@@ -52,32 +52,15 @@ const executeRedirect = async () => {
   // determine configuration type
   const remoteUrl = getRemoteConfigUrl(location.href);
   if (remoteUrl) {
-    const remoteConfig = await getRemoteConfig(remoteUrl);
-    switch (platform) {
-      case "Apple":
-        if (remoteConfig.urlApple) {
-          location.href = remoteConfig.urlApple;
-        } else {
-          renderFallBack({});
-        }
-        break;
-      case "Google":
-        if (remoteConfig.urlGoogle) {
-          location.href = remoteConfig.urlGoogle;
-        } else {
-          renderFallBack({});
-        }
-        break;
-      case "Microsoft":
-        if (remoteConfig.urlMicrosoft) {
-          location.href = remoteConfig.urlMicrosoft;
-        } else {
-          renderFallBack({});
-        }
-        break;
-      default:
-        renderFallBack({});
-        break;
+    const targetUrl = await resolveAndParseRemoteConfigToUrl(
+      remoteUrl,
+      platform,
+      Intl.DateTimeFormat().resolvedOptions().timeZone
+    );
+    if (targetUrl) {
+      location.href = targetUrl;
+    } else {
+      renderFallBack({});
     }
   } else {
     // simple link

diff --git a/src/remoteConfig.js b/src/remoteConfig.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-// Intl.DateTimeFormat().resolvedOptions().timeZone
-
 export async function resolveAndParseRemoteConfigToUrl(
   configRemoteUrl,
   platform,
@@ -69,7 +67,6 @@ export function parseRemoteConfig(configJson, platform, tz) {
       const matchingConfig = geographicAreaPlace.filter((target) => {
         return target["audience"]["geographicArea"]["name"] === place;
       })[0];
-      console.log("match", matchingConfig);
 
       const url = matchingConfig["potentialAction"]["target"]["urlTemplate"];
       if (url) {
@@ -79,7 +76,6 @@ export function parseRemoteConfig(configJson, platform, tz) {
   }
 
   // if we're here, it's a match on platform
-  console.log("fallback:", targets[0]);
   return targets[0]["potentialAction"]["target"]["urlTemplate"];
 }