Merge pull request apinf#3702 from apinf/hack/tenant-mock

Hack/tenant mock

Author: ilarimikkonen

.meteor/packages

@@ -86,7 +86,7 @@ useraccounts:bootstrap
 useraccounts:core
 useraccounts:flow-routing
 vsivsi:file-collection
-zimme:active-route
+zimme:active-route@2.3.2
 aldeed:autoform-select2
 natestrauser:select2
 meteorhacks:aggregate
@@ -96,6 +96,6 @@ cleandersonlobo:mdi-icons
 yasaricli:textcounter
 oauth@1.2.6
 
-underscore
+underscore@1.0.10
 kurounin:pagination
 kurounin:pagination-blaze@=1.0.6

.meteor/versions

@@ -3,7 +3,7 @@ accounts-github@1.4.2
 accounts-oauth@1.1.16
 accounts-password@1.5.1
 accounts-ui@1.3.1
-accounts-ui-unstyled@1.4.2
+accounts-ui-unstyled@1.4.1
 alanning:roles@1.2.16
 aldeed:autoform@5.8.1
 aldeed:autoform-bs-button-group-input@1.0.3
@@ -57,7 +57,7 @@ ddp-server@2.2.0
 deepwell:bootstrap-datepicker2@1.3.0
 deps@1.0.12
 diff-sequence@1.1.1
-dynamic-import@0.5.1
+dynamic-import@0.5.0
 ecmascript@0.12.4
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.8.0
@@ -78,7 +78,7 @@ harrison:papa-parse@1.1.7
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.4.2
+http@1.4.1
 id-map@1.1.0
 inter-process-messaging@0.1.0
 jquery@1.11.11
@@ -114,15 +114,15 @@ modules@0.13.0
 modules-runtime@0.10.3
 momentjs:moment@2.24.0
 mongo@1.6.0
-mongo-decimal@0.1.0
+mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 mongo-livedata@1.0.12
 natestrauser:select2@4.0.3
 nimble:restivus@0.8.11
 npm-bcrypt@0.9.3
 npm-mongo@3.1.1
-oauth@1.2.7
+oauth@1.2.6
 oauth2@1.2.1
 observe-sequence@1.0.16
 olragon:uri-js@1.13.1
@@ -144,7 +144,7 @@ reactive-dict@1.2.1
 reactive-var@1.0.11
 reload@1.2.0
 retry@1.1.0
-reywood:publish-composite@1.7.0
+reywood:publish-composite@1.5.2
 routepolicy@1.1.0
 sacha:spin@2.3.1
 service-configuration@1.0.11
@@ -179,7 +179,7 @@ useraccounts:bootstrap@1.14.2
 useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 vsivsi:file-collection@1.3.5
-webapp@1.7.2
+webapp@1.7.1
 webapp-hashing@1.0.9
 yasaricli:textcounter@0.0.1
 zimme:active-route@2.3.2

apinf_packages/core/client/navbar/navbar.html

@@ -22,6 +22,7 @@
         {{/ if }}
       </div>
       <ul class="nav navbar-nav" id="main-navbar">
