Merge pull request #96 from BuildFire/remove-static-key

fix(static-key): remove static google api key

Author: mas-iota

control/content/app.js

@@ -8,7 +8,12 @@
         .when('/', {
           templateUrl: 'templates/home.html',
           controllerAs: 'ContentHome',
-          controller: 'ContentHomeCtrl'
+          controller: 'ContentHomeCtrl',
+          resolve: {
+            ScriptLoaderService: function (ScriptLoaderService) {
+              return ScriptLoaderService.loadScript();
+            }
+          }
         })
         .when('/item', {
           templateUrl: 'templates/item.html',
@@ -46,7 +51,44 @@
           });
       }
     }])
-    .run(['$location', '$rootScope', function ($location, $rootScope) {
+    .service('ScriptLoaderService', ['$q', function ($q) {
+      this.loadScript = function () {
+        const deferred = $q.defer();
+
+        const { apiKeys } = buildfire.getContext();
+        const { googleMapKey } = apiKeys;
+        const url = `https://maps.googleapis.com/maps/api/js?v=v=3.exp&libraries=places&key=${googleMapKey}`;
+
+
+        const script = document.createElement('script');
+        script.type = 'text/javascript';
+        script.src = url;
+
+        if (document.querySelector(`script[src="${url}"]`)) {
+          console.info(`Script: ${url} is already loaded`);
+          deferred.resolve();
+          return deferred.promise;
+        }
+
+        script.onload = function () {
+          console.info(`Successfully loaded script: ${url}`);
+          deferred.resolve();
+        };
+
+        script.onerror = function () {
+          console.error(`Failed to load script: ${url}`);
+          deferred.reject('Failed to load script.');
+        };
+
+        window.gm_authFailure = () => {
+          deferred.resolve();
+        };
+
+        document.head.appendChild(script);
+        return deferred.promise;
+      };
+    }])
+    .run(['$location', '$rootScope','ScriptLoaderService', function ($location, $rootScope,ScriptLoaderService) {
       buildfire.messaging.onReceivedMessage = function (msg) {
         switch (msg.type) {
           case 'OpenItem':
@@ -60,4 +102,4 @@
         }
       };
     }]);
-})(window.angular);
+})(window.angular);

control/content/app.services.js

