5.1.2 release (#51)

Author: melil02

cypress/integration/applications.js

@@ -97,6 +97,22 @@ describe('Applications', () => {
         // Details
         cy.findByLabelText('Generate New Secret').should('not.exist');
     });
+    it('should NOT show Generate New Secret when Application status is DELETE_APPLICATION_PENDING_APPROVAL for an org user', () => {
+        login('orgPublisher', 'Password@1');
+
+        cy.findAllByText('Applications')
+            .first()
+            .click();
+
+        cy.findByTitle('Display as list').click();
+
+        cy.findByTitle('GB International Interactions(Deleting)').click({
+            force: true,
+        });
+
+        // Details
+        cy.findByLabelText('Generate New Secret').should('not.exist');
+    });
 
     context('when editing an application', () => {
         it('should allow the changing of an API plan on a selected API', () => {

cypress/integration/newPassword.js

@@ -2,7 +2,7 @@
 
 describe('New Password', () => {
     it('should not load the new password form', () => {
-        cy.loadData();
+        // cy.loadData();
 
         cy.visit('#/new-password/#token/GildasAndAdrien');
 
@@ -18,7 +18,7 @@ describe('New Password', () => {
     });
 
     it('should fill the new password form', () => {
-        cy.loadData();
+        // cy.loadData();
 
         cy.visit('#/new-password/#token/Mithrandir');
 
@@ -58,7 +58,7 @@ describe('New Password', () => {
     });
 
     it('should return an error if the password is the same than before', () => {
-        cy.loadData();
+        // cy.loadData();
 
         cy.visit('#/new-password/#token/Saruman'); // Mocks will trigger an error for this token
 

package.json

@@ -41,6 +41,8 @@
         "bl": "~4.0.3",
         "cypress": "~5.6.0",
         "date-fns": "~2.9.0",
+        "es-abstract": "~1.19.0",
+        "get-intrinsic": "~1.1.3",
         "serialize-javascript": "~3.1.0"
     }
 }

packages/layer7-apihub-mock/src/defaultData.json

@@ -755,6 +755,36 @@
                 "61bc2c17-19ba-4e01-873f-e3201706908e"
             ]
         },
+        {
+            "id": "f6a72eb7-d848-48d2-b33f-5823672cfea5",
+            "uuid": "f6a72eb7-d848-48d2-b33f-5823672cfea5",
+            "name": "GB International Interactions(Deleting)",
+            "status": "DELETE_APPLICATION_PENDING_APPROVAL",
+            "disabledByType": "EXTERNAL",
+            "description": "Enhanced bi-directional complexity",
+            "OauthCallbackUrl": "https://example.com/oauthCallback",
+            "OauthScope": "OOB",
+            "OauthType": "confidential",
+            "apiKey": "fbb71539-e654-434c-ab4d-b83a612fcb6b",
+            "keySecret": "b47ac256-769d-47f5-9640-8bdc25f1e9b5",
+            "apiIds": {
+                "results": [
+                    "9f0ee511-c6ec-4380-8057-43b6bcf49ac4",
+                    "9c531b86-d5f0-46c7-bdd0-d52fc9e1dd9c",
+                    "9e9b888a-8b2e-4a98-aab8-35843b1d3c73",
+                    "04065447-bdf5-4553-8356-ee835150f216",
+                    "61bc2c17-19ba-4e01-873f-e3201706908e",
+                    "8a334a2f-de19-472a-bb11-5a6e38e1c2ee"
+                ]
+            },
+            "_accessibleApis": [
+                "9f0ee511-c6ec-4380-8057-43b6bcf49ac4",
+                "9c531b86-d5f0-46c7-bdd0-d52fc9e1dd9c",
+                "9e9b888a-8b2e-4a98-aab8-35843b1d3c73",
+                "04065447-bdf5-4553-8356-ee835150f216",
+                "61bc2c17-19ba-4e01-873f-e3201706908e"
+            ]
+        },
         {
             "id": "fefbfb9a-9dda-47fd-ba0c-73fbcb17211d",
             "uuid": "fefbfb9a-9dda-47fd-ba0c-73fbcb17211d",

packages/layer7-apihub/package.json

@@ -28,6 +28,7 @@
         "react-dnd": "~10.0.2",
         "react-dnd-html5-backend": "~10.0.2",
         "react-markdown-editor-lite": "~1.0.2",
+        "trim": "0.0.3",
         "remark-parse": "7.0.2",
         "remark-react": "~7.0.1",
         "remove-markdown": "~0.3.0",

packages/layer7-apihub/src/applications/ApplicationList.js

@@ -134,7 +134,7 @@ const ApplicationFilter = props => {
                         name: 'resources.applications.status.disabled',
                     },
                     {
-                        id: 'APPLICATION_PENDING_APPROVAL',
+                        id: 'APPLICATION_PENDING_APPROVAL,EDIT_APPLICATION_PENDING_APPROVAL,DELETE_APPLICATION_PENDING_APPROVAL',
                         name:
                             'resources.applications.status.application_pending_approval',
                     },

packages/layer7-apihub/src/applications/ApplicationShow.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import { useHistory } from 'react-router-dom';
-import { CRUD_DELETE, useDelete, useTranslate } from 'ra-core';
+import { useTranslate } from 'ra-core';
 import { makeStyles } from '@material-ui/core/styles';
 import Button from '@material-ui/core/Button';
 import DeleteIcon from '@material-ui/icons/Delete';
-
+import { useDataProvider, useTranslate } from 'ra-core';
 import { EditButton, TopToolbar } from 'react-admin';
 import { Show } from '../ui';
 import { ApplicationDetails } from './ApplicationDetails';
@@ -35,6 +35,7 @@ const AppShowActions = ({
     const notify = useLayer7Notify();
     const contentLabelClasses = useContentStyles();
     const history = useHistory();
+    const dataProvider = useDataProvider();
     const [deleting, setDeleting] = React.useState(false);
 
     React.useEffect(() => {
@@ -48,7 +49,9 @@ const AppShowActions = ({
     React.useEffect(() => {
         if (data && userContext) {
             if (
+                data.status !== 'APPLICATION_PENDING_APPROVAL' &&
                 data.status !== 'EDIT_APPLICATION_PENDING_APPROVAL' &&
+                data.status !== 'DELETE_APPLICATION_PENDING_APPROVAL' &&
                 !userContext.userDetails.developer
             ) {
                 setCanDelete(true);
@@ -57,29 +60,44 @@ const AppShowActions = ({
             }
         }
     }, [canDelete, data, userContext]);
-
-    const [deleteApplication] = useDelete('applications', data?.id, data, {
-        action: CRUD_DELETE,
-        onSuccess: () => {
-            notify(
-                'resources.applications.notifications.delete_success',
-                'info',
-                {
-                    smart_count: 1,
+    const notifyAndNavigate = () => {
+        setDeleting(false);
+        notify('resources.applications.notifications.delete_success', 'info');
+        history.push('/applications');
+    };
+    const deleteApplication = () => {
+        dataProvider.delete(
+            'applications',
+            {
+                id: data.id,
+            },
+            {
+                onFailure: error => {
+                  setDeleting(false);
+                  notify(error || 'resources.applications.notifications.delete_error',
+                    'error');
+                },
+                onSuccess: delData => {
+                    dataProvider.getOne(
+                        'applications',
+                        {
+                            id: data.id,
+                        },
+                        {
+                            onFailure: error => notifyAndNavigate(error),
+                            onSuccess: getData => {
+                                setDeleting(false);
+                                notify('resources.applications.notifications.delete_request_success',
+                                'info');
+                                history.go(0);
+                            }
+                        }
+                    );
                 }
-            );
-            setDeleting(false);
-            history.push('/applications');
-        },
-        onFailure: error => {
-            setDeleting(false);
-            notify(
-                error || 'resources.applications.notifications.delete_error',
-                'error'
-            );
-        },
-    });
-
+            }
+        );
+    };
+    
     const confirmDelete = event => {
         setDeleteConfirm(true);
     };

packages/layer7-apihub/src/applications/isApplicationPending.js

@@ -2,12 +2,13 @@ import { isOrgBoundUser } from '../userContexts';
 
 const STATUS_PENDING_APPROVAL = 'APPLICATION_PENDING_APPROVAL';
 const STATUS_EDIT_PENDING_APPROVAL = 'EDIT_APPLICATION_PENDING_APPROVAL';
+const STATUS_DELETE_PENDING_APPROVAL = 'DELETE_APPLICATION_PENDING_APPROVAL';
 const DISABLED_BY_TYPE_EXTERNAL = 'EXTERNAL';
 
 export const isApplicationPendingOrDisabled = (status, disabledByType) => {
     return (
         ![DISABLED_BY_TYPE_EXTERNAL, null].includes(disabledByType) ||
-        [STATUS_PENDING_APPROVAL, STATUS_EDIT_PENDING_APPROVAL].includes(status)
+        [STATUS_PENDING_APPROVAL, STATUS_EDIT_PENDING_APPROVAL, STATUS_DELETE_PENDING_APPROVAL].includes(status)
     );
 };
 

packages/layer7-apihub/src/authentication/AccountSetup/TermsDialog.js

@@ -9,10 +9,16 @@ export const fetchResetPassword = async (
     username
 ) => {
     const fetchJson = getFetchJson(originHubName);
+    const headers = new Headers({
+        'Content-Type': 'application/json; charset=UTF-8',
+        Accept: 'text/plain, */*; q=0.01',
+    });
 
-    const { json } = await fetchJson(
-        `${urlWithTenant}/ResetMyPassword()?Username='${username}'`
-    );
+    const { json } = await fetchJson(`${urlWithTenant}/reset-my-password`, {
+        method: 'put',
+        headers: headers,
+        body: JSON.stringify({ userName: username }),
+    });
 
     return await json;
 };

packages/layer7-apihub/src/authentication/useResetPassword.js

@@ -17,7 +17,7 @@ describe('useResetPassword', () => {
             await fetchResetPassword(url, 'origin', username);
 
             expect(global.fetch.mock.calls[0][0]).toEqual(
-                `https://marmelab.com/api/apim/ResetMyPassword()?Username='Luwangel'`
+                `https://marmelab.com/api/apim/reset-my-password`
             );
         });
 

packages/layer7-apihub/src/authentication/useResetPassword.test.js

@@ -375,6 +375,7 @@ const apiHubMessages = {
                 rejected: 'Rejected',
                 application_pending_approval: 'Pending Approval',
                 edit_application_pending_approval: 'Pending Approval',
+                delete_application_pending_approval: 'Pending Approval',
             },
             list: {
                 sort: {
@@ -407,6 +408,7 @@ const apiHubMessages = {
                 edit_success: 'Application successfully updated.',
                 edit_error: 'An error occurred while updating the application.',
                 delete_success: 'Application successfully deleted.',
+                delete_request_success: 'Application Delete requested successfully.',
                 delete_error:
                     'An error occurred while deleting the application.',
             },

packages/layer7-apihub/src/i18n/en.js

@@ -390,6 +390,7 @@ const apiHubMessages = {
                 rejected: 'Rechazado',
                 application_pending_approval: 'Pendiente de aprobación',
                 edit_application_pending_approval: 'Pendiente de aprobación',
+                delete_application_pending_approval: 'Pendiente de aprobación',
             },
             list: {
                 sort: {

packages/layer7-apihub/src/i18n/es.js

@@ -385,6 +385,7 @@ const apiHubMessages = {
                 rejected: 'Rejeté',
                 application_pending_approval: "En attente d'approbation",
                 edit_application_pending_approval: "En attente d'approbation",
+                delete_application_pending_approval: "En attente d'approbation",
             },
             list: {
                 sort: {

packages/layer7-apihub/src/i18n/fr.js

@@ -376,6 +376,7 @@ const apiHubMessages = {
                 rejected: 'Rifiutato',
                 application_pending_approval: 'In attesa di approvazione',
                 edit_application_pending_approval: 'In attesa di approvazione',
+                delete_application_pending_approval: 'In attesa di approvazione',
             },
             list: {
                 sort: {

packages/layer7-apihub/src/i18n/it.js

@@ -15,9 +15,9 @@ export * from './documentation';
 export * from './homepage';
 export * from './i18n';
 export * from './preferences';
+export * from './userContexts';
 export * from './theme';
 export * from './ui';
-export * from './userContexts';
 export * from './userProfiles';
 export * from './fetchUtils';
 export * from './useLayer7Notify';

packages/layer7-apihub/src/index.js

@@ -1,11 +1,16 @@
 import { useState, useEffect } from 'react';
+import { useGetOne, CRUD_GET_ONE } from 'ra-core';
 import merge from 'lodash/fp/merge';
 import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
 import defaultMuiTheme from '@material-ui/core/styles/defaultTheme';
+import get from 'lodash/get';
 
 import { theme } from './theme';
+import { isOrgBoundUser } from '../userContexts';
 import { getFetchJson } from '../fetchUtils';
 
+const LOGGED_IN = '@layer7/authentication/loggedIn';
+
 const convertBrandingToMuiTheme = themeBranding => {
     const { color, typography } = themeBranding;
     const palette = {
@@ -109,19 +114,43 @@ const convertBrandingToMuiTheme = themeBranding => {
     };
 };
 
-export const fetchBranding = async (url, originHubName) => {
+export const fetchBranding = async (url, originHubName, userContext) => {
+    const fetchJson = getFetchJson(originHubName);
+    // Pass a orgId to fetch org based theme
+    const options = {};
+    const isOrgUser = userContext ? isOrgBoundUser(userContext) : false;
+    if (isOrgUser) {
+        const orgUuid = get(userContext, 'userDetails.organizationUuid');
+        options.headers = new Headers({ Accept: 'application/json' });
+        options.headers.set('APIM-OrgUuid', orgUuid);
+    }
+    const { json } = await fetchJson(`${url}/branding/1.0/themes`, options);
+    return json;
+};
+
+export const fetchUserContext = async (url, originHubName) => {
     const fetchJson = getFetchJson(originHubName);
-    const { json } = await fetchJson(`${url}/branding/1.0/themes`);
+    const { json } = await fetchJson(`${url}/userContexts`);
     return json;
 };
 
 export const useBranding = (url, originHubName, defaultTheme = theme) => {
     const [brandingTheme, setBrandingTheme] = useState(defaultTheme);
     const [brandingLogo, setBrandingLogo] = useState('');
     const [brandingFavicon, setBrandingFavicon] = useState('');
+    const [userContext, setUserContext] = useState('');
+
+    useEffect(() => {
+        if (JSON.parse(sessionStorage.getItem(LOGGED_IN))) {
+            fetchUserContext(url, originHubName).then(response => {
+                setUserContext(get(response, 'userContexts[0]'));
+            });
+        }
+    }, [originHubName, url]);
+
     useEffect(() => {
         if (global.APIHUB_CONFIG.USE_BRANDING_THEME) {
-            fetchBranding(url, originHubName)
+            fetchBranding(url, originHubName, userContext)
                 .then(theme => {
                     return {
                         logo: theme.logo,
@@ -139,7 +168,7 @@ export const useBranding = (url, originHubName, defaultTheme = theme) => {
             setBrandingFavicon(null);
             setBrandingTheme(defaultTheme);
         }
-    }, [defaultTheme, originHubName, url]);
+    }, [defaultTheme, originHubName, url, userContext]);
 
     return {
         logo: brandingLogo,