From 954a0d520ea29c068d75d20cbf1af62c610f8680 Mon Sep 17 00:00:00 2001
From: armine-fliplet <asimonyan@fliplet.com>
Date: Thu, 13 Nov 2025 14:47:30 +0400
Subject: [PATCH 1/2] PS-1537 [FIX] Adds validation for correct bundle id on
 app submission for android.

---
 interface.html            |   8 +--
 js/interface.js           | 111 ++++++++++++++++++++++++++++----------
 js/interface.templates.js |   4 +-
 3 files changed, 89 insertions(+), 34 deletions(-)

diff --git a/interface.html b/interface.html
index f7714ff..e707917 100644
--- a/interface.html
+++ b/interface.html
@@ -129,7 +129,7 @@ <h4 class="panel-title collapsed" role="button" data-toggle="collapse" data-pare
                   </div>
                   <div class="fl-bundleId-field">
                     <div class="col-sm-8">
-                      <input type="text" name="fl-store-bundleId" class="form-control" id="fl-store-bundleId" pattern="^(?=.*[\.])[0-9a-zA-Z.-]{1,}$" data-error="Please make sure the bundle ID contains at least one period (.) and contains only alphanumeric characters (A–Z, a–z, and 0–9), hyphens (-), and periods (.)" data-required-error="Please enter the Bundle ID" maxlength="155" required />
+                      <input type="text" name="fl-store-bundleId" class="form-control" id="fl-store-bundleId" pattern="^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*){1,}$" data-pattern-error="Please make sure the bundle ID contains at least two segments separated by dots, each starting with a letter, containing only lowercase letters [a–z], numbers [0–9], and underscores (_). " data-required-error="Please enter the Bundle ID" maxlength="155" required />
                       <div class="help-block with-errors"></div>
                       <p class="help-block"><small>This value needs to be unique and the structure must be <code>com.<i>organizationName</i>.<i>appName</i></code>.</small></p>
                     </div>
@@ -335,7 +335,7 @@ <h4 class="panel-title collapsed" role="button" data-toggle="collapse" data-pare
                   </div>
                   <div class="fl-bundleId-field">
                     <div class="col-sm-8">
-                      <input type="text" name="fl-ent-bundleId" class="form-control" id="fl-ent-bundleId" pattern="^(?=.*[\.])[0-9a-zA-Z.-]{1,}$" data-error="Please make sure the bundle ID contains at least one period (.) and contains only alphanumeric characters (A–Z, a–z, and 0–9), hyphens (-), and periods (.)" data-required-error="Please enter the Bundle ID" maxlength="155" required />
+                      <input type="text" name="fl-ent-bundleId" class="form-control" id="fl-ent-bundleId" pattern="^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$" data-pattern-error="Please make sure the bundle ID has at least two segments separated by dots, each starting with a letter, containing only lowercase letters [a–z], numbers [0–9], and underscores (_)." data-required-error="Please enter the Bundle ID" maxlength="155" required />
                       <div class="help-block with-errors"></div>
                       <p class="help-block"><small>This value needs to be unique and the structure must be <code>com.<i>organizationName</i>.<i>appName</i></code>.</small></p>
                     </div>
