diff --git a/.github/workflows/cipp_dev_build.yml b/.github/workflows/cipp_dev_build.yml
index 834f1995b668..dad0dbebe307 100644
--- a/.github/workflows/cipp_dev_build.yml
+++ b/.github/workflows/cipp_dev_build.yml
@@ -18,10 +18,17 @@ jobs:
uses: actions/checkout@v4.2.2
# Set up Node.js
+ - name: Get Node version
+ id: get_node_version
+ run: |
+ node_raw_version=$(node -p "require('./package.json').engines.node")
+ node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g')
+ echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
+
- name: Set up Node.js
uses: actions/setup-node@v4.2.0
with:
- node-version: '20.18.1'
+ node-version: ${{ steps.get_node_version.outputs.node_version }}
# Install dependencies
- name: Install Dependencies
diff --git a/.github/workflows/cipp_frontend_build.yml b/.github/workflows/cipp_frontend_build.yml
index 3d6d1c79550e..76a7dbb2fbbf 100644
--- a/.github/workflows/cipp_frontend_build.yml
+++ b/.github/workflows/cipp_frontend_build.yml
@@ -18,10 +18,17 @@ jobs:
uses: actions/checkout@v4.2.2
# Set up Node.js
+ - name: Get Node version
+ id: get_node_version
+ run: |
+ node_raw_version=$(node -p "require('./package.json').engines.node")
+ node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g')
+ echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT
+
- name: Set up Node.js
uses: actions/setup-node@v4.2.0
with:
- node-version: '20.18.1'
+ node-version: ${{ steps.get_node_version.outputs.node_version }}
# Install dependencies
- name: Install Dependencies
diff --git a/package.json b/package.json
index 13dac459bf3f..87d502b493e1 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
},
"license": "AGPL-3.0",
"engines": {
- "node": "^20.18.1"
+ "node": "^22.13.0"
},
"repository": {
"type": "git",
diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx
index 93e6d991adb6..b443b4bcb856 100644
--- a/src/components/CippComponents/CippUserActions.jsx
+++ b/src/components/CippComponents/CippUserActions.jsx
@@ -53,7 +53,7 @@ export const CippUserActions = () => {
//tested
label: "Create Temporary Access Password",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecCreateTAP",
data: { ID: "userPrincipalName" },
@@ -63,7 +63,7 @@ export const CippUserActions = () => {
{
//tested
label: "Re-require MFA registration",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecResetMFA",
data: { ID: "userPrincipalName" },
@@ -107,26 +107,26 @@ export const CippUserActions = () => {
{
//tested
label: "Convert to Shared Mailbox",
- type: "GET",
+ type: "POST",
icon: ,
- url: "/api/ExecConvertToSharedMailbox",
- data: { ID: "userPrincipalName" },
+ url: "/api/ExecConvertMailbox",
+ data: { ID: "userPrincipalName", MailboxType: "!Shared" },
confirmText: "Are you sure you want to convert this user to a shared mailbox?",
multiPost: false,
},
{
label: "Convert to User Mailbox",
- type: "GET",
+ type: "POST",
icon: ,
- url: "/api/ExecConvertToSharedMailbox",
- data: { ID: "userPrincipalName", ConvertToUser: true },
+ url: "/api/ExecConvertMailbox",
+ data: { ID: "userPrincipalName", MailboxType: "!Regular" },
confirmText: "Are you sure you want to convert this user to a user mailbox?",
multiPost: false,
},
{
//tested
label: "Enable Online Archive",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecEnableArchive",
data: { ID: "userPrincipalName" },
@@ -237,7 +237,7 @@ export const CippUserActions = () => {
},
{
label: "Block Sign In",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecDisableUser",
data: { ID: "id" },
@@ -247,7 +247,7 @@ export const CippUserActions = () => {
},
{
label: "Unblock Sign In",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecDisableUser",
data: { ID: "id", Enable: true },
@@ -257,7 +257,7 @@ export const CippUserActions = () => {
},
{
label: "Reset Password (Must Change)",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecResetPass",
data: {
@@ -271,7 +271,7 @@ export const CippUserActions = () => {
},
{
label: "Reset Password",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecResetPass",
data: {
@@ -296,7 +296,7 @@ export const CippUserActions = () => {
},
{
label: "Revoke all user sessions",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/ExecRevokeSessions",
data: { ID: "id", Username: "userPrincipalName" },
@@ -305,7 +305,7 @@ export const CippUserActions = () => {
},
{
label: "Delete User",
- type: "GET",
+ type: "POST",
icon: ,
url: "/api/RemoveUser",
data: { ID: "id" },
diff --git a/src/components/CippStandards/CippStandardDialog.jsx b/src/components/CippStandards/CippStandardDialog.jsx
index 69b014d723e4..cb9f571218c3 100644
--- a/src/components/CippStandards/CippStandardDialog.jsx
+++ b/src/components/CippStandards/CippStandardDialog.jsx
@@ -1,3 +1,4 @@
+import { differenceInDays } from 'date-fns';
import {
Dialog,
DialogActions,
@@ -47,6 +48,12 @@ const CippStandardDialog = ({
[]
);
+ const isNewStandard = (dateAdded) => {
+ const currentDate = new Date();
+ const addedDate = new Date(dateAdded);
+ return differenceInDays(currentDate, addedDate) <= 30;
+ };
+
return (