Merge branch 'KelvinTegelaar:main' into main

Author: SimplyICT

.github/workflows/pr_check.yml

@@ -0,0 +1,62 @@
+name: PR Branch Check
+
+on:
+  # Using pull_request_target instead of pull_request for secure handling of fork PRs
+  pull_request_target:
+    # Only run on these PR events
+    types: [opened, synchronize, reopened]
+    # Only check PRs targeting these branches
+    branches:
+      - main
+      - master
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check and Comment on PR
+        # Only process fork PRs with specific branch conditions
+        # Must be a fork AND (source is main/master OR target is main/master)
+        if: |
+          github.event.pull_request.head.repo.fork == true && 
+          ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
+          (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            let message = '';
+
+            message += '🔄 If you are attempting to update your CIPP repo please follow the instructions at: https://docs.cipp.app/setup/self-hosting-guide/updating. Are you a sponsor? Contact the helpdesk for direct assistance with updating to the latest version.';
+            message += '\n\n';
+
+            // Check if PR is targeting main/master
+            if (context.payload.pull_request.base.ref === 'main' || context.payload.pull_request.base.ref === 'master') {
+              message += '⚠️ PRs cannot target the main branch directly. If you are attempting to contribute code please PR to the dev branch.\n\n';
+            }
+
+            // Check if PR is from a fork's main/master branch
+            if (context.payload.pull_request.head.repo.fork && 
+                (context.payload.pull_request.head.ref === 'main' || context.payload.pull_request.head.ref === 'master')) {
+              message += '⚠️ This PR cannot be merged because it originates from your fork\'s main/master branch. If you are attempting to contribute code please PR from your dev branch or another non-main/master branch.\n\n';
+            }
+
+            message += '🔒 This PR will now be automatically closed due to the above rules.';
+            
+            // Post the comment
+            await github.rest.issues.createComment({
+              ...context.repo,
+              issue_number: context.issue.number,
+              body: message
+            });
+            
+            // Close the PR
+            await github.rest.pulls.update({
+              ...context.repo,
+              pull_number: context.issue.number,
+              state: 'closed'
+            });

README.md

@@ -1 +1,13 @@
-#Replace with CIPPREadMe
+![CyberDrain Light](github_assets/img/CIPP.png#gh-dark-mode-only)
+![CyberDrain Dark](github_assets/img/CIPP-Light.png#gh-light-mode-only)
+
+# What is this?
+
+The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners. The current Microsoft partner landscape makes it fairly hard to manage multi tenant situations, with loads of manual work. Microsoft Lighthouse might resolve this in the future but development of this is lagging far behind development of the current market for Microsoft Partners.  
+This project is a way to help you with administration, with user management, and deploying your own preferred standards. It's not a replacement for security tools, or a way to cut costs on specific subscriptions. The tool should assist you in removing the gripes with standard partner management and save you several hours per engineer per month.  
+For more information, we recommend checking out our website [here](https://cipp.app)  
+For detailed documentation about features of CIPP, please check out our [documentation.](https://docs.cipp.app)
+
+# Our sponsors
+
+You can find our sponsors [here.](https://docs.cipp.app/#our-sponsors)

Tools/Start-CippDevEmulatorsWithKitty.ps1

@@ -1,8 +1,11 @@
 Get-Command kitty -ErrorAction Stop | Out-Null
-Write-Host 'Starting CIPP Dev Emulators'
 Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
 $Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
+pwsh -file (Join-Path $PSScriptRoot 'Start-CippDevInstallation.ps1')
+
+Write-Host 'Starting CIPP Dev Emulators'
+
 if (Test-Path (Join-Path $Path 'CIPP-API-Processor')) {
   $Process = Read-Host -Prompt 'Start Process Function (y/N)?'
 }
@@ -11,14 +14,14 @@ if ($Process -eq 'y') {
   kitty --detach --title 'CIPP' -o allow_remote_control=yes -- pwsh -c "
   kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ;
   kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start;
-  kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- npm run dev ;
+  kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ;
   kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa;
   kitty @new-window --new-tab --tab-title `"CIPP-API-Processor`" --cwd (Join-Path $Path `"CIPP-API-Processor`") -- func start --port 7072"
 
 } else {
   kitty --detach --title 'CIPP' -o allow_remote_control=yes -- pwsh -c "
   kitty @new-window --new-tab --tab-title `"Azurite`" --cwd $Path -- azurite ;
   kitty @new-window --new-tab --tab-title `"FunctionApp`" --cwd (Join-Path $Path `"CIPP-API`") -- func start;
-  kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- npm run dev ;
+  kitty @new-window --new-tab --tab-title `"CIPP Frontend`" --cwd (Join-Path $Path `"CIPP`") -- yarn run dev ;
   kitty @new-window --new-tab --tab-title `"SWA`" --cwd (Join-Path $Path `"CIPP`") -- npm run start-swa"
 }

Tools/Start-CippDevInstallation.ps1

@@ -0,0 +1,32 @@
+$Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
+
+if (-not(Get-Command npm)) {
+  throw 'npm is required to install the CIPP development environment'
+}
+
+if (-not(Get-Command azurite)) {
+  Write-Host 'Installing Azurite'
+  npm install --global 'azurite'
+}
+
+if (-not(Get-Command swa)) {
+  Write-Host 'Installing @azure/static-web-apps-cli'
+  npm install --global '@azure/static-web-apps-cli'
+}
+
+if (-not(Get-Command func)) {
+  Write-Host 'Installing Azure Functions Core Tools'
+  npm install --global 'azure-functions-core-tools@4' --unsafe-perms true
+}
+
+if (-not(Get-Command yarn)) {
+  Write-Host 'Installing Yarn'
+  npm install --global yarn
+}
+
+if (-not(yarn list --global --pattern 'next' | Select-String -Pattern 'next')) {
+  Write-Host 'Installing Next.js'
+  yarn install --global next --network-timeout 500000
+}
+
+yarn install --cwd (Join-Path $Path "CIPP") --network-timeout 500000

deployment/DevAzureDeploymentTemplate_regionoptions.json

@@ -294,6 +294,8 @@
         "buildProperties": {
           "appLocation": "/",
           "apiLocation": "",
+
+          "appArtifactLocation": ""
           "outputLocation": "/out"
         }
       },