Merge pull request #32 from bk-lg/main

Add support for reading entra id application settings from config file

Author: Romanitho

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2023 Romain
+Copyright (c) 2025 Lukas Glitt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,3 +11,11 @@ Winget Intune app packager
 ![image](https://user-images.githubusercontent.com/96626929/229953293-937dc902-d1d7-4fdb-8146-03d3052a584a.png)
 
 This tool auto create Intune app package from Winget app repository using https://github.com/Romanitho/Winget-Install
+
+## Configuration file
+You can place an configuration file with the name config.env in the same folder as the executable. The configuration file should be in the following format:
+```
+tenant_id=
+client_id=
+redirect_uri=https://login.microsoftonline.com/common/oauth2/nativeclient
+```

config.env.example

@@ -0,0 +1,3 @@
+tenant_id=
+client_id=
+redirect_uri=https://login.microsoftonline.com/common/oauth2/nativeclient

sources/WingetIntunePackager.ps1

@@ -75,8 +75,9 @@ function Start-InstallGUI {
         <Grid x:Name="GridIcon" VerticalAlignment="Top" HorizontalAlignment="Right" Width="90" Height="90" Margin="0,152,10,0" Background="White">
             <Image x:Name="AppIcon" Height="90" Width="90" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </Grid>
-        <Button x:Name="ConnectButton" Content="Connect" HorizontalAlignment="Right" VerticalAlignment="Top" Width="90" Height="24" Margin="0,330,10,0"/>
-        <TextBlock x:Name="ConnectionStatusTextBlock" HorizontalAlignment="Left" Margin="614,359,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Text="Not connected." Foreground="Red"/>
+        <Button x:Name="LoadConfigButton" Content="Load config" HorizontalAlignment="Right" VerticalAlignment="Top" Width="90" Height="24" Margin="0,308,10,0"/>
+        <Button x:Name="ConnectButton" Content="Connect" HorizontalAlignment="Right" VerticalAlignment="Top" Width="90" Height="24" Margin="0,337,10,0"/>
+        <TextBlock x:Name="ConnectionStatusTextBlock" HorizontalAlignment="Left" Margin="614,362,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Text="Not connected." Foreground="Red"/>
         <Label x:Name="IntuneClientID" Content="Intune Client ID:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,354,0,0"/>
         <TextBox x:Name="IntuneClientIDTextbox" VerticalAlignment="Top" Margin="10,380,0,0" Height="24" VerticalContentAlignment="Center" Width="280" HorizontalAlignment="Left"/>
         <TextBox x:Name="IntuneRedirectUriTextbox" VerticalAlignment="Top" Margin="300,380,0,0" Height="24" VerticalContentAlignment="Center" Width="280" HorizontalAlignment="Left"/>
@@ -85,7 +86,6 @@ function Start-InstallGUI {
     </Grid>
 </Window>
 "@
-
     #Create window
     $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
     [xml]$XAML = $inputXML -f $WingetIntunePackager
@@ -100,7 +100,6 @@ function Start-InstallGUI {
     $FormObjects | ForEach-Object {
         Set-Variable -Name "$($_.Name)" -Value $WingetIntunePackagerForm.FindName($_.Name) -Scope Script
     }
-
     #Icon Dialog box
     $OpenIconDialog = New-Object System.Windows.Forms.OpenFileDialog
     $OpenIconDialog.Filter = "Image Files (*.jpg,*.jpeg,*.png)|*.jpg;*.jpeg;*.png"
@@ -187,6 +186,26 @@ function Start-InstallGUI {
             $AppIcon.Source = $AppInfo.Icon = $null
         })
 
+    $LoadConfigButton.add_click({
+        #Try to load configuration
+        try {
+            # $ScriptPath
+            # if ($MyInvocation.MyCommand.CommandType -eq "ExternalScript"){
+            #     $ScriptPath = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition }
+            # else { 
+            #     $ScriptPath = Split-Path -Parent -Path ([Environment]::GetCommandLineArgs()[0]) 
+            #     if (!$ScriptPath){ $ScriptPath = "." } 
+            # }
+            $config = Get-Content -Path .\config.env | ConvertFrom-StringData
+        }
+        catch {
+            Write-Verbose "Failed to read configuration file: $_."
+        }
+        $IntuneTenantIDTextbox.Text = $config.tenant_id
+        $IntuneClientIDTextbox.Text = $config.client_id
+        $IntuneRedirectUriTextbox.Text = $config.redirect_uri
+    })
+
     $ConnectButtonAction = {
         Start-PopUp "Connecting..."
         $ConnectionStatus = Connect-MSIntuneGraph -TenantID $IntuneTenantIDTextbox.Text -ClientID $IntuneClientIDTextbox.Text -RedirectUri $IntuneRedirectUriTextbox.Text