@@ -365,7 +365,7 @@ <h4>Push notifications</h4>
         <div class="col-xs-5 save-btn-holder col-xs-offset-2 text-right">
           {{#if appFeatures.appStores.google.private }}
           <p class="help-block"><small>Submit your information when you are ready!<br>We will take care of the rest.</small></p>
-          <button type="submit" class="btn btn-primary fl-green button-enterprise-request" data-enterprise-build>Request App <i class="fa fa-paper-plane"></i></button>
+          <button type="submit" class="btn btn-primary fl-green button-enterprise-request" data-enterprise-build>Request App<i class="fa fa-paper-plane"></i></button>
           {{else}}
           <p class="help-block"><small>Upgrade to an app plan to request your app to be published.</small></p>
           <button type="submit" class="btn btn-warning button-appStore-request" data-app-store-build>Upgrade to publish</button>
@@ -409,7 +409,7 @@ <h4 class="font-semibold m-0 mb-2">Push notifications technical details</h4>
         <div class="flex mb-8">
           <div class="font-bold" style="width: 85px">Step 4</div>
           <div>
-            Visit <a href="https://console.cloud.google.com/" target="_blank">Google Cloud</a> to set up your FCM Service account. 
+            Visit <a href="https://console.cloud.google.com/" target="_blank">Google Cloud</a> to set up your FCM Service account.
             <br/> Follow detailed instructions <a href="https://help.fliplet.com/push-notifications/#2" target="_blank">here</a>.
           </div>
         </div>
diff --git a/js/interface.js b/js/interface.js
index d4c3456..d526537 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -30,11 +30,13 @@ var formInputSelectors = [
 
 /* FUNCTIONS */
 
-var createBundleId = function(bundleId) {
-  return $.ajax({
-    url: 'https://itunes.apple.com/lookup?bundleId=' + bundleId,
-    dataType: 'jsonp'
+var createBundleId = async function(bundleId) {
+  const { exists } = await Fliplet.API.request({
+    method: 'GET',
+    url: `v1/apps/bundle/android/exists/${bundleId}`
   });
+
+  return exists;
 };
 
 function incrementVersionNumber(versionNumber) {
@@ -70,7 +72,7 @@ function addThumb(thumb) {
 }
 
 function loadAppStoreData() {
-  $('#appStoreConfiguration [name]').each(function(i, el) {
+  $('#appStoreConfiguration [name]').each(async function(i, el) {
     var name = $(el).attr('name');
 
     /* APP SCREENSHOTS */
@@ -107,17 +109,16 @@ function loadAppStoreData() {
 
     /* ADD BUNDLE ID */
     if (name === 'fl-store-bundleId' && typeof appStoreSubmission.data[name] === 'undefined') {
-      var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName);
+      var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName).toLowerCase();
+      const bundleIdExists = await createBundleId(bundleId);
 
-      createBundleId(bundleId).then(function(response) {
-        if (response.resultCount === 0) {
-          $('.bundleId-store-text').html(bundleId);
-          $('[name="' + name + '"]').val(bundleId);
-        } else {
-          $('.bundleId-store-text').html(bundleId + (response.resultCount + 1));
-          $('[name="' + name + '"]').val(bundleId + (response.resultCount + 1));
-        }
-      });
+      if (!bundleIdExists) {
+        $('.bundleId-store-text').html(bundleId);
+        $('[name="' + name + '"]').val(bundleId);
+      } else {
+        $('.bundleId-store-text').html(bundleId + 1);
+        $('[name="' + name + '"]').val(bundleId + 1);
+      }
 
       return;
     }
@@ -221,22 +222,21 @@ function checkFileExtension(fileName, element) {
 }
 
 function loadEnterpriseData() {
-  $('#enterpriseConfiguration [name]').each(function(i, el) {
+  $('#enterpriseConfiguration [name]').each(async function(i, el) {
     var name = $(el).attr('name');
 
     /* ADD BUNDLE ID */
     if (name === 'fl-ent-bundleId' && typeof enterpriseSubmission.data[name] === 'undefined') {
-      var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName);
+      var bundleId = 'com.' + _.camelCase(organizationName) + '.' + _.camelCase(appName).toLowerCase();
+      const bundleIdExists = await createBundleId(bundleId);
 
-      createBundleId(bundleId).then(function(response) {
-        if (response.resultCount === 0) {
-          $('.bundleId-apk-text').html(bundleId);
-          $('[name="' + name + '"]').val(bundleId);
-        } else {
-          $('.bundleId-apk-text').html(bundleId + (response.resultCount + 1));
-          $('[name="' + name + '"]').val(bundleId + (response.resultCount + 1));
-        }
-      });
+      if (!bundleIdExists) {
+        $('.bundleId-apk-text').html(bundleId);
+        $('[name="' + name + '"]').val(bundleId);
+      } else {
+        $('.bundleId-apk-text').html(bundleId + 1);
+        $('[name="' + name + '"]').val(bundleId + 1);
+      }
 
       return;
     }
@@ -681,6 +681,38 @@ function validateImageUrl(url, imageSelector, errorSelector) {
   });
 }
 
+async function isBundleIdUnique(configuration) {
+  var bundleIdValue = ($(`[name="fl-${configuration}-bundleId"]`).val() || '').trim();
+
+  try {
+    var bundleIdExists = await createBundleId(bundleIdValue);
+
+    if (bundleIdExists) {
+      var $input = $('#fl-store-bundleId');
+      var $group = $input.closest('.form-group');
+      var $block = $group.find('.help-block.with-errors');
+
+      $block.html('<ul class="list-unstyled"><li>Bundle ID already exists on the Play Store. Please choose a unique Bundle ID.</li></ul>');
+      $group.addClass('has-error has-danger');
+      $('.fl-sb-appStore .fl-bundleId-holder').addClass('hidden');
+      $('.fl-sb-appStore .fl-bundleId-field').addClass('show');
+      setTimeout(checkGroupErrors, 0);
+
+      Fliplet.Modal.alert({
+        message: 'Bundle ID already exists. Please choose a unique Bundle ID.'
+      });
+
+      return false;
+    }
+
+    return true;
+  } catch (e) {
+    Fliplet.Modal.alert({
+      message: 'We could not verify the Bundle ID. Please try again.'
+    });
+  }
+}
+
 /* ATTACH LISTENERS */
 
 $('[data-toggle="tooltip"]').tooltip({
@@ -734,6 +766,21 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function() {
     Fliplet.Widget.autosize();
   });
 
+// Force on-the-fly validation for Bundle ID fields (validate only the field, not the whole form)
+$(document).on('input focusout', '#fl-store-bundleId, #fl-ent-bundleId', function() {
+  var $field = $(this);
+  var $form = $field.closest('form');
+  var validator = $form.data('bs.validator');
+
+  $form.validator('update');
+
+  if (validator && typeof validator.validateInput === 'function') {
+    validator.validateInput($field);
+  }
+
+  checkGroupErrors();
+});
+
 $('[name="fl-store-keywords"]').on('tokenfield:createtoken', function(e) {
   var currentValue = e.currentTarget.value.replace(/,\s+/g, ',');
   var newValue = e.attrs.value;
@@ -905,7 +952,7 @@ $('form').validator({
   }
 });
 
-$('#appStoreConfiguration').validator().on('submit', function(event) {
+$('#appStoreConfiguration').validator().on('submit', async function(event) {
   if (!storeFeatures.public) {
     Fliplet.Studio.emit('overlay', {
       name: 'app-settings',
@@ -959,6 +1006,10 @@ $('#appStoreConfiguration').validator().on('submit', function(event) {
     return;
   }
 
+  if (!await isBundleIdUnique('store')) {
+    return;
+  }
+
   if (appInfo && appInfo.productionAppId) {
     if (allAppData.indexOf('appStore') > -1) {
       var message = 'Are you sure you wish to update your published app?';
@@ -991,7 +1042,7 @@ $('#appStoreConfiguration').validator().on('submit', function(event) {
   setTimeout(checkGroupErrors, 0);
 });
 
-$('#enterpriseConfiguration').validator().on('submit', function(event) {
+$('#enterpriseConfiguration').validator().on('submit', async function(event) {
   if (!storeFeatures.private) {
     Fliplet.Studio.emit('overlay', {
       name: 'app-settings',
@@ -1045,6 +1096,10 @@ $('#enterpriseConfiguration').validator().on('submit', function(event) {
     return;
   }
 
+  if (!await isBundleIdUnique('ent')) {
+    return;
+  }
+
   if (appInfo && appInfo.productionAppId) {
     if (allAppData.indexOf('enterprise') > -1) {
       var message = 'Are you sure you wish to update your published app?';
diff --git a/js/interface.templates.js b/js/interface.templates.js
index 8167d6d..059f4f5 100644
--- a/js/interface.templates.js
+++ b/js/interface.templates.js
@@ -5,7 +5,7 @@ this["Fliplet"]["Widget"]["Templates"] = this["Fliplet"]["Widget"]["Templates"]
 this["Fliplet"]["Widget"]["Templates"]["templates.thumbs"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var helper;
 
-  return "<div class=\"col-xs-3\">\r\n  <img src=\""
+  return "<div class=\"col-xs-3\">\n  <img src=\""
     + container.escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"url","hash":{},"data":data}) : helper)))
-    + "\"/>\r\n</div>";
+    + "\"/>\n</div>";
 },"useData":true});
\ No newline at end of file

From 57e3b341d268fdb639f0be91fdfe8df1f6711775 Mon Sep 17 00:00:00 2001
From: armine-fliplet <asimonyan@fliplet.com>
Date: Thu, 13 Nov 2025 14:55:09 +0400
Subject: [PATCH 2/2] Fix Codacy error

---
 js/interface.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/interface.js b/js/interface.js
index d526537..5627713 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -31,12 +31,12 @@ var formInputSelectors = [
 /* FUNCTIONS */
 
 var createBundleId = async function(bundleId) {
-  const { exists } = await Fliplet.API.request({
+  const response = await Fliplet.API.request({
     method: 'GET',
     url: `v1/apps/bundle/android/exists/${bundleId}`
   });
 
-  return exists;
+  return response.exists;
 };
 
 function incrementVersionNumber(versionNumber) {