.

Author: Zerg00s

.gitignore

@@ -7,4 +7,4 @@ settings.json
 /FlowPowerAppsMigrator
 Lists.xml
 traceoutput.txt
-*.json
+/*.json

CompleteResourceMapping.ps1

@@ -7,7 +7,13 @@ if ($null -eq $TARGET_SITE_URL) {
     $TARGET_SITE_URL = Read-Host "Enter the URL of the destination SharePoint site"
 }
 if($DoNotReconnect.IsPresent -eq $false){
-    Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+    if($USE_APP_ONLY_AUTHENTICATION){
+        $TargetAppId = "0789bce2-cd45-4668-a20e-91e730c70861"
+        $TargetAppSecret = "oRYj4s+2zBosk04X+AS+SQGKha/2BS4iek0mfd2PHsg="
+        Connect-PnPOnline -Url $TARGET_SITE_URL -ClientId $TargetAppId -ClientSecret $TargetAppSecret -WarningAction Ignore
+    }else{
+        Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+    }    
 }
 
 $lists = Get-PnPList -Includes Views, Fields, DefaultView

ConvertPackage.ps1

@@ -1,4 +1,21 @@
-Add-Type -AssemblyName System.IO.Compression.FileSystem
+# This code is used to convert packages in the \src folder and save them to the \dist folder. 
+# It first cleans any previously generated packages. It then gets a list of packages 
+# from the \src folder with the .zip extension. It imports a CSV file containing 
+# resource mapping information, and creates a dist folder if it does not exist. 
+
+# It then iterates through each package, extracting it to a destination folder 
+# and replacing any old IDs with new ones from the resource mapping file. 
+# If an MSAPP package is found, it extracts that too and replaces any old IDs 
+# with new ones from the resource mapping file. It then creates a new zip file 
+# for each package, either using tar or System.IO.Compression.ZipFile depending 
+# on whether or not it is a solution package, and saves it to the \dist folder. 
+
+# Finally, it prints out a message that all packages have been converted and 
+# saved to the \dist folder, and invokes 
+# this directory in Windows Explorer so that its contents can be viewed.
+
+
+Add-Type -AssemblyName System.IO.Compression.FileSystem
 $CurrentPath = (Get-Location).Path + "\"
 
 # Clean previously generated packages

GenerateInitialMapping.ps1

@@ -9,11 +9,16 @@ if ($null -eq $SOURCE_SITE_URL) {
 
 Write-Host "[Attention] Look for a login popup in a separate window. Please, log in to the source site site $SOURCE_SITE_URL" -ForegroundColor Cyan
 
-If ($CLEAR_CREDENTIALS_CACHE) {
+if($USE_APP_ONLY_AUTHENTICATION){
+    Connect-PnPOnline -Url $SOURCE_SITE_URL -ClientId $SOURCE_SITE_APP_ID -ClientSecret $SOURCE_SITE_APP_SECRET -WarningAction Ignore
+}elseIf ($CLEAR_CREDENTIALS_CACHE) {
     Connect-PnPOnline -Url $SOURCE_SITE_URL -SPOManagementShell -ClearTokenCache -WarningAction Ignore
 }
 else {
-    Connect-PnPOnline -Url $SOURCE_SITE_URL -UseWebLogin -WarningAction Ignore
+    $appId = "0789bce2-cd45-4668-a20e-91e730c70861"
+    $appSecret = "oRYj4s+2zBosk04X+AS+SQGKha/2BS4iek0mfd2PHsg="
+    Connect-PnPOnline -Url $SOURCE_SITE_URL -ClientId $appId -ClientSecret $appSecret -WarningAction Ignore
+    # Connect-PnPOnline -Url $SOURCE_SITE_URL -UseWebLogin -WarningAction Ignore
 }
 
 try {

MISC/Convert-Packages.ps1

@@ -41,7 +41,12 @@ $Migration = @{
 $Migration = Get-FormItemProperties -item $Migration -dialogTitle "Enter target site" -propertiesOrder @("TARGET_SITE_URL") 
 $TARGET_SITE_URL = $Migration.TARGET_SITE_URL
 
-Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+if($USE_APP_ONLY_AUTHENTICATION){
+    Connect-PnPOnline -Url $TARGET_SITE_URL -ClientId $TARGET_SITE_APP_ID -ClientSecret $TARGET_SITE_APP_SECRET -WarningAction Ignore
+}else{
+    Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+}
+
 $xmlFiles = Get-ChildItem *.xml
 if ($xmlFiles.Count -ne 0) {
     Write-Host Convert-Packages 1: $TARGET_SITE_URL Import of XML -ForegroundColor Yellow

MISC/migrator-config.json

@@ -0,0 +1,5 @@
+{
+    "target-site-url": "",
+    "target-site-app-id":"",
+    "target-site-app-secret":""
+}

Prepare-Deployment-Package-for-Client.ps1

@@ -35,8 +35,11 @@ Get-ChildItem -Recurse | Unblock-File
 # Legacy PowerShell PnP Module is used because the new one has a critical bug
 Import-Module (Get-ChildItem -Recurse -Filter "*.psd1").FullName -DisableNameChecking
 
+# Read migrator-config.json
+$MigratorConfig = Get-Content -Raw -Path "$Path\config\migrator-config.json" | ConvertFrom-Json
+
 $Migration = @{
-    SOURCE_SITE_URL = "https://contoso.sharepoint.com/sites/Site_A"
+    SOURCE_SITE_URL =  $MigratorConfig.'source-site-url'
     MIGRATE_LISTS   = $true    
 }
 
@@ -45,6 +48,26 @@ $Migration = Get-FormItemProperties `
     -dialogTitle "Enter source site URL" `
     -propertiesOrder @("SOURCE_SITE_URL", "MIGRATE_LISTS") 
 
+$SOURCE_SITE_URL = $Migration.SOURCE_SITE_URL
+$SOURCE_SITE_APP_ID = $MigratorConfig.'source-site-app-id'
+$SOURCE_SITE_APP_SECRET = $MigratorConfig.'source-site-app-secret'
+
+$areAllEmpty = [string]::IsNullOrEmpty($SOURCE_SITE_APP_ID) -and 
+    [string]::IsNullOrEmpty($SOURCE_SITE_APP_SECRET)
+
+$areAllFilled = (![string]::IsNullOrEmpty($SOURCE_SITE_APP_ID)) -and
+    (![string]::IsNullOrEmpty($SOURCE_SITE_APP_SECRET))
+
+if ($areAllEmpty -or $areAllFilled) {
+    Write-Host "\config\migrator-config.json file validation passed" -ForegroundColor Green
+} else {
+    Write-Host "Validation failed: Please verify and ensure that either all properties are set or all variables are empty in \config\migrator-config.json" -ForegroundColor Red
+}
+
+if($areAllFilled){
+    $USE_APP_ONLY_AUTHENTICATION = $true
+}
+
 $SOURCE_SITE_URL = $Migration.SOURCE_SITE_URL
 if ($Migration.MIGRATE_LISTS -like "true" -or 
     $Migration.MIGRATE_LISTS -like "yes" -or
@@ -68,6 +91,8 @@ if ($MIGRATE_LISTS) {
 if ((Test-Path -Path "package\MISC") -eq $false) {
     New-Item -ItemType Directory -Force -Path "package\src" | Out-Null
     New-Item -ItemType Directory -Force -Path "package\MISC" | Out-Null
+    New-Item -ItemType Directory -Force -Path "package\config" | Out-Null
+    Copy-Item -Path "MISC\migrator-config.json" -Destination "package\config" -Recurse
     Copy-Item -Path "MISC\SharePointPnPPowerShellOnline" -Destination "package\MISC" -Recurse
     Copy-Item -Path "MISC\PS-Forms.ps1" -Destination "package\MISC"
     Copy-Item -Path "MISC\Move-Lists.ps1" -Destination "package\MISC"

README.md

@@ -169,6 +169,27 @@ SharePoint List forms customized with Power Apps can be migrated if you follow t
 
 
 # Latest Updates
+### 3.9.0 Version - 2023-06-07
+
+#### Changes
+- Added an ability to run migrations using SharePoint-only App ID and App Secret. Use the `config\migrator-config.json` file to do it:
+
+```
+{
+    "source-site-url": "",
+    "target-site-url": "",
+    "source-site-app-id":"",
+    "source-site-app-secret":"",
+    "target-site-app-id":"",
+    "target-site-app-secret":""
+}
+```
+
+#### Known issues
+- If the source and the target sites were created using different languages, then the app migrator will fail with the [Access is denied (Exception from HRESULT: 0x80070005 (E_ACCESSDENIED))](https://github.com/Zerg00s/FlowPowerAppsMigrator/issues/34) error. 
+- Migrated lists with custom content types end up with an extra content type that should be deleted manually after migration.
+- Migrated lists might need fields to be added to the content type or a form. In some cases, migrated lists show only the Title in the edit form.
+
 ### 3.8.6 Version - 2023-05-10
 
 #### Changes

RunAllScripts.ps1

@@ -26,7 +26,7 @@ Write-host
 Write-host "-----------------------------------------------------------------------------"
 Write-host   
 
-Set-PnPTraceLog -On -LogFile traceoutput.txt -Level Debug
+
 
 Set-Location $Path
 . .\MISC\PS-Forms.ps1
@@ -37,9 +37,14 @@ Get-ChildItem -Recurse | Unblock-File
 # and it's not possible to use it in the context of a non-admin user
 Import-Module (Get-ChildItem -Recurse -Filter "*.psd1").FullName -DisableNameChecking
 
+Set-PnPTraceLog -On -LogFile traceoutput.txt -Level Debug
+
+# Read migrator-config.json
+$MigratorConfig = Get-Content -Raw -Path "$Path\config\migrator-config.json" | ConvertFrom-Json
+
 $Migration = @{
-    SOURCE_SITE_URL = "https://contoso.sharepoint.com/sites/Site_A"
-    TARGET_SITE_URL = "https://contoso.sharepoint.com/sites/Site_b"
+    SOURCE_SITE_URL = $MigratorConfig.'source-site-url'
+    TARGET_SITE_URL = $MigratorConfig.'source-site-url'    
     MIGRATE_LISTS   = $true
     CLEAR_CREDENTIALS_CACHE = $false
 }
@@ -51,6 +56,31 @@ $Migration = Get-FormItemProperties `
 
 $SOURCE_SITE_URL = $Migration.SOURCE_SITE_URL
 $TARGET_SITE_URL = $Migration.TARGET_SITE_URL
+$SOURCE_SITE_APP_ID = $MigratorConfig.'source-site-app-id'
+$SOURCE_SITE_APP_SECRET = $MigratorConfig.'source-site-app-secret'
+$TARGET_SITE_APP_ID = $MigratorConfig.'target-site-app-id'
+$TARGET_SITE_APP_SECRET = $MigratorConfig.'target-site-app-secret'
+
+$areAllEmpty = [string]::IsNullOrEmpty($SOURCE_SITE_APP_ID) -and 
+    [string]::IsNullOrEmpty($SOURCE_SITE_APP_SECRET) -and
+    [string]::IsNullOrEmpty($TARGET_SITE_APP_ID) -and
+    [string]::IsNullOrEmpty($TARGET_SITE_APP_SECRET)
+
+$areAllFilled = (![string]::IsNullOrEmpty($SOURCE_SITE_APP_ID)) -and
+    (![string]::IsNullOrEmpty($SOURCE_SITE_APP_SECRET)) -and
+    (![string]::IsNullOrEmpty($TARGET_SITE_APP_ID)) -and
+    (![string]::IsNullOrEmpty($TARGET_SITE_APP_SECRET))
+
+if ($areAllEmpty -or $areAllFilled) {
+    Write-Host "\config\migrator-config.json file validation passed" -ForegroundColor Green
+} else {
+    Write-Host "Validation failed: Please verify and ensure that either all properties are set or all variables are empty in \config\migrator-config.json" -ForegroundColor Red
+}
+
+if($areAllFilled){
+    $USE_APP_ONLY_AUTHENTICATION = $true
+}
+
 if ($Migration.MIGRATE_LISTS -like "true" -or 
     $Migration.MIGRATE_LISTS -like "yes" -or
     $Migration.MIGRATE_LISTS -like "1"
@@ -78,18 +108,21 @@ if ($MIGRATE_LISTS) {
 }
 
 Write-Host "[Attention] Look for a login popup in a separate window. Please, log in to the target site $TARGET_SITE_URL." -ForegroundColor Cyan
-If($CLEAR_CREDENTIALS_CACHE){
+if($USE_APP_ONLY_AUTHENTICATION){
+    Connect-PnPOnline -Url $TARGET_SITE_URL -ClientId $TARGET_SITE_APP_ID -ClientSecret $TARGET_SITE_APP_SECRET -WarningAction Ignore
+}
+elseIf($CLEAR_CREDENTIALS_CACHE){
     Connect-PnPOnline -Url $TARGET_SITE_URL -SPOManagementShell -ClearTokenCache -WarningAction Ignore
-}else{
+}else{    
     Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
 }
 
 # Verify the connection
-$Response = Invoke-PnPSPRestMethod -Url "$TARGET_SITE_URL/_api/web/currentUser"
+# $Response = Invoke-PnPSPRestMethod -Url "$TARGET_SITE_URL/_api/web/currentUser"
 Write-Host 
 Write-Host Connected to the target site -ForegroundColor Green 
 Write-Host "`tSite: $TARGET_SITE_URL" -ForegroundColor Yellow 
-Write-Host "`tUser: $($Response.Title) ($($Response.Email))" -ForegroundColor Yellow 
+# Write-Host "`tUser: $($Response.Title) ($($Response.Email))" -ForegroundColor Yellow 
 
 
 if ($MIGRATE_LISTS) {   

config/.gitignore

@@ -0,0 +1 @@
+migrator-config-dev.json

config/migrator-config.json

@@ -0,0 +1,8 @@
+{
+    "source-site-url": "",
+    "target-site-url": "",
+    "source-site-app-id":"",
+    "source-site-app-secret":"",
+    "target-site-app-id":"",
+    "target-site-app-secret":""
+}