Merge pull request #906 from KelvinTegelaar/dev

Dev to release
KelvinTegelaar · Apr 29, 2022 · 92c5086 · 92c5086
2 parents 89e47a5 + 61c294b
commit 92c5086
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 75 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-2.5.0
+2.5.5
diff --git a/src/store/api/baseQuery.js b/src/store/api/baseQuery.js
@@ -11,6 +11,10 @@ export const axiosQuery = async ({ path, method = 'get', params, data, hideToast
     })
     return { data: result?.data }
   } catch (error) {
+    // Catch API call on timed out SWA session and send to login page
+    if (error.response?.status === 302) {
+      window.location.href = '/.auth/login/aad?post_login_redirect_uri=' + window.location.href
+    }
     return {
       error: {
         status: error.response?.status,

diff --git a/src/views/email-exchange/administration/EditCalendarPermissions.js b/src/views/email-exchange/administration/EditCalendarPermissions.js
@@ -54,21 +54,13 @@ const EditCalendarPermission = () => {
   }, [userId, tenantDomain, dispatch])
   const [genericPostRequest, postResults] = useLazyGenericGetRequestQuery()
   const onSubmit = (values) => {
-    if (values.RemoveAccess) {
-      values.RemoveAccess = values.RemoveAccess.value
-    }
-    if (!values.RemoveAccess) {
-      values.RemoveAccess = ''
-    }
-    if (values.UserToGetPermissions) {
-      values.UserToGetPermissions = values.UserToGetPermissions.value
-      values.Permissions = values.Permissions.value
-    }
     const shippedValues = {
       FolderName: user[0].FolderName,
       userid: userId,
       tenantFilter: tenantDomain,
-      ...values,
+      Permissions: values.Permissions ? values.Permissions.value : '',
+      UserToGetPermissions: values.UserToGetPermissions ? values.UserToGetPermissions.value : '',
+      RemoveAccess: values.RemoveAccess ? values.RemoveAccess.value : '',
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/ExecEditCalendarPermissions', params: shippedValues })

diff --git a/src/views/email-exchange/administration/EditMailboxPermissions.js b/src/views/email-exchange/administration/EditMailboxPermissions.js
@@ -57,28 +57,14 @@ const EditMailboxPermission = () => {
   }, [userId, tenantDomain, dispatch])
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const onSubmit = (values) => {
-    if (values.AddFullAccess) {
-      values.AddFullAccess = values.AddFullAccess.value
-    }
-    if (!values.AddFullAccess) {
-      values.AddFullAccess = ''
-    }
-    if (values.RemoveFullAccess) {
-      values.RemoveFullAccess = values.RemoveFullAccess.value
-    }
-    if (!values.RemoveFullAccess) {
-      values.RemoveFullAccess = ''
-    }
-    if (values.AddFullAccessNoAutoMap) {
-      values.AddFullAccessNoAutoMap = values.AddFullAccessNoAutoMap.value
-    }
-    if (!values.AddFullAccessNoAutoMap) {
-      values.AddFullAccessNoAutoMap = ''
-    }
     const shippedValues = {
       userid: userId,
       tenantFilter: tenantDomain,
-      ...values,
+      AddFullAccessNoAutoMap: values.AddFullAccessNoAutoMap
+        ? values.AddFullAccessNoAutoMap.value
+        : '',
+      AddFullAccess: values.AddFullAccess ? values.AddFullAccess.value : '',
+      RemoveFullAccess: values.RemoveFullAccess ? values.RemoveFullAccess.value : '',
     }
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/ExecEditMailboxPermissions', values: shippedValues })

diff --git a/src/views/identity/administration/AddUser.js b/src/views/identity/administration/AddUser.js
@@ -72,21 +72,12 @@ const AddUser = () => {
 
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const onSubmit = (values) => {
-    //@todo: need to fix copyfrom in api so this is no longer required
-    if (!values.CopyFrom) {
-      values.CopyFrom = ''
-    }
-    //@todo: need to fix this in api so this hacky shit is no longer needed.
-    if (!values.addedAliases) {
-      values.addedAliases = ''
-    }
-
     const shippedValues = {
-      AddedAliases: values.addedAliases,
+      AddedAliases: values.addedAliases ? values.addedAliases : '',
       BusinessPhone: values.businessPhones,
       City: values.city,
       CompanyName: values.companyName,
-      CopyFrom: values.CopyFrom.value,
+      CopyFrom: values.CopyFrom ? values.CopyFrom.value : '',
       Country: values.country,
       Department: values.department,
       DisplayName: values.displayName,
@@ -98,7 +89,7 @@ const AddUser = () => {
       MobilePhone: values.mobilePhone,
       Password: values.password,
       PostalCode: values.postalCode,
-      Usagelocation: values.usageLocation.value,
+      Usagelocation: values.usageLocation ? values.usageLocation.value : '',
       Username: values.mailNickname,
       streetAddress: values.streetAddress,
       Autopassword: values.Autopassword,

diff --git a/src/views/identity/administration/EditUser.js b/src/views/identity/administration/EditUser.js
@@ -70,19 +70,13 @@ const EditUser = () => {
   }, [userId, tenantDomain, dispatch])
   const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
   const onSubmit = (values) => {
-    //@todo: need to fix copyfrom in api so this is no longer required
-    if (!values.CopyFrom) {
-      values.CopyFrom = ''
-    }
-    //@todo: need to fix this in api so this hacky shit is no longer needed.
-
     const shippedValues = {
       AddedAliases: values.addedAliases,
       BusinessPhone: values.businessPhones,
       RemoveAllLicenses: values.RemoveAllLicenses,
       City: values.city,
       CompanyName: values.companyName,
-      CopyFrom: values.CopyFrom.value,
+      CopyFrom: values.CopyFrom ? values.CopyFrom.value : '',
       Country: values.country,
       Department: values.department,
       DisplayName: values.displayName,
@@ -94,7 +88,7 @@ const EditUser = () => {
       MobilePhone: values.mobilePhone,
       Password: values.password,
       PostalCode: values.postalCode,
-      Usagelocation: values.usageLocation.value,
+      usageLocation: values.usageLocation ? values.usageLocation.value : '',
       UserID: userId,
       Username: values.mailNickname,
       streetAddress: values.streetAddress,
@@ -104,11 +98,11 @@ const EditUser = () => {
     //window.alert(JSON.stringify(shippedValues))
     genericPostRequest({ path: '/api/EditUser', values: shippedValues })
   }
-  const usagelocation = useSelector((state) => state.app.usageLocation)
+  const usageLocation = useSelector((state) => state.app.usageLocation)
 
   const initialState = {
     keepLicenses: true,
-    usageLocation: usagelocation,
+    usageLocation: usageLocation,
     ...user,
   }
 
@@ -246,7 +240,7 @@ const EditUser = () => {
                                   name: Name,
                                 }))}
                                 disabled={formDisabled}
-                                name="UsageLocation"
+                                name="usageLocation"
                                 placeholder="Type to search..."
                                 label="Usage Location"
                               />

diff --git a/src/views/identity/reports/BasicAuthReport.js b/src/views/identity/reports/BasicAuthReport.js
@@ -4,15 +4,15 @@ import { CippPageList } from 'src/components/layout'
 const columns = [
   {
     name: 'User Principal Name',
-    selector: (row) => row['UPN'],
+    selector: (row) => row['UserPrincipalName'],
     sortable: true,
-    exportSelector: 'UPN',
+    exportSelector: 'UserPrincipalName',
   },
   {
     name: 'Basic Auth',
-    selector: (row) => row['BasicAuth'],
+    selector: (row) => row['clientAppUsed'],
     sortable: true,
-    exportSelector: 'BasicAuth',
+    exportSelector: 'clientAppUsed',
   },
 ]
 

diff --git a/src/views/tenant/conditional/DeployCA.js b/src/views/tenant/conditional/DeployCA.js
@@ -73,7 +73,7 @@ const AddPolicy = () => {
     <CippWizard
       initialValues={{ ...formValues }}
       onSubmit={handleSubmit}
-      wizardTitle="Add Intune policy"
+      wizardTitle="Add Conditional Access policy"
     >
       <CippWizard.Page
         title="Tenant Choice"

diff --git a/src/views/tenant/standards/IndividualDomain.js b/src/views/tenant/standards/IndividualDomain.js
@@ -93,7 +93,7 @@ export function IndividualDomainCheck({
   const [masonrySize, setMasonrySize] = useState()
 
   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,})$/.test(
+    /^(((?!-))(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

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-2.5.0
+2.5.5