@@ -185,7 +185,9 @@
                         , valid = (inRange(-90, latitude, 90) && inRange(-180, longitude, 180));
 
                     if (valid) {
-                        $http.get("https://maps.googleapis.com/maps/api/geocode/json?latlng=" + latitude + "," + longitude + "&key=" + GOOGLE_KEYS.API_KEY)
+                        const { apiKeys } = buildfire.getContext();
+                        const { googleMapKey } = apiKeys;
+                        $http.get("https://maps.googleapis.com/maps/api/geocode/json?latlng=" + latitude + "," + longitude + "&key=" + googleMapKey)
                             .then(function (response) {
                                 // this callback will be called asynchronously
                                 // when the response is available
@@ -209,7 +211,9 @@
                     var deferred = $q.defer();
 
                     if (address) {
-                        $http.get("https://maps.googleapis.com/maps/api/geocode/json?address=" + address + "&key=" + GOOGLE_KEYS.API_KEY)
+                        const { apiKeys } = buildfire.getContext();
+                        const { googleMapKey } = apiKeys;
+                        $http.get("https://maps.googleapis.com/maps/api/geocode/json?address=" + address + "&key=" + googleMapKey)
                             .then(function (response) {
                                 // this callback will be called asynchronously
                                 // when the response is available

control/content/controllers/content.home.controller.js

@@ -16,7 +16,7 @@
         ContentHome.filter = null;
         ContentHome.isBusy = true;
         var _data = defaultInfo;
-        
+
         // Show the top plugin info part when on home view
         Buildfire.appearance.setHeaderVisibility(true);
 
@@ -472,12 +472,12 @@
                     }
                   });
                 }
-  
+
                 Deeplink.deleteById(ContentHome.items[index].id);
                 Buildfire.datastore.delete(ContentHome.items[index].id, TAG_NAMES.COUPON_ITEMS, function (err, result) {
                   if (err)
                     return;
-  
+
                   PluginEvents.unregister(ContentHome.items[index].id);
                   //ContentHome.items.splice(_index, 1);
                   ContentHome.items.splice(index, 1);
@@ -524,11 +524,11 @@
           } else {
             ContentHome.data.content.selectedStatus = 'All Statuses';
             ContentHome.data.content.selectedFilter = {title: undefined, id: "All Categories"};
-            
+
             ContentHome.searchOptionsForItems.filter = { "$json.title": { "$regex": '/*' } };
             ContentHome.items = [];
             ContentHome.searchOptionsForItems.skip = 0;
-  
+
             ContentHome.loadMoreItems('items');
           }
         }
@@ -825,7 +825,7 @@
           }
           ContentHome.busy = true;
           ContentHome.isBusy = true;
-          
+
           if (str !== 'filter')
             Buildfire.datastore.search(ContentHome.searchOptionsForItems, TAG_NAMES.COUPON_ITEMS, function (err, result) {
               if (err) {
@@ -843,7 +843,7 @@
               var tmpArray = [];
               var lastIndex = result.length;
               result.forEach(function (res, index) {
-                
+
                 tmpArray.push({
                   'title': res.data.title,
                   rank: index + 1,
@@ -970,7 +970,7 @@
           }
           $csv.import(headerRow).then(function (rows) {
             rows = rows.filter(function (row) { return row.title; });
-            
+
             if (rows && rows.length > 1) {
               var categoriesList = [], columns = rows.shift();
 
@@ -979,23 +979,23 @@
                 ContentHome.csvDataInvalid = true;
                 return;
               }
-              
+
               rows.map(el => categoriesList = categoriesList.concat(el.Categories.split(",")));
               categoriesList = [... new Set(categoriesList)];
-              
+
               var sortedCategories = [];
               categoriesList.map(category => {
-                var exists = rows.filter(row => 
+                var exists = rows.filter(row =>
                   row.SelectedCategories.toLowerCase().includes(category.toLowerCase()));
 
-                exists ? sortedCategories.push({ title: category, number: exists.length}) 
+                exists ? sortedCategories.push({ title: category, number: exists.length})
                 : null;
               });
-              
+
               buildfire.messaging.sendMessageToWidget({ type: "ImportCSV", importing: true });
               buildfire.messaging.sendMessageToWidget({ importCSV: 'started' });
               ContentHome.importingCSV = true;
-              
+
               const insertCategories = (callback) => {
                 buildfire.datastore.search({ recordCount: true }, TAG_NAMES.COUPON_CATEGORIES, (err, categories) => {
                   if (err) return console.error(err);
@@ -1013,7 +1013,7 @@
                           let toUpdate = ContentHome.filters.find(el => el.id === categoryExists.id);
                           if(toUpdate) {
                             let toUpdateIndex = ContentHome.filters.indexOf(toUpdate);
-                            ContentHome.filters[toUpdateIndex].data.noOfItems = categoryExists.data.noOfItems;      
+                            ContentHome.filters[toUpdateIndex].data.noOfItems = categoryExists.data.noOfItems;
                           }
 
                           updatedAll--;
@@ -1038,7 +1038,7 @@
               const saveRow = (row) => {
                 buildfire.datastore.insert(row, TAG_NAMES.COUPON_ITEMS, (err, result) => {
                   if (err) console.error("Failed saving row data", row);
-                  if (result && result.id) {                    
+                  if (result && result.id) {
                     PluginEvents.register({ key: result.id, title: result.data.title }, true);
                     if (!row.deepLinkId) {
                       new Deeplink({
@@ -1108,7 +1108,7 @@
                 });
               }
 
-              
+
               var rank = ContentHome.data.content.rankOfLastItem || 0;
               RankOfLastItem.setRank(rank);