Address PR Feedback

OneSignal · Dec 19, 2024 · a361393 · a361393
1 parent 7275ad0
commit a361393
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/sdk_files/push/onesignal/index.html b/sdk_files/push/onesignal/index.html
@@ -1,2 +1,2 @@
 <!-- Prevent search bots from indexing this folder if directory listing is enabled on the server -->
-<html><head><meta name="robots" content="noindex, nofollow"></head><body></body></html>
+<html><head><meta name="robots" content="noindex, nofollow"></head><body></body></html>
diff --git a/v2/complete-migration.php b/v2/complete-migration.php
@@ -9,19 +9,9 @@ function onesignal_complete_migration()
             wp_die(__('Security check failed', 'onesignal-push'));
         }
 
-        // Get current settings
-        $settings = get_option('OneSignalWPSetting');
-
-        if (!$settings) {
-            wp_die(__('No settings found', 'onesignal-push'));
-        }
-
         // Mark the plugin as migrated
         update_option('onesignal_plugin_migrated', true);
 
-        // clean up other settings
-        delete_option('onesignal.last_send_time');
-
         // Provide feedback to the user
         wp_redirect(admin_url('admin.php?page=onesignal-admin-page.php'));
         exit;

diff --git a/v2/onesignal-public.php b/v2/onesignal-public.php
@@ -71,7 +71,7 @@ public static function onesignal_header()
 	wp_register_script('local_sdk', 'https://localhost:3001/sdks/OneSignalSDK.js', array(), '1.0.0', array('strategy' => 'async'));
         wp_enqueue_script('local_sdk');
     } else {
-        wp_register_script('remote_sdk', 'https://cdn.onesignal.com/sdks/web/v16/OneSignalSDK.page.js', array(), '1.0.0', array('strategy' => 'async'));
+        wp_register_script('remote_sdk', 'https://cdn.onesignal.com/sdks/web/v16/OneSignalSDK.page.js', array(), '1.0.0', array('strategy' => 'defer'));
         wp_enqueue_script('remote_sdk');
     } ?>
     <script>
@@ -84,7 +84,7 @@ public static function onesignal_header()
 
         <?php
             if(array_key_exists('onesignal_sw_js', $onesignal_wp_settings)) {
-                $swScope = self::getOneSignalPluginPath() . '/v2/sdk_files/push/onesignal/';
+                $swScope = self::getOneSignalPluginPath() . '/sdk_files/push/onesignal/';
                 echo "oneSignal_options['serviceWorkerParam'] = { scope: '$swScope' };\n";
                 echo "oneSignal_options['serviceWorkerPath'] = 'OneSignalSDKWorker.js';\n";
             } else {
@@ -293,20 +293,16 @@ public static function onesignal_header()
                 if (apply_filters('onesignal_initialize_sdk', $onesignal_wp_settings)) {
                     // If the filter returns "$do_initialize_sdk: true", initialize the web SDK
               ?>
-              OneSignalDeferred.push(async function(OneSignal) {
-                OneSignal.init(window._oneSignalInitOptions);
-              });
+              OneSignal.init(window._oneSignalInitOptions);
               <?php
                 } else {
                     ?>
               /* OneSignal: onesignal_initialize_sdk filter preventing SDK initialization. */
               <?php
                 }
             } else {
-                ?>
-              OneSignalDeferred.push(async function(OneSignal) {
-                OneSignal.init(window._oneSignalInitOptions);
-              });
+              ?>
+              OneSignal.init(window._oneSignalInitOptions);
               <?php
             }
 

diff --git a/v2/views/config.php b/v2/views/config.php
@@ -25,7 +25,6 @@
 
         // Open the modal when the "I Migrated" button is clicked
         confirmButton.addEventListener("click", function () {
-          console.log('Migration modal clicked');
             jQuery(modal).modal("show");
         });
 

diff --git a/v3/onesignal-admin/onesignal-admin.js b/v3/onesignal-admin/onesignal-admin.js
@@ -19,8 +19,8 @@ window.addEventListener("DOMContentLoaded", () => {
   }
 
   function isValidApiKey(apiKey) {
-    const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-    const opaqueTokenRegex = /^os_v2_(app|org)_[2-7a-z]{56,}$/; // Base32 encoded, minimum 56 characters
+  const base64Regex = /^(?:[A-Za-z0-9+/]{4}){12,}(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/; // At least 48 characters in Base64
+  const opaqueTokenRegex = /^os_v[2-9]_app_[2-7a-z]{56,}$/;
     return (base64Regex.test(apiKey) || opaqueTokenRegex.test(apiKey)); // Ensure it's not empty and matches regex
   }