+        <!-- Dashboard -->
         {{# if currentUser }}
           {{# if proxyIsDefined }}
             {{# if userCanViewDashboard }}
@@ -33,23 +34,40 @@
             {{/ if }}
           {{/ if }}
         {{/ if }}
+
+        <!-- MQTT Dashboard -->
         {{# if userCanViewMqttDashboard }}
           <li class="{{ isActiveRoute 'mqtt' }} main-links">
             <a href="{{ pathFor 'mqtt' }}" id="mqtt-button">
               {{_ "navbar_mqttDashboard" }}
             </a>
           </li>
         {{/ if }}
-          <li class="{{ isActiveRoute 'apiCatalog' }} main-links">
-            <a href="{{ pathFor 'apiCatalog' }}" id="apis-button">
-              {{_ "navbar_apis" }}
-            </a>
-          </li>
-          <li class="{{ isActiveRoute 'organizationCatalog' }} main-links">
-            <a href="{{ pathFor 'organizationCatalog' }}" id="organizations-button">
-              {{_ "navbar_organizations" }}
+
+        <!-- API catalog -->
+        <li class="{{ isActiveRoute 'apiCatalog' }} main-links">
+          <a href="{{ pathFor 'apiCatalog' }}" id="apis-button">
+            {{_ "navbar_apis" }}
+          </a>
+        </li>
+
+        <!-- Organizations -->
+        <li class="{{ isActiveRoute 'organizationCatalog' }} main-links">
+          <a href="{{ pathFor 'organizationCatalog' }}" id="organizations-button">
+            {{_ "navbar_organizations" }}
+          </a>
+        </li>
+
+        <!-- Tenants -->
+        <!-- TODO tenant: Show only in case user has logged in via Keyrock -->
+        {{# if canManageTenants }}
+          <li class="{{ isActiveRoute 'tenantCatalog' }} main-links">
+            <a href="{{ pathFor 'tenantCatalog' }}" id="tenants-button">
+              Tenants
             </a>
           </li>
+        {{/ if }}
+
         {{# if currentUser }}
           {{# if userCanAddApi }}
             <li class="{{ isActiveRoute 'addApi' }} main-links">
@@ -59,6 +77,7 @@
             </li>
           {{/ if }}
 
+          <!-- Users management -->
           {{# if isInRole 'admin' }}
             <li class="{{ isActiveRoute 'accountsAdmin' }} main-links">
               <a href="{{ pathFor 'accountsAdmin' }}" id="users-button">
@@ -67,6 +86,8 @@
             </li>
           {{/ if }}
         {{/ if }}
+
+        <!-- Pricing block -->
         {{# if homeCustomBlock }}
           <li class="{{ isActiveRoute 'pricing' }} main-links">
             <a href="{{ pathFor 'pricing' }}" id="pricing-button">
@@ -75,6 +96,8 @@
             </a>
           </li>
         {{/ if }}
+
+        <!-- Configuration of site -->
         {{# if isInRole 'admin' }}
           <li class="mobile-links-only hide-link">
             <a href="{{ pathFor 'branding' }}" id="branding-button">
@@ -97,6 +120,8 @@
             </a>
           </li>
         {{/ if }}
+
+        <!-- User own menu -->
         {{# if currentUser }}
           <li class="mobile-links-only hide-link">
             <a href="{{ pathFor 'profile' }}" id="profile-button">

apinf_packages/core/client/navbar/navbar.js

@@ -135,6 +135,16 @@ Template.navbar.helpers({
   currentUser () {
     return Meteor.user();
   },
+  canManageTenants () {
+    // Get user id
+    const userId = Meteor.userId();
+    const user = Meteor.users.findOne(userId);
+
+    if (user && user.services && user.services.fiware) {
+      return true;
+    }
+    return false;
+  },
   userCanViewMqttDashboard () {
     // Get current user Id
     const userId = Meteor.userId();

apinf_packages/core/lib/i18n/en.i18n.json

@@ -449,6 +449,8 @@
   "emailTemplates_verifyEmail_title": "Verify Your Email Address",
   "emailVerification_successMessage": "Email verified! Thanks!",
   "emqProxyForm_acl_title": "Access Control Rules",
+  "ensureTenantRemovalForm_button_cancel_title": "Cancel operation",
+  "ensureTenantRemovalForm_button_remove_title": "Remove this Tenant",
   "entityComment_cancelComment": "Cancel",
   "entityComment_deleteComment": "Delete",
   "entityComment_replyComment": "Reply",
@@ -539,6 +541,14 @@
   "importOpenApiSpecification_optionText_url": "URL",
   "importOpenApiSpecification_optionText_firstOption": "Select lifecycle status",
   "importOpenApiSpecificationUploadButton_buttonText_file": "Choose file",
+  "informTenantUser_emailSubject_tenantAddition": "New tenant added: __tenant__",
+  "informTenantUser_emailSubject_tenantRemoval": "Tenant __tenant__ removed",
+  "informTenantUser_emailSubject_userRemoval": "User removed from tenant __tenant__",
+  "informTenantUser_emailSubject_userRoleChange": "Changes in user roles in tenant __tenant__",
+  "informTenantUser_emailText_roleInfo": "Current roles: ",
+  "informTenantUser_emailText_tenantRemoval": "Tenant __tenant__ is removed. One of the users was: ",
+  "informTenantUser_emailText_userRemoval": "Changes in tenant __tenant__. Removed following user: ",
+  "informTenantUser_emailText_userRoleChange": "In the tenant __tenant__, there are changes in roles of following user: ",
   "invalidApiBasePathMessage": "Must begin and end with /. Allowed alphanumeric characters and -.?$*+'()/:#@!&,;=",
   "invalidApiMonitoringEndpointMessage": "Must begin with /. Allowed alphanumeric characters and -.?$*+'()/:#@!&,;=",
   "invalidApiRequiredMessage": "Invalid input not allowed",
@@ -1366,23 +1376,24 @@
   "searchPage_searchForm_helpText": "Start typing your query for live search results.",
   "searchPage_searchForm_placeholderText": "Start typing to search APIs...",
   "searchPage_searchResultsHeader": "Search results",
-  "settings_panelTitle_addingApisAndOrganizations": "Adding APIs and Organizations",
-  "settings_mail": "Mail",
-  "settings_mail_fromEmail": "This email is used to validate email addresses used for user registration and contact form submission. It needs to be a valid, pre-existing, domain-specific email",
-  "settings_mail_toEmail": "This email is used for receiving contact form submissions. It needs to be a valid, pre-existing, domain-specific email",
-  "settings_github": "Github",
-  "settings_fiware": "FIWARE",
-  "settings_hsl": "HSL",
-  "settings_save": "Save",
   "settings_development_features": "Enable development features",
   "settings_disabled_login_methods": "Disabled login methods",
   "settings_disabled_login_methods_caution": "Caution!",
   "settings_disabled_login_methods_caution_text": "It is possible to lock-out users with this selection, including Admins!",
   "settings_disabled_login_methods_caution_warning_1": "Do not disable all login methods!",
   "settings_disabled_login_methods_caution_warning_2": "Make sure that there is at least one Admin user left capable to use some of allowed login methods!",
-  "settings_sdkCode_generator": "SDK Code Generator",
   "settings_errorMessage": "Invalid Settings! Something is not right or a field is missing.",
+  "settings_fiware": "FIWARE",
+  "settings_github": "Github",
+  "settings_hsl": "HSL",
+  "settings_mail": "Mail",
+  "settings_mail_fromEmail": "This email is used to validate email addresses used for user registration and contact form submission. It needs to be a valid, pre-existing, domain-specific email",
+  "settings_mail_toEmail": "This email is used for receiving contact form submissions. It needs to be a valid, pre-existing, domain-specific email",
+  "settings_panelTitle_addingApisAndOrganizations": "Adding APIs and Organizations",
+  "settings_save": "Save",
+  "settings_sdkCode_generator": "SDK Code Generator",
   "settings_successMessage": "Settings saved",
+  "settings_tenant": "Tenant Manager",
   "settings_title_supportsGraphql": "API Umbrella proxy supports GraphQL requests",
   "settingsPage_title": "General",
   "settingsPage_title_settings": "Settings",
@@ -1421,6 +1432,70 @@
   "updatePassword_submitButton_text": "Change Password",
   "updatePasswordForm_successMessage": "Password updated.",
   "passwordsMismatch": "Passwords do not match",
+  "tenantAuthorization_title": "Tenant Authorization",
+  "tenantAuthorization_button_refresh": "Refresh now",
+   "tenantCatalog_buttonText_addTenant": "Add Tenant",
+  "tenantCatalog_Title": "Tenants",
+  "tenantCatalog_toolbar_filterOptions_myOrganizations": "My tenants",
+  "tenantCatalog_toolbar_authorization": "Authorization",
+  "tenantCatalogPage_title_organizationsCatalog": "Tenant Catalog",
+  "tenantCatalogPage_token_title": "Authorization token is needed in Tenant related requests",
+  "tenantCatalogPage_token_details_1": "User must have an account on Tenant Manager",
+  "tenantCatalogPage_token_details_2": "While logging in using Keyrock, User receives an authentication token, here: ",
+  "tenantCatalogPage_token_details_2b": "Note! Expiration time: ",
+  "tenantCatalogPage_token_details_2c": "You need to sign out and sign in again to get valid authentication token!",
+  "tenantCatalogPage_token_details_3": "User receives also a refresh token, here: ",
+  "tenantCatalogTable_button_edit": "Edit tenant",
+  "tenantCatalogTable_button_edit_title": "Edit this tenant, change Name, Description, Users and their Roles",
+  "tenantCatalogTable_button_remove": "Remove tenant",
+  "tenantCatalogTable_button_remove_title": "Remove this Tenant",
+  "tenantCatalogTable_header_tenants": "Tenants",
+  "tenantCatalogTable_header_username": "Username & Roles",
+  "tenantCatalogTable_row_title_username": "Username",
+  "tenantCatalogTable_row_title_roles": "Roles",
+  "tenantCatalogTable_row_title_consumer": "Consumer",
+  "tenantCatalogTable_row_title_provider": "Provider",
+  "tenantCatalogTable_header_action": "Action",
+  "tenantForm_addTenant_Success_Message": "Tenant added successfully: ",
+  "tenantForm_addTenant_error_Message": "Tenant operation failed! ",
+  "tenantForm_addTenant_failure_Message": "Tenant manager error! Returns code ",
+  "tenantForm_addTenant_notify_error": "Error in notifying users",
+  "tenantForm_button_cancel": "No, cancel",
+  "tenantForm_button_cancel_title": "Cancel this operation",
+  "tenantForm_button_save_title": "Save new Tenant",
+  "tenantForm_button_modify_title": "Save Tenant modifications",
+  "tenantForm_update_Failure_Message": "Tenant update failed! ",
+  "tenantForm_update_error_Message": "Tenant update failed! ",
+  "tenantForm_update_check_error_Message": "Tenant user check failed! Refresh Tenant list and try again! ",
+  "tenantForm_modifyButton_text": "Yes, Modify Tenant",
+  "tenantForm_saveButton_text": "Yes, Add Tenant",
+  "tenantForm_tenant_noName_error": "Tenant must have a name!",
+  "tenantForm_tenant_noDescription_error": "Tenant must have a description!",
+  "tenantForm_title_add": "Add new Tenant",
+  "tenantForm_title_modify": "Modify Tenant",
+  "tenantForm_tenantDescription": "Tenant description",
+  "tenantForm_tenantName": "Tenant name",
+  "tenantForm_id_missing_Message": "Problem! Tenants id is missing!",
+  "tenantForm_noChanges_Message": "No changes in Tenant",
+  "tenantForm_tokenExpiredWarning_message": "Authorization token is expired. Sign out and sign in again to refresh the token!",
+  "tenantForm_removal_Success_Message": "Tenant removed successfully: ",
+  "tenantForm_update_Success_Message": "Tenant updated successfully: ",
+  "tenantRemoveForm_button_remove": "Yes, remove Tenant",
+  "tenantRemoveForm_question": "Are you sure you want to remove this tenant?",
+  "tenantRemoveForm_title": "Tenant removal",
+  "tenantRequest_missingBasepath": "Tenant Manager basepath is missing from Settings",
+  "tenantRequest_missingTenantList": "Tenant list fetch failed! ",
+  "tenantRequest_missingUserlist": "Userlist fetch failed! ",
+  "tenantUserForm_addButton_text": "Add user for Tenant",
+  "tenantUserForm_errorTextUserNotSelected": "No User is selected for addition!",
+  "tenantUserForm_errorTextDuplicateUser": "This user already exists on Tenants user list: ",
+  "tenantUserForm_help_addUser": "Select user and give roles",
+  "tenantUserForm_title_addUser": "Add a new user for tenant",
+  "tenantUserForm_button_addUser_title": "Add selected user to Tenant's user list",
+  "tenantUsersList_title": "Users of this tenant",
+  "tenantUsersList_thead_username": "Username",
+  "tenantUsersList_thead_roles": "Roles",
+  "tenantUsers_button_title_removeUser": "Remove this user from Tenant",
   "uploadApiLogoButton": "Upload logo",
   "uploadApiLogo_confirm_delete": "Are you sure you want to delete this logo?",
   "uploadApiLogo_successfully_deleted": "Logo successfully deleted!",

apinf_packages/organizations/client/catalog/catalog.js

@@ -131,13 +131,11 @@ Template.organizationCatalog.helpers({
   gridViewMode () {
     // Get view mode from template
     const viewMode = FlowRouter.getQueryParam('viewMode');
-
     return (viewMode === 'grid');
   },
   tableViewMode () {
     // Get view mode from template
     const viewMode = FlowRouter.getQueryParam('viewMode');
-
     return (viewMode === 'table');
   },
   userCanAddOrganization () {

apinf_packages/settings/client/settings.html

@@ -16,6 +16,8 @@ <h2>{{_ "settingsPage_title" }}</h2>
       {{> afQuickField name='access.onlyAdminsCanAddApis' id="addapi-adminonly" }}
       {{> afQuickField name='access.onlyAdminsCanAddOrganizations' id="addorganization-adminonly" }}
       {{> afQuickField name='developmentFeatures' id="development-features" }}
+
+      <!-- GraphQL settings -->
       <div class="panel panel-default">
         <div class="panel-heading">
           <span class="panel-title">
@@ -26,6 +28,8 @@ <h2>{{_ "settingsPage_title" }}</h2>
           </span>
         </div>
       </div>
+
+      <!-- SDK Code Generator settings -->
       <div class="panel panel-default">
         <div class="panel-heading">
           <span class="panel-title">
@@ -44,6 +48,7 @@ <h2>{{_ "settingsPage_title" }}</h2>
         {{/ if }}
       </div>
 
+      <!-- Mail settings -->
       <div class="panel panel-default">
         <div class="panel-heading">
           <span class="panel-title">
@@ -113,6 +118,23 @@ <h2>{{_ "settingsPage_title" }}</h2>
         </div>
       </div>
 
+      <!-- Tenant settings -->
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <span class="panel-title">
+            {{_ "settings_tenant" }}
+          </span>
+          <span class="pull-right">
+            {{> afQuickField name='tenantIdm.enabled' id="tenantIdm" }}
+          </span>
+        </div>
+        {{# if afFieldValueIs name='tenantIdm.enabled' value=true }}
+          <div class="panel-body">
+            {{> afQuickField name='tenantIdm.url_and_basepath' id="tenantIdm-basepath" }}
+          </div>
+        {{/ if }}
+      </div>
+
       <!-- Save settings -->
       <button
         type="submit"