Merge pull request #2923 from KelvinTegelaar/dev

dev to main
KelvinTegelaar · Oct 4, 2024 · 65176b0 · 65176b0
2 parents 3439e33 + e18ffcb
commit 65176b0
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 94 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-__*
+__*
+.next/*
diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json
@@ -22,13 +22,6 @@
       "metadata": {
         "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token"
       }
-    },
-    "GithubAPIRepository": {
-      "defaultValue": "https://github.com/KelvinTegelaar/CIPP-API",
-      "type": "string",
-      "metadata": {
-        "description": "URL to your Github backend fork."
-      }
     }
   },
   "variables": {
@@ -57,7 +50,7 @@
             "objectId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
             "permissions": {
               "keys": [],
-              "secrets": ["all"],
+              "secrets": [ "all" ],
               "certificates": []
             }
           }
@@ -116,7 +109,7 @@
           ]
         }
       ],
-      "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
+      "dependsOn": [ "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]" ]
     },
     {
       "apiVersion": "2015-08-01",
@@ -135,7 +128,7 @@
         "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('serverFarmName'))]",
         "siteConfig": {
           "Use32BitWorkerProcess": false,
-          "powerShellVersion": "7.2",
+          "powerShellVersion": "7.4",
           "appSettings": [
             {
               "name": "AzureWebJobsStorage",
@@ -154,45 +147,28 @@
               "value": "~4"
             },
             {
-              "name": "ApplicationID",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ApplicationId)')]"
-            },
-            {
-              "name": "ApplicationSecret",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ApplicationSecret)')]"
-            },
-            {
-              "name": "RefreshToken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
-            },
-            {
-              "name": "TenantID",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"
+              "name": "WEBSITE_RUN_FROM_PACKAGE",
+              "value": "1"
             },
             {
               "name": "FUNCTIONS_WORKER_RUNTIME",
               "value": "powershell"
             }
           ]
         }
-      },
-      "resources": [
-        {
-          "apiVersion": "2015-08-01",
-          "name": "web",
-          "type": "sourcecontrols",
-          "dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
-          "properties": {
-            "RepoUrl": "[parameters('GithubAPIRepository')]",
-            "repositoryToken": "[parameters('GithubToken')]",
-            "token": "[parameters('GithubToken')]",
-
-            "branch": "master",
-            "publishRunbook": true,
-            "IsManualIntegration": true
-          }
-        }
-      ]
+      }
+    },
+    {
+      "name": "[concat(variables('funcAppName'), '/ZipDeploy')]",
+      "type": "Microsoft.Web/sites/extensions",
+      "apiVersion": "2021-02-01",
+      "location": "[resourceGroup().location]",
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
+      ],
+      "properties": {
+        "packageUri": "https://cippreleases.blob.core.windows.net/cipp-api/latest.zip"
+      }
     },
     {
       "type": "Microsoft.Storage/storageAccounts",

diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json
@@ -22,13 +22,6 @@
       "metadata": {
         "description": "Your Github Repository token (see https://docs.microsoft.com/en-us/azure/static-web-apps/publish-azure-resource-manager?tabs=azure-cli#create-a-github-personal-access-token)"
       }
-    },
-    "GithubAPIRepository": {
-      "defaultValue": "https://github.com/KelvinTegelaar/CIPP-API",
-      "type": "string",
-      "metadata": {
-        "description": "URL to your Github backend fork."
-      }
     }
   },
   "variables": {
@@ -57,7 +50,7 @@
             "objectId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]",
             "permissions": {
               "keys": [],
-              "secrets": ["all"],
+              "secrets": [ "all" ],
               "certificates": []
             }
           }
@@ -116,7 +109,7 @@
           ]
         }
       ],
-      "dependsOn": ["[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"]
+      "dependsOn": [ "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]" ]
     },
     {
       "apiVersion": "2015-08-01",
@@ -135,7 +128,7 @@
         "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('serverFarmName'))]",
         "siteConfig": {
           "Use32BitWorkerProcess": false,
-          "powerShellVersion": "7.2",
+          "powerShellVersion": "7.4",
           "appSettings": [
             {
               "name": "AzureWebJobsStorage",
@@ -154,42 +147,28 @@
               "value": "~4"
             },
             {
-              "name": "ApplicationID",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ApplicationId)')]"
-            },
-            {
-              "name": "ApplicationSecret",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/ApplicationSecret)')]"
-            },
-            {
-              "name": "RefreshToken",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/RefreshToken)')]"
-            },
-            {
-              "name": "TenantID",
-              "value": "[concat('@Microsoft.KeyVault(SecretUri=https://',variables('uniqueResourceNameBase'), '.vault.azure.net/secrets/tenantid)')]"
+              "name": "WEBSITE_RUN_FROM_PACKAGE",
+              "value": "1"
             },
             {
               "name": "FUNCTIONS_WORKER_RUNTIME",
               "value": "powershell"
             }
           ]
         }
-      },
-      "resources": [
-        {
-          "apiVersion": "2015-08-01",
-          "name": "web",
-          "type": "sourcecontrols",
-          "dependsOn": ["[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]"],
-          "properties": {
-            "RepoUrl": "[parameters('GithubAPIRepository')]",
-            "branch": "master",
-            "publishRunbook": true,
-            "IsManualIntegration": true
-          }
-        }
-      ]
+      }
+    },
+    {
+      "name": "[concat(variables('funcAppName'), '/ZipDeploy')]",
+      "type": "Microsoft.Web/sites/extensions",
+      "apiVersion": "2021-02-01",
+      "location": "[resourceGroup().location]",
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]"
+      ],
+      "properties": {
+        "packageUri": "https://cippreleases.blob.core.windows.net/cipp-api/latest.zip"
+      }
     },
     {
       "type": "Microsoft.Storage/storageAccounts",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {

diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-6.4.0
+6.4.1
diff --git a/src/components/utilities/CippAppPermissionBuilder.jsx b/src/components/utilities/CippAppPermissionBuilder.jsx
@@ -60,7 +60,6 @@ const CippAppPermissionBuilder = ({
   } = useGenericGetRequestQuery({
     path: 'api/ExecServicePrincipals',
   })
-
   const [createServicePrincipal, createResult] = useLazyGenericGetRequestQuery()
 
   const removeServicePrincipal = (appId) => {
@@ -407,9 +406,17 @@ const CippAppPermissionBuilder = ({
   ])
 
   const ApiPermissionRow = ({ servicePrincipal = null }) => {
+    const {
+      data: servicePrincipalData = [],
+      isFetching: spFetching,
+      isSuccess: spIdSuccess,
+    } = useGenericGetRequestQuery({
+      path: 'api/ExecServicePrincipals?Id=' + servicePrincipal.id,
+    })
+
     return (
       <>
-        {spSuccess && servicePrincipal !== null && (
+        {spSuccess && servicePrincipal !== null && spIdSuccess && (
           <CRow>
             <CCol xl={12}>
               <CRow>
@@ -457,7 +464,7 @@ const CippAppPermissionBuilder = ({
                                       '.applicationPermissions'
                                     }
                                     label="Application Permissions"
-                                    values={servicePrincipal?.appRoles
+                                    values={servicePrincipalData?.Results?.appRoles
                                       ?.filter((role) => {
                                         return newPermissions?.Permissions[
                                           servicePrincipal.appId
@@ -524,8 +531,9 @@ const CippAppPermissionBuilder = ({
                             },
                             {
                               selector: (row) =>
-                                servicePrincipal.appRoles.find((role) => role.id === row.id)
-                                  .description,
+                                servicePrincipalData?.Results?.appRoles.find(
+                                  (role) => role.id === row.id,
+                                ).description,
                               name: 'Description',
                               cell: cellGenericFormatter({ wrap: true }),
                               maxWidth: '60%',
@@ -577,7 +585,7 @@ const CippAppPermissionBuilder = ({
               </CRow>
               <CRow>
                 <CCol xl={12}>
-                  {servicePrincipal?.publishedPermissionScopes?.length == 0 && (
+                  {servicePrincipalData?.Results?.publishedPermissionScopes?.length == 0 && (
                     <CCallout color="warning">
                       <FontAwesomeIcon icon="exclamation-triangle" className="me-2" />
                       No Published Delegated Permissions found.
@@ -594,8 +602,8 @@ const CippAppPermissionBuilder = ({
                               }
                               label="Delegated Permissions"
                               values={
-                                servicePrincipal?.publishedPermissionScopes?.length > 0
-                                  ? servicePrincipal?.publishedPermissionScopes
+                                servicePrincipalData?.Results?.publishedPermissionScopes?.length > 0
+                                  ? servicePrincipalData?.Results?.publishedPermissionScopes
                                       .filter((scopes) => {
                                         return newPermissions?.Permissions[
                                           servicePrincipal.appId
@@ -664,7 +672,7 @@ const CippAppPermissionBuilder = ({
                         },
                         {
                           selector: (row) =>
-                            servicePrincipal.publishedPermissionScopes.find(
+                            servicePrincipalData?.Results?.publishedPermissionScopes.find(
                               (scope) => scope?.id === row?.id,
                             )?.userConsentDescription ?? 'No Description',
                           name: 'Description',
@@ -921,6 +929,9 @@ const CippAppPermissionBuilder = ({
                                             Object.keys(
                                               newPermissions?.MissingPermissions[perm],
                                             ).map((type) => {
+                                              if (!updatedPermissions.Permissions[perm][type]) {
+                                                updatedPermissions.Permissions[perm][type] = []
+                                              }
                                               newPermissions?.MissingPermissions[perm][type].map(
                                                 (p) => {
                                                   updatedPermissions.Permissions[perm][type].push(p)

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-6.4.0
+6.4.1