Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to release #1457

Merged
merged 29 commits into from
Mar 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ee38906
added filter
KelvinTegelaar Mar 21, 2023
7693782
Update routes.js
BNWEIN Mar 22, 2023
b8a08b8
Updated "BasicAuthReport" to "InActiveUserReport"
BNWEIN Mar 22, 2023
75f7629
Merge pull request #1434 from BNWEIN/dev
KelvinTegelaar Mar 23, 2023
98a80d7
Added CopyForSentItems Function
BNWEIN Mar 24, 2023
f528a9e
Merge pull request #1441 from BNWEIN/dev
KelvinTegelaar Mar 24, 2023
b9ae134
Added User Mailbox Rules to the Users Page
BNWEIN Mar 24, 2023
cc5db48
Update UserMailboxRuleList.js
BNWEIN Mar 24, 2023
32ee3f2
Fixed GranularDelegetedAdminPrivileges spelling mistake
rvdwegen Mar 25, 2023
c2cc9f8
Merge pull request #1444 from rvdwegen/patch-2
KelvinTegelaar Mar 25, 2023
ea95a3d
Merge pull request #1442 from BNWEIN/dev
KelvinTegelaar Mar 25, 2023
2250638
Added "Guests" functionality
BNWEIN Mar 28, 2023
2cf767e
Revert "Added "Guests" functionality"
BNWEIN Mar 28, 2023
0fcc0ea
Removed ExchangeRefreshToken
rvdwegen Mar 28, 2023
f9feeb4
Removed ExchangeRefreshToken
rvdwegen Mar 28, 2023
414d557
Removed ExchangeRefreshToken
rvdwegen Mar 28, 2023
3c71cdd
Removed ExchangeRefreshToken
rvdwegen Mar 28, 2023
953cd33
Added "Invite Guest" function
BNWEIN Mar 28, 2023
8f07ae7
Merge pull request #1453 from BNWEIN/dev
KelvinTegelaar Mar 28, 2023
b77e286
Added SharedMailbox with Account Enabled Report
BNWEIN Mar 29, 2023
36d48d5
Update InviteGuest.js
BNWEIN Mar 29, 2023
36e5128
Update Logs.js
BNWEIN Mar 29, 2023
2ad6336
Merge pull request #1452 from rvdwegen/dev
KelvinTegelaar Mar 29, 2023
f28a3e4
Merge pull request #1454 from BNWEIN/dev
KelvinTegelaar Mar 29, 2023
392b30e
Removed ExchangeRefreshToken input during setup
rvdwegen Mar 31, 2023
b28b177
Removed ExchangeRefreshToken from home
rvdwegen Mar 31, 2023
2bed1c6
Merge pull request #1456 from rvdwegen/patch-1
KelvinTegelaar Mar 31, 2023
af08a60
version up for release
KelvinTegelaar Mar 31, 2023
5fe595f
Merge branch 'main' into dev
KelvinTegelaar Mar 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions deployment/AzureDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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'))]"]
Expand Down Expand Up @@ -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)')]"
Expand Down
16 changes: 0 additions & 16 deletions deployment/AzureDeploymentTemplate_regionoptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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'))]"]
Expand Down Expand Up @@ -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)')]"
Expand Down
23 changes: 0 additions & 23 deletions deployment/DevAzureDeploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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'))]"]
Expand Down Expand Up @@ -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)')]"
Expand Down
23 changes: 0 additions & 23 deletions deployment/DevAzureDeploymentTemplate_regionoptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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'))]"]
Expand Down Expand Up @@ -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)')]"
Expand Down
57 changes: 31 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/version_latest.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.1
3.3.0
5 changes: 5 additions & 0 deletions src/_nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
],
},
{
Expand Down
20 changes: 17 additions & 3 deletions src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -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(() =>
Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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 },
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
Loading