Merge branch 'KelvinTegelaar:main' into main

RockfieldIT · Mar 31, 2023 · 9740169 · 9740169
2 parents de8bbeb + cd62bde
commit 9740169
Show file tree

Hide file tree

Showing 20 changed files with 430 additions and 139 deletions.
diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json
@@ -115,18 +115,6 @@
           "dependsOn": [
             "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
           ]
-        },
-        {
-          "type": "secrets",
-          "name": "exchangerefreshtoken",
-          "apiVersion": "2015-06-01",
-          "properties": {
-            "contentType": "text/plain",
-            "value": "ExchangeRefreshToken"
-          },
-          "dependsOn": [
-            "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
-          ]
         }
       ],
       "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
@@ -178,10 +166,6 @@
               "name": "RefreshToken",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
             },
-            {
-              "name": "ExchangeRefreshtoken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ExchangeRefreshToken)')]"
-            },
             {
               "name": "TenantID",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"

diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json
@@ -115,18 +115,6 @@
           "dependsOn": [
             "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
           ]
-        },
-        {
-          "type": "secrets",
-          "name": "exchangerefreshtoken",
-          "apiVersion": "2015-06-01",
-          "properties": {
-            "contentType": "text/plain",
-            "value": "ExchangeRefreshToken"
-          },
-          "dependsOn": [
-            "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
-          ]
         }
       ],
       "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
@@ -178,10 +166,6 @@
               "name": "RefreshToken",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
             },
-            {
-              "name": "ExchangeRefreshtoken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ExchangeRefreshToken)')]"
-            },
             {
               "name": "TenantID",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"

diff --git a/deployment/DevAzureDeploymentTemplate.json b/deployment/DevAzureDeploymentTemplate.json
@@ -37,13 +37,6 @@
         "description": "The Refresh token for your Secure Application Model."
       }
     },
-    "ExchangeRefreshToken": {
-      "defaultValue": "LongRefreshtoken",
-      "type": "string",
-      "metadata": {
-        "description": "The Exchange Refresh token for your Secure Application Model."
-      }
-    },
     "GithubRepository": {
       "defaultValue": "https://github.com/KelvinTegelaar/CIPP",
       "type": "string",
@@ -150,18 +143,6 @@
           "dependsOn": [
             "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
           ]
-        },
-        {
-          "type": "secrets",
-          "name": "exchangerefreshtoken",
-          "apiVersion": "2015-06-01",
-          "properties": {
-            "contentType": "text/plain",
-            "value": "[parameters('exchangerefreshtoken')]"
-          },
-          "dependsOn": [
-            "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
-          ]
         }
       ],
       "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
@@ -213,10 +194,6 @@
               "name": "RefreshToken",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
             },
-            {
-              "name": "ExchangeRefreshtoken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ExchangeRefreshToken)')]"
-            },
             {
               "name": "TenantID",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"

diff --git a/deployment/DevAzureDeploymentTemplate_regionoptions.json b/deployment/DevAzureDeploymentTemplate_regionoptions.json
@@ -37,13 +37,6 @@
         "description": "The Refresh token for your Secure Application Model."
       }
     },
-    "ExchangeRefreshToken": {
-      "defaultValue": "LongRefreshtoken",
-      "type": "string",
-      "metadata": {
-        "description": "The Exchange Refresh token for your Secure Application Model."
-      }
-    },
     "GithubRepository": {
       "defaultValue": "https://github.com/KelvinTegelaar/CIPP",
       "type": "string",
@@ -150,18 +143,6 @@
           "dependsOn": [
             "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
           ]
-        },
-        {
-          "type": "secrets",
-          "name": "exchangerefreshtoken",
-          "apiVersion": "2015-06-01",
-          "properties": {
-            "contentType": "text/plain",
-            "value": "[parameters('exchangerefreshtoken')]"
-          },
-          "dependsOn": [
-            "[resourceId('Microsoft.KeyVault/vaults', variables('uniqueResourceNameBase'))]"
-          ]
         }
       ],
       "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
@@ -213,10 +194,6 @@
               "name": "RefreshToken",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
             },
