diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
index bb428a0fac45..08126ca42e76 100644
--- a/src/views/cipp/CIPPSettings.js
+++ b/src/views/cipp/CIPPSettings.js
@@ -69,6 +69,7 @@ import { Form } from 'react-final-form'
import useConfirmModal from 'src/hooks/useConfirmModal'
import { setCurrentTenant } from 'src/store/features/app'
import {
+ CippOffcanvas,
CippCodeBlock,
ModalService,
StatusIcon,
@@ -821,7 +822,7 @@ const ExcludedTenantsSettings = () => {
}
const SecuritySettings = () => {
const [listBackend, listBackendResult] = useLazyGenericGetRequestQuery()
-
+ const [visible, setVisible] = useState(false)
return (
{listBackendResult.isUninitialized && listBackend({ path: 'api/ExecBackendURLs' })}
@@ -833,16 +834,16 @@ const SecuritySettings = () => {
Resource Group
-
+
The Resource group contains all the CIPP resources in your tenant, except the SAM
Application
-
+
- Go to Resource Group
+ Go to Resource Group
@@ -853,16 +854,16 @@ const SecuritySettings = () => {
Key Vault
-
+
The keyvault allows you to check token information. By default you do not have
access.
-
+
- Go to Keyvault
+ Go to Keyvault
@@ -873,16 +874,16 @@ const SecuritySettings = () => {
Static Web App (Role Management)
-
+
The Static Web App role management allows you to invite other users to the
application.
-
+
- Go to Role Management
+ Go to Role Management
@@ -895,15 +896,13 @@ const SecuritySettings = () => {
Function App (Deployment Center)
-
- The Function App Deployment Center allows you to run updates on the API
-
+ The Function App Deployment Center allows you to run updates on the API
- Go to Function App Deployment Center
+ Go to Function App Deployment Center
@@ -914,17 +913,17 @@ const SecuritySettings = () => {
Function App (Configuration)
-
+
At the Function App Configuration you can check the status of the API access to
your keyvault
-
- Go to Function App Configuration
-
-
+
+
+ Go to Function App Configuration
+
@@ -934,20 +933,118 @@ const SecuritySettings = () => {
Function App (Overview)
-
- At the function App Overview, you can stop and start the backend API
-
+ At the function App Overview, you can stop and start the backend API
- Go to Function App Overview
+ Go to Function App Overview
+
+
+
+
+ Cloud Shell
+
+
+ Launch an Azure Cloud Shell Window
+
+ window.open(
+ 'https://shell.azure.com/powershell',
+ '_blank',
+ 'toolbar=no,scrollbars=yes,resizable=yes,menubar=no,location=no,status=no',
+ )
+ }
+ rel="noreferrer"
+ >
+ Cloud Shell
+
+ setVisible(true)} className="mb-3">
+ Command Reference
+
+
+
+
+
+
setVisible(false)}
+ title="Command Reference"
+ >
+ Function App Config
+
+ Function App Deployment
+
+ Watch Function Logs
+
+ Static Web App Config
+
+ List CIPP Users
+
+
>
)
diff --git a/src/views/tenant/administration/TenantLookup.js b/src/views/tenant/administration/TenantLookup.js
index a9faad2d0cc4..97f76156e70e 100644
--- a/src/views/tenant/administration/TenantLookup.js
+++ b/src/views/tenant/administration/TenantLookup.js
@@ -24,6 +24,16 @@ import { CippContentCard } from 'src/components/layout'
import Skeleton from 'react-loading-skeleton'
import { domainsApi } from 'src/store/api/domains'
+const isValidTenantInput = (value) => {
+ // Regular expression for validating GUID
+ const guidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
+ // Regular expression for validating domain
+ const domainRegex = /^([a-zA-Z0-9](-?[a-zA-Z0-9])*\.)+[a-zA-Z]{2,}$/
+
+ // Check if the input is a valid GUID or domain
+ return !(guidRegex.test(value) || domainRegex.test(value))
+}
+
const GraphExplorer = () => {
let navigate = useNavigate()
const tenant = useSelector((state) => state.app.currentTenant)
@@ -57,12 +67,6 @@ const GraphExplorer = () => {
})
}
}, [execGraphRequest, tenant.defaultDomainName, query, tenantdomain])
- const isValidDomain = (value) =>
- /^(((?!-))(xn--|_{1,1})?[a-z0-9-]{0,61}[a-z0-9]{1,1}\.)*(xn--)?([a-z0-9][a-z0-9-]{0,60}|[a-z0-9-]{1,30}\.[a-z]{2,})$/i.test(
- value,
- )
- ? undefined
- : value
return (
@@ -80,7 +84,7 @@ const GraphExplorer = () => {
render={({ handleSubmit, submitting, pristine }) => {
return (
-
+
{({ input, meta }) => {
return (
<>