Skip to content

Commit 7ec121d

Browse files
LANCreationLANCreation
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents 9605dba + ada0f46 commit 7ec121d

File tree

771 files changed

+319332
-45835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

771 files changed

+319332
-45835
lines changed

.github/workflows/dev_cipppwrro.yml renamed to .github/workflows/dev_cippahmcc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cipppwrro
4+
name: Build and deploy Powershell project to Azure Function App - cippahmcc
55

66
on:
77
push:
@@ -24,7 +24,7 @@ jobs:
2424
uses: Azure/functions-action@v1
2525
id: fa
2626
with:
27-
app-name: 'cipppwrro'
27+
app-name: 'cippahmcc'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D5D7DFF930C04B519206F25DDCD88324 }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D6317AAB492A474D91B7A6CD29E53BA3 }}

‎.github/workflows/dev_cippmpiii.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: Build and deploy Powershell project to Azure Function App - cippmpiii
5+
6+
on:
7+
push:
8+
branches:
9+
- dev
10+
workflow_dispatch:
11+
12+
env:
13+
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14+
15+
jobs:
16+
deploy:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: 'Checkout GitHub Action'
21+
uses: actions/checkout@v4
22+
23+
- name: 'Run Azure Functions Action'
24+
uses: Azure/functions-action@v1
25+
id: fa
26+
with:
27+
app-name: 'cippmpiii'
28+
slot-name: 'Production'
29+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_BC5F21E993034DF2A3793489CE4705E4 }}

‎.github/workflows/upload_dev.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Upload Dev zip
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
8+
jobs:
9+
release:
10+
if: github.event.repository.fork == false && github.event_name == 'push'
11+
name: Upload to Azure
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
# Checkout the repository
16+
- name: Checkout Code
17+
uses: actions/checkout@v3
18+
19+
# Create ZIP File in a New Source Directory
20+
- name: Prepare and Zip Release Files
21+
run: |
22+
mkdir -p src/releases
23+
zip -r src/releases/dev.zip . \
24+
--exclude "./src/releases/*" \
25+
--exclude ".*" \
26+
--exclude ".*/**"
27+
28+
# Upload to Azure Blob Storage
29+
- name: Azure Blob Upload with Destination folder defined
30+
uses: LanceMcCarthy/[email protected]
31+
with:
32+
connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
33+
container_name: cipp-api
34+
source_folder: src/releases/
35+
destination_folder: /
36+
delete_if_exists: true

‎.vscode/extensions.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{
2-
"recommendations": [
3-
"editorconfig.editorconfig"
4-
]
5-
}
1+
{
2+
"recommendations": [
3+
"editorconfig.editorconfig",
4+
"streetsidesoftware.code-spell-checker"
5+
]
6+
}

‎AddChocoApp/IntunePackage/Install.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ param (
1919

2020
try {
2121
if ($Trace) { Start-Transcript -Path (Join-Path $env:windir "\temp\choco-$Packagename-trace.log") }
22-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
22+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2323

2424
if ($InstallChoco) {
2525
if (-not (Test-Path $chocoPath)) {
2626
try {
2727
Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
28-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
28+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2929
}
3030
catch {
3131
Write-Host "InstallChoco Error: $($_.Exception.Message)"
@@ -45,7 +45,7 @@ try {
4545
& "$chocoPath" install $Packagename -y $CustomRepoString
4646
}
4747
Write-Host 'Completed.'
48-
}
48+
}
4949
catch {
5050
Write-Host "Install/upgrade error: $($_.Exception.Message)"
5151
}

‎AddChocoApp/IntunePackage/Uninstall.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ param (
44
[string]
55
$Packagename
66
)
7-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
7+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
88
& $Chocopath uninstall $Packagename -y
99

‎Config/CyberEssentials.BPATemplate.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@
9292
"isMFARegistered",
9393
"defaultMFAMethod"
9494
],
95-
"URL": "https://graph.microsoft.com/beta/reports/authenticationMethods/userRegistrationDetails"
95+
"URL": "https://graph.microsoft.com/beta/reports/authenticationMethods/userRegistrationDetails",
96+
"Parameters": {
97+
"asApp": "True"
98+
}
9699
}
97100
]
98101
}

‎Config/cipp-roles.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"readonly": {
3+
"include": ["*.Read"],
4+
"exclude": ["CIPP.SuperAdmin.*"]
5+
},
6+
"editor": {
7+
"include": ["*.Read", "*.ReadWrite"],
8+
"exclude": [
9+
"CIPP.SuperAdmin.*",
10+
"CIPP.Admin.*",
11+
"CIPP.AppSettings.*",
12+
"Tenant.Standards.ReadWrite"
13+
]
14+
},
15+
"admin": {
16+
"include": ["*"],
17+
"exclude": ["CIPP.SuperAdmin.*"]
18+
},
19+
"superadmin": {
20+
"include": ["*"],
21+
"exclude": []
22+
}
23+
}

‎Config/schemaDefinitions.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[
2+
{
3+
"id": "cippUser",
4+
"description": "CIPP User Schema",
5+
"targetTypes": ["User"],
6+
"properties": [
7+
{ "name": "jitAdminEnabled", "type": "Boolean" },
8+
{ "name": "jitAdminExpiration", "type": "DateTime" },
9+
{ "name": "mailboxType", "type": "String" },
10+
{ "name": "archiveEnabled", "type": "Boolean" },
11+
{ "name": "autoExpandingArchiveEnabled", "type": "Boolean" },
12+
{ "name": "perUserMfaState", "type": "String" }
13+
],
14+
"status": "Available"
15+
}
16+
]

0 commit comments

Comments
 (0)