-            {
-              "name": "ExchangeRefreshtoken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ExchangeRefreshToken)')]"
-            },
             {
               "name": "TenantID",
               "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"

diff --git a/package-lock.json b/package-lock.json
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-3.2.1
+3.3.0
diff --git a/src/_nav.js b/src/_nav.js
@@ -606,6 +606,11 @@ const _nav = [
         name: 'Phishing Policies',
         to: '/email/reports/phishing-policies',
       },
+      {
+        component: CNavItem,
+        name: 'Shared Mailbox with Enabled Account',
+        to: '/email/reports/SharedMailboxEnabledAccount',
+      },
     ],
   },
   {

diff --git a/src/routes.js b/src/routes.js
@@ -6,6 +6,7 @@ const Users = React.lazy(() => import('src/views/identity/administration/Users')
 const DeletedItems = React.lazy(() => import('src/views/identity/administration/Deleted'))
 const ViewBEC = React.lazy(() => import('src/views/identity/administration/ViewBEC'))
 const AddUser = React.lazy(() => import('src/views/identity/administration/AddUser'))
+const InviteGuest = React.lazy(() => import('src/views/identity/administration/InviteGuest'))
 const EditUser = React.lazy(() => import('src/views/identity/administration/EditUser'))
 const ViewUser = React.lazy(() => import('src/views/identity/administration/ViewUser'))
 const Groups = React.lazy(() => import('src/views/identity/administration/Groups'))
@@ -55,7 +56,7 @@ const DeployConditional = React.lazy(() => import('src/views/tenant/conditional/
 const ListLicences = React.lazy(() => import('src/views/tenant/administration/ListLicences'))
 const ListAppConsent = React.lazy(() => import('src/views/tenant/administration/ListOauthApps'))
 
-const BasicAuthReport = React.lazy(() => import('src/views/identity/reports/InactiveUsers'))
+const InActiveUserReport = React.lazy(() => import('src/views/identity/reports/InactiveUsers'))
 const SignInReport = React.lazy(() => import('src/views/identity/reports/SignIns'))
 
 const AzureADConnectReport = React.lazy(() =>
@@ -172,6 +173,9 @@ const MailboxClientAccessSettingsList = React.lazy(() =>
 const MailboxStatisticsList = React.lazy(() =>
   import('src/views/email-exchange/reports/MailboxStatisticsList'),
 )
+const SharedMailboxEnabledAccount = React.lazy(() =>
+  import('src/views/email-exchange/reports/SharedMailboxEnabledAccount'),
+)
 const MessageTrace = React.lazy(() => import('src/views/email-exchange/reports/MessageTrace'))
 const PhishingPoliciesList = React.lazy(() =>
   import('src/views/email-exchange/reports/PhishingPoliciesList'),
@@ -228,6 +232,11 @@ const routes = [
   { path: '/identity/administration/users/add', name: 'Add User', component: AddUser },
   { path: '/identity/administration/users/edit', name: 'Edit User', component: EditUser },
   { path: '/identity/administration/users/view', name: 'View User', component: ViewUser },
+  {
+    path: '/identity/administration/users/InviteGuest',
+    name: 'Invite Guest',
+    component: InviteGuest,
+  },
   { path: '/identity/administration/ViewBec', name: 'View BEC', component: ViewBEC },
   { path: '/identity/administration', name: 'Administration' },
   { path: '/identity/administration/users', name: 'Users', component: Users },
@@ -268,8 +277,8 @@ const routes = [
   { path: '/identity/reports/mfa-report', name: 'MFA Report', component: MFAReport },
   {
     path: '/identity/reports/inactive-users-report',
-    name: 'Basic Auth Report',
-    component: BasicAuthReport,
+    name: 'Inactive Users Report',
+    component: InActiveUserReport,
   },
   {
     path: '/identity/reports/Signin-report',
@@ -568,6 +577,11 @@ const routes = [
     path: '/email/reports/mailbox-statistics',
     component: MailboxStatisticsList,
   },
+  {
+    name: 'Shared Mailbox Enabled Account',
+    path: '/email/reports/SharedMailboxEnabledAccount',
+    component: SharedMailboxEnabledAccount,
+  },
   {
     name: 'Mailbox Client Access Settings',
     path: '/email/reports/mailbox-cas-settings',