@@ -607,7 +559,7 @@ export const CIPPM365OAuthButton = ({
!appIdInfo.isLoading &&
appIdInfo?.data?.applicationId && // Only check if applicationId is present in data
!/^[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}$/.test(
- appIdInfo?.data?.applicationId,
+ appIdInfo?.data?.applicationId
) && (
The Application ID is not valid. Please check your configuration.
@@ -622,14 +574,14 @@ export const CIPPM365OAuthButton = ({
{authInProgress ? (
<>
- When asked to log onto an account, please use a{" "}
- CIPP Service Account. Enter this code to authenticate:{" "}
+ When asked to log onto an account, please use a{' '}
+ CIPP Service Account. Enter this code to authenticate:{' '}
>
) : (
<>
Click the button below to authenticate. When asked to log onto an account,
please use a CIPP Service Account. You will need to enter this
- code:{" "}
+ code:{' '}
>
)}
@@ -637,13 +589,13 @@ export const CIPPM365OAuthButton = ({
{authInProgress ? (
<>
- If the popup was blocked or you closed it, you can also go to{" "}
+ If the popup was blocked or you closed it, you can also go to{' '}
microsoft.com/devicelogin manually and enter the code shown
above.
>
) : (
<>
- When you click the button below, a popup will open to{" "}
+ When you click the button below, a popup will open to{' '}
microsoft.com/devicelogin where you'll enter this code.
>
)}
@@ -665,7 +617,7 @@ export const CIPPM365OAuthButton = ({
Tenant ID: {tokens.tenantId}
{tokens.onmicrosoftDomain && (
<>
- {" "}
+ {' '}
| Domain: {tokens.onmicrosoftDomain}
>
)}
@@ -711,21 +663,21 @@ export const CIPPM365OAuthButton = ({
{promptBeforeAuth !== false && (
setPromptDialog({ open: false }),
}}
api={{
- type: "POST",
+ type: 'POST',
confirmText: promptBeforeAuth,
noConfirm: false,
customFunction: () => {
- setPromptDialog({ open: false });
+ setPromptDialog({ open: false })
const authFunction = useDeviceCode
? handleDeviceCodeAuthentication
- : handleMsalAuthentication;
- authFunction();
+ : handleMsalAuthentication
+ authFunction()
},
}}
fields={[]}
@@ -740,17 +692,17 @@ export const CIPPM365OAuthButton = ({
codeRetrievalInProgress ||
(!applicationId &&
!/^[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}$/.test(
- appIdInfo?.data?.applicationId,
+ appIdInfo?.data?.applicationId
))
}
onClick={() => {
if (promptBeforeAuth !== false) {
- setPromptDialog({ open: true });
+ setPromptDialog({ open: true })
} else {
const authFunction = useDeviceCode
? handleDeviceCodeAuthentication
- : handleMsalAuthentication;
- authFunction();
+ : handleMsalAuthentication
+ authFunction()
}
}}
color="primary"
@@ -765,11 +717,11 @@ export const CIPPM365OAuthButton = ({
}
>
{authInProgress || codeRetrievalInProgress
- ? "Authenticating..."
+ ? 'Authenticating...'
: deviceCodeInfo && useDeviceCode
- ? "Authenticate with Code"
+ ? 'Authenticate with Code'
: buttonText}
- );
-};
+ )
+}
diff --git a/src/components/CippComponents/CippAddEditTenantGroups.jsx b/src/components/CippComponents/CippAddEditTenantGroups.jsx
index 4208c18eaf7c..2ead662a5cd5 100644
--- a/src/components/CippComponents/CippAddEditTenantGroups.jsx
+++ b/src/components/CippComponents/CippAddEditTenantGroups.jsx
@@ -83,6 +83,12 @@ const CippAddEditTenantGroups = ({ formControl, initialValues, title, backButton
compareType="is"
compareValue="dynamic"
>
+