fix: multiple bugfixes (#546)

Author: Cahllagerfeld

appserverSchema.d.ts

@@ -6,9 +6,11 @@ import { apiUrl } from '../apiUrl';
 const inviteApi = ({
   authenticationToken,
   name,
+  is_admin,
 }: {
   authenticationToken: string;
   name: string;
+  is_admin: boolean;
 }): Promise<void> =>
   fetchApiWithAuthRequest({
     url: apiUrl(`${endpoints.organizations.invite}?assign_default_role=false`),
@@ -19,6 +21,7 @@ const inviteApi = ({
     },
     data: JSON.stringify({
       name,
+      is_admin,
     }),
   });
 

src/api/organizations/inviteApi.ts

@@ -3,10 +3,12 @@ import inviteApi from '../../../api/organizations/inviteApi';
 
 export const inviteAction = ({
   name,
+  is_admin,
   onFailure,
   onSuccess,
 }: {
   name: string;
+  is_admin: boolean;
   onFailure?: (err: any) => void;
   onSuccess?: (res: any) => void;
 }): TRequestAction => ({
@@ -16,7 +18,7 @@ export const inviteAction = ({
     isAuthenticated: true,
     failureActionType: organizationActionTypes.invite.failure,
     successActionType: organizationActionTypes.invite.success,
-    params: { name },
+    params: { name, is_admin },
     onFailure,
     onSuccess,
   },

src/redux/actions/organizations/inviteAction.ts

@@ -130,13 +130,15 @@ export const persisted = combineReducers({
 
 export default (state: any, action: any) => {
   if (action.type === ACCOUNT_LOGOUT) {
-    if (state.serverInfo.authScheme === 'EXTERNAL') {
-      axios
-        .get(`${process.env.REACT_APP_BASE_API_URL}${endpoints.logout}`)
-        .then(() => {
-          return persisted(initialState as any, action);
-        });
-    }
+    axios
+      .get(`${process.env.REACT_APP_BASE_API_URL}${endpoints.logout}`)
+      .then(() => {
+        return persisted(initialState as any, action);
+      })
+      .catch(() => {
+        return persisted(initialState as any, action);
+      });
+
     return persisted(initialState as any, action);
   }
 

src/redux/persistedReducers.ts

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Box, FlexBox, Paragraph } from '../../../components';
 import ReactTooltip from 'react-tooltip';
 import styles from './index.module.scss';
+import { sanitizeUrl } from '../../../../utils/url';
 
 export const CustomConnectorBox: React.FC<{
   connectorName: string;
@@ -60,7 +61,7 @@ export const CustomConnectorBox: React.FC<{
           {resourceTypes?.map((e: any) => (
             <Box marginLeft="sm" className={styles.resourceImages}>
               <div data-tip data-for={e?.name}>
-                <img src={e?.logo_url} alt={e?.name} />
+                <img src={sanitizeUrl(e?.logo_url)} alt={e?.name} />
               </div>
               <ReactTooltip id={e?.name} place="top" effect="solid">
                 <Paragraph color="white">{e?.name}</Paragraph>

src/ui/layouts/common/CustomConnectorBox/index.tsx

@@ -13,6 +13,7 @@ import {
 import styles from './index.module.scss';
 import { replaceVersion } from '../../../../utils/string';
 import { checkUrlStatus } from '../../../../utils/checkUrlStatus';
+import { sanitizeUrl } from '../../../../utils/url';
 
 const Dimmer: React.FC = () => <Box className={styles.dimmer}></Box>;
 
@@ -77,7 +78,11 @@ export const SidePopup: React.FC<{
                 style={{
                   paddingBottom: '270px',
                 }}
-                src={is404 ? updatedSdkDocsUrl : defaultSdkDocsUrl}
+                src={
+                  is404
+                    ? sanitizeUrl(updatedSdkDocsUrl)
+                    : sanitizeUrl(defaultSdkDocsUrl)
+                }
               ></iframe>
             </Box>
 

src/ui/layouts/common/SidePopup/index.tsx

@@ -18,6 +18,7 @@ import { SortingHeader } from './ForSorting/SortingHeader';
 import { Sorting, SortingDirection } from './ForSorting/types';
 import { useService } from './ForSorting/useServiceForSorting';
 import { ServiceConnector } from '../../../../../api/types';
+import { sanitizeUrl } from '../../../../../utils/url';
 
 export const GetHeaderCols = ({
   connectorDetail,
@@ -204,7 +205,7 @@ export const GetHeaderCols = ({
           >
             <img
               alt={connector?.flavor?.logoUrl}
-              src={connector?.flavor?.logoUrl}
+              src={sanitizeUrl(connector?.flavor?.logoUrl)}
               style={{
                 height: '28px',
                 width: '28px',
@@ -253,7 +254,7 @@ export const GetHeaderCols = ({
                       <FlexBox alignItems="center">
                         <img
                           alt={e?.logo_url}
-                          src={e?.logo_url}
+                          src={sanitizeUrl(e?.logo_url)}
                           style={{
                             height: '28px',
                             width: '28px',

src/ui/layouts/connectors/ConnectorDetail/ConnectorComponents/getHeaderCols.tsx

@@ -13,6 +13,7 @@ import {
 import { Sorting, SortingDirection } from './ForSorting/types';
 import { GetFlavorsListForLogo } from './GetFlavorsListForLogo';
 import { ServiceConnector } from '../../../../../api/types';
+import { sanitizeUrl } from '../../../../../utils/url';
 
 interface ServiceInterface {
   openConnectorIds: TId[];
@@ -78,7 +79,7 @@ export const useService = ({
         return {
           ...item,
           flavor: {
-            logoUrl: temp.body.logo_url,
+            logoUrl: sanitizeUrl(temp.body.logo_url),
             name: item.body.flavor,
             connectorResourceType: temp.metadata.connector_resource_type,
           },

src/ui/layouts/connectors/ConnectorDetail/ConnectorComponents/useService.ts

@@ -15,6 +15,7 @@ import {
   Tooltip,
 } from '../../../components';
 import { HeaderCol } from '../../common/Table';
+import { sanitizeUrl } from '../../../../utils/url';
 
 export const GetHeaderCols = ({
   filteredConnector,
@@ -85,7 +86,7 @@ export const GetHeaderCols = ({
               <FlexBox alignItems="center">
                 <img
                   alt={connector?.body?.connector_type?.logo_url}
-                  src={connector?.body?.connector_type?.logo_url}
+                  src={sanitizeUrl(connector?.body?.connector_type?.logo_url)}
                   style={{
                     height: '28px',
                     width: '28px',
@@ -128,7 +129,7 @@ export const GetHeaderCols = ({
                       <FlexBox alignItems="center">
                         <img
                           alt={e?.logo_url}
-                          src={e?.logo_url}
+                          src={sanitizeUrl(e?.logo_url)}
                           style={{
                             height: '28px',
                             width: '28px',
@@ -184,7 +185,7 @@ export const GetHeaderCols = ({
                             <FlexBox alignItems="center">
                               <img
                                 alt={e?.logo_url}
-                                src={e?.logo_url}
+                                src={sanitizeUrl(e?.logo_url)}
                                 style={{
                                   height: '28px',
                                   width: '28px',

src/ui/layouts/connectors/ConnectorDetail/getHeaderCols.tsx

@@ -11,6 +11,7 @@ import {
 } from '../../../../components';
 import ReactMarkdown from 'react-markdown';
 import styles from './index.module.scss';
+import { sanitizeUrl } from '../../../../../utils/url';
 
 const Dimmer: React.FC = () => <Box className={styles.dimmer}></Box>;
 
@@ -98,7 +99,10 @@ export const SidePopup: React.FC<{
             >
               <FlexBox>
                 <Box className={styles.mainImage}>
-                  <img src={connectorType?.logoUrl} alt={connectorType?.name} />
+                  <img
+                    src={sanitizeUrl(connectorType?.logoUrl)}
+                    alt={connectorType?.name}
+                  />
                 </Box>
                 <Box marginLeft="xl">
                   <Paragraph className={styles.title}>
@@ -110,7 +114,7 @@ export const SidePopup: React.FC<{
                         className={styles.resourceTypesImages}
                         marginLeft="sm"
                       >
-                        <img src={e?.logo_url} alt={e?.name} />
+                        <img src={sanitizeUrl(e?.logo_url)} alt={e?.name} />
                       </Box>
                     ))}
                   </FlexBox>