Merge pull request #2467 from apinf/develop

Merging for release 0.43.0

Author: brylie

.meteor/packages

@@ -39,7 +39,7 @@ kadira:blaze-layout
 kadira:dochead
 kadira:flow-router
 kurounin:pagination-blaze
-kurounin:pagination@=1.0.15
+kurounin:pagination@=1.0.21
 [email protected]
 [email protected]
 matb33:collection-hooks

.meteor/versions

@@ -76,7 +76,7 @@ juliancwirko:[email protected]
 kadira:[email protected]
 kadira:[email protected]
 kadira:[email protected]
-kurounin:[email protected].15
+kurounin:[email protected].21
 kurounin:[email protected]
 [email protected]
 [email protected]

about/client/about.html

@@ -33,7 +33,7 @@ <h3>
               Apinf
             </dt>
             <dd>
-              0.42.0
+              0.43.0
             </dd>
             <dt>
               API Umbrella

api_catalog/client/api_catalog.js

@@ -25,6 +25,9 @@ Template.apiCatalog.onCreated(function () {
   // Get user id
   const userId = Meteor.userId();
 
+  // Default sort
+  const defaultSort = { name: 1 };
+
   // Set filters
   // On default: Show all public apis for anonymous users
   let filters = { isPublic: true };
@@ -50,16 +53,10 @@ Template.apiCatalog.onCreated(function () {
     // Count of cards in catalog
     perPage: 24,
     // Set sort by name on default
-    sort: { name: 1 },
+    sort: defaultSort,
     filters,
   });
 
-  // Subscribe to API logo collection
-  instance.subscribe('allApiLogo');
-
-  // Subscribe to all users, returns only usernames
-  instance.subscribe('allUsersUsernamesOnly');
-
   // Subscribe to bookmarks of current user
   instance.subscribe('userApiBookmarks');
 
@@ -73,14 +70,14 @@ Template.apiCatalog.onCreated(function () {
       FlowRouter.getQueryParam('sortDirection') === 'ascending' ? 1 : -1;
 
     // Create a object for storage sorting parameters
-    const sort = {};
-    // GCheck of existing parameters
+    let sort = {};
+    // Check of existing parameters
     if (sortByParameter && sortDirectionParameter) {
       // Get field and direction of sorting
       sort[sortByParameter] = sortDirectionParameter;
     } else {
       // Otherwise get it like default value
-      sort.name = 1;
+      sort = defaultSort;
     }
 
     // Change sorting

api_catalog/client/grid/grid.js

@@ -0,0 +1,29 @@
+/* Copyright 2017 Apinf Oy
+ This file is covered by the EUPL license.
+ You may obtain a copy of the licence at
+ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 */
+
+// Meteor packages imports
+import { Template } from 'meteor/templating';
+
+Template.apiCatalogGrid.onCreated(function () {
+  this.autorun(() => {
+    // Get APIs document
+    const apis = Template.currentData().apis;
+
+    const apiLogoIds = [];
+
+    // Get list of logo IDs
+    apis.forEach((api) => {
+      if (api.apiLogoFileId) {
+        apiLogoIds.push(api.apiLogoFileId);
+      }
+    });
+
+    // Subscribe to API logo collection by logo IDs
+    this.subscribe('apiLogoByIds', apiLogoIds);
+
+    // Subscribe to usernames of API managers
+    this.subscribe('managersUsernames', apis);
+  });
+});

api_catalog/client/table/table.js

@@ -0,0 +1,30 @@
+/* Copyright 2017 Apinf Oy
+ This file is covered by the EUPL license.
+ You may obtain a copy of the licence at
+ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11
+ */
+
+// Meteor packages imports
+import { Template } from 'meteor/templating';
+
+Template.apiCatalogTable.onCreated(function () {
+  this.autorun(() => {
+    // Get APIs document
+    const apis = Template.currentData().apis;
+
+    const apiLogoIds = [];
+
+    // Get list of logo IDs
+    apis.forEach((api) => {
+      if (api.apiLogoFileId) {
+        apiLogoIds.push(api.apiLogoFileId);
+      }
+    });
+
+    // Subscribe to API logo collection by logo IDs
+    this.subscribe('apiLogoByIds', apiLogoIds);
+
+    // Subscribe to usernames of API managers
+    this.subscribe('managersUsernames', apis);
+  });
+});

api_docs/client/manage/manage.html

@@ -26,6 +26,9 @@ <h1 class="modal-title">
               {{> showHelp 'addApiDocumentation' }}
               {{_ "manageApiDocumentationModal_addDocumentation_title" }}
             </legend>
+            <p class="help-text">
+              {{_ 'manageApiDocumentationModal_helpText_useHttpsProtocol' }}
+            </p>
             {{> afQuickField
               name="type"
               firstOption=false

api_docs/client/swaggerUI/swaggerUi.html

@@ -4,31 +4,44 @@
 https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 -->
 
 <template name="swaggerUi">
-  <div class="swagger-section">
-    <div id="header">
-      <div class="swagger-ui-wrap">
-        <a id="logo" href="http://swagger.io" target="_blank" rel="nofollow">
-          <img src="/img/logo_small.png" class="logo__img" alt="swagger" height="30" width="30">
-          <span class="logo__title">swagger</span>
-        </a>
-        <form id="api_selector">
-          <div class="input"><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-          <div id="auth_container"></div>
-          <div class="input"><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div>
-        </form>
+  {{# if dataFetched }}
+    {{# if useHttpProtocol }}
+      <div class="alert alert-danger alert-dismissible" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <span>
+          <strong>
+            {{_ 'swaggerUi_alertText_Warning' }}
+          </strong>
+          {{_ 'swaggerUi_alertText_mainText' }}
+        </span>
       </div>
-    </div>
-    <div id="message-bar" class="swagger-ui-wrap message-success" data-sw-translate=""></div>
-    {{# if dataFetched }}
+    {{/ if }}
+    <div class="swagger-section">
+      <div id="header">
+        <div class="swagger-ui-wrap">
+          <a id="logo" href="http://swagger.io" target="_blank" rel="nofollow">
+            <img src="/img/logo_small.png" class="logo__img" alt="swagger" height="30" width="30">
+            <span class="logo__title">swagger</span>
+          </a>
+          <form id="api_selector">
+            <div class="input"><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
+            <div id="auth_container"></div>
+            <div class="input"><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div>
+          </form>
+        </div>
+      </div>
+      <div id="message-bar" class="swagger-ui-wrap message-success" data-sw-translate=""></div>
       {{# if documentationValid }}
         {{> swaggerUiContent api=api }}
       {{ else }}
         <i>
           {{_ 'swaggerUi_swaggerDocumentInvalidText' }}
         </i>
       {{/ if }}
-    {{ else }}
-      {{> spinner }}
-    {{/ if }}
-  </div>
+    </div>
+  {{ else }}
+    {{> spinner }}
+  {{/ if }}
 </template>

api_docs/client/swaggerUI/swaggerUi.js

@@ -19,14 +19,26 @@ Template.swaggerUi.onCreated(() => {
   // Get url of api documentation
   const documentationURL = instance.data.api.documentation();
 
-  // Check validation of Swagger file
-  Meteor.call('isValidSwagger', documentationURL, (error, result) => {
-    // result can be 'true' or '{}'
-    if (result === true) {
-      // Save result in template instance
-      instance.documentationValid = result;
+  // Parsed swagger file
+  Meteor.call('parsedDocument', documentationURL, (error, result) => {
+    // Document is valid on default
+    instance.documentationValid = true;
+    // Document doesn't contain http protocol on default
+    instance.useHttpProtocol = false;
+
+    // Document is not valid if result is {}
+    if (result === {}) {
+      // Set that document is not valid
+      instance.documentationValid = false;
+    }
+
+    // Checking of scheme contains only http protocol
+    if (result.schemes && result.schemes[0] === 'http') {
+      // Set the document contains only http protocol
+      instance.useHttpProtocol = true;
     }
-    // Set flag on Data is Ready
+
+    // Set flag Data is Ready
     instance.dataFetched.set(true);
   });
 });
@@ -42,4 +54,9 @@ Template.swaggerUi.helpers({
     // Get status of api documentation is valid
     return instance.documentationValid;
   },
+  useHttpProtocol () {
+    const instance = Template.instance();
+    // Get status of documentation has only http in schemes
+    return instance.useHttpProtocol;
+  },
 });

api_docs/client/swaggerUI/swaggerUiContent/swaggerUiContent.js

@@ -28,44 +28,53 @@ Template.swaggerUiContent.onCreated(function () {
   // Get URL of api documentation
   const documentationURL = api.documentation();
 
-  // Get proxy
-  const proxy = Proxies.findOne();
-
   // Get proxy backend
   const proxyBackend = ProxyBackends.findOne({ apiId: api._id });
 
-  // Get proxy host if it exists
-  let proxyHost = proxy ? proxy.apiUmbrella.url : '';
+  // Placeholders;
+  let proxyBasePath;
+  let proxyHost;
+  let apiKeyValue;
 
-  // Get values of proxy apiUmbrella
-  const apiUmbrellaSettings = proxyBackend ? proxyBackend.apiUmbrella.url_matches : false;
+  if (proxyBackend) {
+    // Get ID of current proxy
+    const proxyId = proxyBackend.proxyId;
 
-  // Get proxy base path if it exists
-  let proxyBasePath = apiUmbrellaSettings ? apiUmbrellaSettings[0].frontend_prefix : '';
+    const proxy = Proxies.findOne(proxyId);
 
-  if (_.startsWith(proxyHost, 'http://')) {
-    // Delete 'http://' prefix
-    proxyHost = proxyHost.slice(7, proxyHost.length);
-  } else {
-    // Delete 'https://' prefix
-    proxyHost = proxyHost.slice(8, proxyHost.length);
-  }
+    // Get proxy host if it exists
+    proxyHost = proxy ? proxy.apiUmbrella.url : '';
 
-  // Delete last forward slash if it exists
-  if (_.endsWith(proxyHost, '/')) {
-    proxyHost = proxyHost.slice(0, -1);
-  }
+    // Get values of proxy apiUmbrella
+    const apiUmbrellaSettings = proxyBackend ? proxyBackend.apiUmbrella.url_matches : false;
 
-  // Delete last forward slash if it exists
-  if (_.endsWith(proxyBasePath, '/')) {
-    proxyBasePath = proxyBasePath.slice(0, -1);
-  }
+    // Get proxy base path if it exists
+    proxyBasePath = apiUmbrellaSettings ? apiUmbrellaSettings[0].frontend_prefix : '';
 
-  // Get api key collection
-  const apiKey = proxy ? ApiKeys.findOne({ proxyId: proxy._id, userId: Meteor.userId() }) : '';
+    if (_.startsWith(proxyHost, 'http://')) {
+      // Delete 'http://' prefix
+      proxyHost = proxyHost.slice(7, proxyHost.length);
+    } else {
+      // Delete 'https://' prefix
+      proxyHost = proxyHost.slice(8, proxyHost.length);
+    }
 
-  // Check if api-key exists
-  const apiKeyValue = apiKey ? apiKey.apiUmbrella.apiKey : '';
+    // Delete last forward slash if it exists
+    if (_.endsWith(proxyHost, '/')) {
+      proxyHost = proxyHost.slice(0, -1);
+    }
+
+    // Delete last forward slash if it exists
+    if (_.endsWith(proxyBasePath, '/')) {
+      proxyBasePath = proxyBasePath.slice(0, -1);
+    }
+
+    // Get api key collection
+    const apiKey = proxy ? ApiKeys.findOne({ proxyId: proxy._id, userId: Meteor.userId() }) : '';
+
+    // Check if api-key exists
+    apiKeyValue = apiKey ? apiKey.apiUmbrella.apiKey : '';
+  }
 
   // Create object to save information about property of api-key authorization
   const infoAuth = {};