From 9a5552a1e193568dd799e51224f05a14cfb29192 Mon Sep 17 00:00:00 2001
From: Karl-Wilfried Zimmer <zimmerk4@students.uni-marburg.de>
Date: Sun, 14 Jul 2024 16:45:30 +0200
Subject: [PATCH] linking groups implemented and tested

---
 AddProjectACL.ps1   | 12 ++++++------
 AddProjectRoles.ps1 | 12 ++++++------
 NewProject.ps1      | 24 ++++++++++--------------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/AddProjectACL.ps1 b/AddProjectACL.ps1
index 628cdbf..0ab1ead 100644
--- a/AddProjectACL.ps1
+++ b/AddProjectACL.ps1
@@ -11,17 +11,17 @@ param (
 $Read = 'ACL-'+$ProjectName+'-RO'
 $Write = 'ACL-'+$ProjectName+'-RW'
 
-$ret=@()
+$reta=@()
 
 if($PSBoundParameters.ContainsKey("ProjectName")){
     if($PSBoundParameters.ContainsKey("Server")){
-        $ret += New-ADGroup -Path $ACL -Server $Server -Name $Read -GroupCategory Security -GroupScope Global -PassThru
-        $ret += New-ADGroup -Path $ACL -Server $Server -Name $Write -GroupCategory Security -GroupScope Global -PassThru
+        $reta += New-ADGroup -Path $ACL -Server $Server -Name $Read -GroupCategory Security -GroupScope Global -PassThru
+        $reta += New-ADGroup -Path $ACL -Server $Server -Name $Write -GroupCategory Security -GroupScope Global -PassThru
     } else {
-        $ret += New-ADGroup -Path $ACL -Name $Read -GroupCategory Security -GroupScope Global -PassThru
-        $ret += New-ADGroup -Path $ACL -Name $Write -GroupCategory Security -GroupScope Global -PassThru
+        $reta += New-ADGroup -Path $ACL -Name $Read -GroupCategory Security -GroupScope Global -PassThru
+        $reta += New-ADGroup -Path $ACL -Name $Write -GroupCategory Security -GroupScope Global -PassThru
     }
-    return $ret
+    return $reta
 }
 
 throw "ProjectName parameter needs to be set"
\ No newline at end of file
diff --git a/AddProjectRoles.ps1 b/AddProjectRoles.ps1
index 6dc7a08..2021226 100644
--- a/AddProjectRoles.ps1
+++ b/AddProjectRoles.ps1
@@ -11,18 +11,18 @@ param (
 $Read = 'GR-'+$ProjectName+'-RO'
 $Write = 'GR-'+$ProjectName+'-RW'
 
-$ret=@()
+$retr=@()
 
 if($PSBoundParameters.ContainsKey("ProjectName")){
     if($PSBoundParameters.ContainsKey("Server")){
-        $ret += New-ADGroup -Path $Roles -Server $Server -Name $Read -GroupCategory Security -GroupScope Global -PassThru
-        $ret += New-ADGroup -Path $Roles -Server $Server -Name $Write -GroupCategory Security -GroupScope Global -PassThru
+        $retr += New-ADGroup -Path $Roles -Server $Server -Name $Read -GroupCategory Security -GroupScope Global -PassThru
+        $retr += New-ADGroup -Path $Roles -Server $Server -Name $Write -GroupCategory Security -GroupScope Global -PassThru
     } else {
-        $ret += New-ADGroup -Path $Roles -Name $Read -GroupCategory Security -GroupScope Global -PassThru
-        $ret += New-ADGroup -Path $Roles -Name $Write -GroupCategory Security -GroupScope Global -PassThru
+        $retr += New-ADGroup -Path $Roles -Name $Read -GroupCategory Security -GroupScope Global -PassThru
+        $retr += New-ADGroup -Path $Roles -Name $Write -GroupCategory Security -GroupScope Global -PassThru
     }
 
-    return $ret
+    return $retr
 }
 
 throw "ProjectName parameter needs to be set"
\ No newline at end of file
diff --git a/NewProject.ps1 b/NewProject.ps1
index ffa50a7..cb5b813 100644
--- a/NewProject.ps1
+++ b/NewProject.ps1
@@ -8,27 +8,23 @@ param (
 
 . .\Variables.ps1
 
-$ret
-$acl
-$r
-
 if($PSBoundParameters.ContainsKey("ProjectName")){
     if($PSBoundParameters.ContainsKey("Server")){
         $ret = New-ADGroup -Path $Projects -Server $Server -Name $ProjectName -GroupCategory Security -GroupScope Global -PassThru
-        $ret = Get-ADGroup $ProjectName -SearchBase $Projects -Server $Server
-        $acl = . .\AddProjectACL.ps1 -ProjectName $ProjectName -Server $Server
-        $r = . .\AddProjectRoles.ps1 -ProjectName $ProjectName -Server $Server
+        #$ret = Get-ADGroup $ProjectName -SearchBase $Projects -Server $Server
+        $acls = . .\AddProjectACL.ps1 -ProjectName $ProjectName -Server $Server
+        $rs = . .\AddProjectRoles.ps1 -ProjectName $ProjectName -Server $Server
         #$ret | Add-ADGroupMember -Members $acl,$r
-        $acl | ForEach-Object {add-ADGroupMember -Identity "$ret.DistinguishedName" -Members $_ -Server $Server}
-        $r | ForEach-Object {Add-ADGroupMember -Identity "$ret.DistinguishedName" -Members $_ -Server $Server}
+        $acls | ForEach-Object {add-ADGroupMember -Identity $ret -Members $_ -Server $Server}
+        $rs | ForEach-Object {Add-ADGroupMember -Identity $ret -Members $_ -Server $Server}
     } else {
         $ret = New-ADGroup -Path $Projects -Name $ProjectName -GroupCategory Security -GroupScope Global -PassThru
-        $ret = Get-ADGroup $ProjectName -SearchBase $Projects 
-        $acl = . .\AddProjectACL.ps1 -ProjectName $ProjectName
-        $r = . .\AddProjectRoles.ps1 -ProjectName $ProjectName
+        #$ret = Get-ADGroup $ProjectName -SearchBase $Projects 
+        $acls = . .\AddProjectACL.ps1 -ProjectName $ProjectName
+        $rs = . .\AddProjectRoles.ps1 -ProjectName $ProjectName
         #$ret | Add-ADGroupMember -Members $acl,$r
-        $acl | ForEach-Object {Add-ADGroupMember -Identity "$ret.DistinguishedName" -Members $_}
-        $r | ForEach-Object {Add-ADGroupMember -Identity "$ret.DistinguishedName" -Members $_}
+        $acls | ForEach-Object {Add-ADGroupMember -Identity $ret -Members $_}
+        $rs | ForEach-Object {Add-ADGroupMember -Identity $ret -Members $_}
     }
 
     return $ret