Merged branch staging into master

Author: markekraus

PSMSGraph/Public/Get-AADGroupByDisplayName.ps1

@@ -36,9 +36,15 @@
     
     .OUTPUTS
         MSGraphAPI.DirectoryObject.ServicePrincipal
-    
+
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByDisplayName    
+
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupMember
+
     .LINK
-        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByDisplayName
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByID
 #>
 function Get-AADGroupByDisplayName {
     [CmdletBinding(SupportsShouldProcess = $true,

PSMSGraph/Public/Get-AADGroupById.ps1

@@ -38,6 +38,12 @@
         MSGraphAPI.DirectoryObject.Group
     .LINK
         http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByID
+    
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupMember
+
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByDisplayName   
 #>
 function Get-AADGroupByID {
     [CmdletBinding(SupportsShouldProcess = $true,

PSMSGraph/Public/Get-AADGroupMember.ps1

@@ -3,6 +3,7 @@
 	===========================================================================
 	 Created with: 	SAPIEN Technologies, Inc., PowerShell Studio 2017 v5.4.135
 	 Created on:   	2/14/2017 6:02 AM
+     Edited on:     3/30/2017
 	 Created by:   	Mark Kraus
 	 Organization: 	Mitel
 	 Filename:     	Get-AADGroupMember.ps1
@@ -28,13 +29,31 @@
     .PARAMETER APIVersion
         version of the API to use. Default is 1.6
     
+    .PARAMETER ResultsPerPage
+        The number of results to request from the API per call. This is the '$top' API query filter. Default is 100. Valid Range is 1-999.
+
+        This will not limit the number of resutls retruned by the command.
+    
+    .OUTPUTS
+        MSGraphAPI.DirectoryObject.User
+
+    .INPUTS
+        MSGraphAPI.DirectoryObject.Group
+    
     .EXAMPLE
         PS C:\> $AADGroupMembers = $AADGroup | Get-AADGroupMembers 
     
     .NOTES
         Additional information about the function.
+
     .LINK
         http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupMember
+
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByID
+
+    .LINK
+        http://psmsgraph.readthedocs.io/en/latest/functions/Get-AADGroupByDisplayName
 #>
 function Get-AADGroupMember {
     [CmdletBinding(SupportsShouldProcess = $true,
@@ -55,7 +74,11 @@ function Get-AADGroupMember {
         [string]$BaseUrl = 'https://graph.windows.net',
 
         [Parameter(ValueFromPipelineByPropertyName = $true)]
-        [string]$APIVersion = '1.6'
+        [string]$APIVersion = '1.6',
+        
+        [Parameter(ValueFromPipelineByPropertyName = $true)]
+        [ValidateRange(1,999)]
+        [int]$ResultsPerPage = 100
     )
 
     process {
@@ -68,13 +91,14 @@ function Get-AADGroupMember {
             $Tenant = $Application.Tenant
             $SkipToken = $null
             do {
-                $Url = '{0}/{1}/{2}/{3}/{4}?api-version={5}{6}' -f @(
+                $Url = '{0}/{1}/{2}/{3}/{4}?api-version={5}{6}{7}' -f @(
                     $BaseUrl
                     $Tenant
                     'groups'
                     $GroupObject.objectId
                     'members'
                     $APIversion
+                    '&$top={0}' -f $ResultsPerPage
                     $SkipToken
                 )
                 $Params = @{

PSMSGraph/Public/Get-GraphOauthAccessToken.ps1

@@ -3,6 +3,7 @@
 	===========================================================================
 	 Created with: 	SAPIEN Technologies, Inc., PowerShell Studio 2017 v5.4.135
 	 Created on:   	2/8/2017 10:26 AM
+     Edited on::    4/15/2017
 	 Created by:   	Mark Kraus
 	 Organization: 	Mitel
 	 Filename:     	Get-GraphOauthAccessToken.ps1
@@ -33,16 +34,23 @@
     
         You must set the resource to match the endpoints your token will be valid for.
 
-            Microsft Graph:              https://outlook.office.com
+            Microsft Graph:              https://graph.microsoft.com
             Azure AD Graph API:          https://graph.windows.net
             Office 365 Unified Mail API: https://outlook.office.com
         
         If you need to access more than one resrouce, you will need to request multiple OAuth Access Tokens and use the correct tokens for the correct endpoints.
-    
-    .PARAMETER ResultVariable
-        Name of a varibale to store the result from the Invoke-WebRequest. This should be used for debugging only as it stores the access_token and refresh_tokens in memory as plain text.
-    
+
     .EXAMPLE
+        PS C:\> $ClientCredential = Get-Credential
+        PS C:\> $Params = @{
+        Name = 'MyGraphApp'
+        Description = 'My Graph Application!'
+        ClientCredential = $ClientCredential
+        RedirectUri = 'https://adataum/ouath?'
+        UserAgent = 'Windows:PowerShell:GraphApplication'
+        }
+        PS C:\> $GraphApp = New-GraphApplication @Params
+        PS C:\> $GraphAuthCode = Get-GraphOauthAuthorizationCode -Application $GraphApp 
         PS C:\> $GraphAccessToken = Get-GraphOauthAccessToken -AuthenticationCode $GraphAuthCode
     
     .OUTPUTS
@@ -87,11 +95,7 @@ function Get-GraphOauthAccessToken {
 
         [Parameter(Mandatory = $false,
                    ValueFromPipelineByPropertyName = $true)]
-        [string]$Resource = 'https://graph.microsoft.com',
-        
-        [Parameter(Mandatory = $false)]
-        [ValidateNotNullOrEmpty()]
-        [string]$ResultVariable
+        [string]$Resource = 'https://graph.microsoft.com'
     )
 
     Process {
@@ -105,7 +109,7 @@ function Get-GraphOauthAccessToken {
         $AuthCode = [System.Web.HttpUtility]::UrlEncode($AuthenticationCode.GetAuthCode())
         $Body = @(
             'grant_type=authorization_code'
-            '&redirect_uri={0}&' -f $Redirect_uri
+            '&redirect_uri={0}' -f $Redirect_uri
             '&client_id={0}' -f $Client_Id
             '&code={0}' -f $AuthCode
             '&resource={0}' -f $Resource_encoded
@@ -125,25 +129,31 @@ function Get-GraphOauthAccessToken {
         try {
             Write-Verbose "Retrieving OAuth Access Token from $BaseURL..."
             $Result = Invoke-WebRequest @Params
-            if ($ResultVariable) {
-                Write-Verbose "Setting result variable '$ResultVariable'"
-                Set-Variable -Name $ResultVariable -Scope 'Global' -Value $Result
-            }
         }
         catch {
-            $ErrorMessage = $_.Exception.Message
-            $Message = "Requesting OAuth Access Token Failed: {0} " -f $ErrorMessage
-            Write-Error -Message $Message
+            $response = $_.Exception.Response
+            $Stream = $response.GetResponseStream()
+            $Stream.Position = 0
+            $StreamReader = New-Object System.IO.StreamReader $Stream
+            $ResponseBody = $StreamReader.ReadToEnd()
+            $ErrorMessage = "Requesting OAuth Access Token from '{0}' Failed: {1}: {2}" -f $BaseURL, 
+                $_.Exception.Message, $ResponseBody
+            Write-Error -message $ErrorMessage -Exception $_.Exception
             return
         }
         try {
             $Content = $Result.Content | ConvertFrom-Json -ErrorAction Stop
         }
         Catch {
             $ErrorMessage = $_.Exception.Message
+            $Params = @{
+                MemberType = 'NoteProperty'
+                Name = 'Respone' 
+                Value = $Result
+            }
+            $_.Exception | Add-Member @Params
             $Message = "Failed to convert response from JSON: {0}" -f $ErrorMessage
-            Write-Error $Message
-            Write-Error $Result.Content
+            Write-Error -Exception $_.Exception -Message $Message
             return
         }
         $AccessTokenCredential = [pscredential]::new('access_token', $($Content.access_token | ConvertTo-SecureString -AsPlainText -Force))

PSMSGraph/Public/Import-GraphApplication.ps1

@@ -3,6 +3,7 @@
 	===========================================================================
 	 Created with: 	SAPIEN Technologies, Inc., PowerShell Studio 2017 v5.4.135
 	 Created on:   	2/8/2017 8:32 AM
+     Edited on:     3/30/2017
 	 Created by:   	Mark Kraus
 	 Organization: 	Mitel
 	 Filename:     	Import-GraphApplication.ps1
@@ -79,8 +80,18 @@ function Import-GraphApplication {
             if ($pscmdlet.ShouldProcess($ImportFile)) {
                 $Params = @{
                     "$ImportParam" = $ImportFile
+                    ErrorAction = 'Stop'
+                }
+                try {
+                    $InObject = Import-Clixml @Params
+                }
+                catch {
+                    $ErrorMessage = "Unable to import from '{0}': {1}" -f @(
+                        $ImportFile
+                        $_.Exception.Message
+                    )
+                    Write-Error $ErrorMessage
                 }
-                $InObject = Import-Clixml @Params
                 $InObject | New-GraphApplication
             } #End Should Process
         } #End Foreach

PSMSGraph/Public/Import-GraphOauthAccessToken.ps1

@@ -3,6 +3,7 @@
 	===========================================================================
 	 Created with: 	SAPIEN Technologies, Inc., PowerShell Studio 2017 v5.4.135
 	 Created on:   	2/9/2017 6:55 AM
+     Edited on:     3/30/2017
 	 Created by:   	Mark Kraus
 	 Organization: 	Mitel
 	 Filename:     	Import-GraphOauthAccessToken.ps1
@@ -77,8 +78,18 @@ function Import-GraphOauthAccessToken {
                 Write-Verbose "Processing $($ImportFile)."
                 $Params = @{
                     "$($PsCmdlet.ParameterSetName)" = $ImportFile
+                    ErrorAction = 'Stop'
+                }
+                try {
+                    $InObject = Import-Clixml @Params
+                }
+                Catch {
+                    $ErrorMessage = "Unable to import from '{0}': {1}" -f @(
+                        $ImportFile
+                        $_.Exception.Message
+                    )
+                    Write-Error $ErrorMessage
                 }
-                $InObject = Import-Clixml @Params
                 Write-Verbose "Reconstituting Application object"
                 $Application = $InObject.Application | New-GraphApplication
                 Write-Verbose 'Reconstituting Session object'

RELEASE.md

@@ -1,51 +1,54 @@
-# Version 1.0.23.40 (2017-03-05)
 ## Functions
+### Import-GraphApplication
+* Now provides its own error instead of Import-clixml
 
-### All
-* Added HelpUri and .LINK's to Comment based Help
-
-### OAuth functions
-* Standardized on "Oauth" in the function and file names (was a mix of "OAuth" and "Oath")
+### Import-GraphOauthAccessToken
+* Now provides its own error instead of Import-clixml
 
 ### Get-AADGroupMember
-* Made function singular instead of plural (was Get-AADGroupMembers)
-* Added Get-AADGroupMembers alias
-* Fixed all the problems this rename caused and exposed with the build process and documentation
+* Added ResultsPerPage Paramter to provide access to '$top' query filter.
+* Addeed .LINK to Get-AADGroupById
+* Addeed .LINK to Get-AADGroupByDisplayName
+* Added .INPUTS MSGraphAPI.DirectoryObject.Group
+* Added .OUTPUTS MSGraphAPI.DirectoryObject.User
+
+### Get-AADGroupById
+* Addeed .LINK to Get-AADGroupByDisplayName
+* Addeed .LINK to Get-AADGroupMember
+
+### Get-AADGroupByDisplayName
+* Addeed .LINK to Get-AADGroupMember
+* Addeed .LINK to Get-AADGroupById
+
+### Get-GraphOauthAccessToken
+* **Breaking Change**: Removed ```ResultVariable``` and related debugging code that should never have been in production
+* Removed ```ResultVariable``` parameter help
+* Improved error reporting
+* Fixed ```Resource``` parameter documentation
+* Imrpoved Example
+* Removed dangling ```&``` from ```$Body``` creation
 
 ## Build Tools
-
 ### psake.ps1
-* Restructured psake.ps1
-	- Init > UnitTests > Build > Test > BuildDocs > Deploy > Post Deploy
-* Added AST based Function and Alias module manifest population (now typos in file names will not cause function export issues)
-* Added NestedModule Population
-* Added Release notes and change log auto processing and documentation
-* PostDeploy is now local build friendly
+* Block ```staging``` branch recommits so clean pull requests can be made
+* Add ```!skiprecommit``` commit tag to block recommits
 
 ## Tests
+### Get-AADGroupMember.Unit.Tests.ps1
+* Created tests for Get-AADGroupMember
 
-### PSScriptAnalyzer.tests.Ps1
-* Moved out of Project.Tests.ps1
-* Re-wroded the tests so they display better in AppVeyor test logs
-* Removed .psd1 from the tests because it dose not appear to support suppression and certain test will falsely fail due to the text in RealseNotes
-
-### Project.Tests.ps1
-* Moved the PSScriptAnalyzer tests to PSScriptAnalyzer.tests.Ps1
-* Added Unit tag to "General project validation" so it test before and after build
 
-### New-GraphApplication.Unit.Tests.ps1
-* Added Unit test for New-GraphApplication
+### Import-GraphApplication.Unit.Tests.ps1
+* Created tests for Import-GraphApplication
 
-### New-GraphOauthAccessToken.Unit.Tests.ps1
-* Added Unit test for New-GraphOauthAccessToken
+### Import-GraphOauthAccessToken.Unit.Tests.ps1
+* Created tests for Import-GraphOauthAccessToken
 
-## Project
+### Get-AADGroupById.Unit.Tests.ps1
+* Created tests for Get-AADGroupById
 
-### RELEASE.md
-* Added this to server as the current release notes
-* Integrates automatically with ChangeLog.md through build pipeline
-* Gets copied to ```docs/```
+### Get-AADGroupByDisplayName.Unit.Tests.ps1
+* Created tests for Get-AADGroupByDisplayName
 
-### ChangeLog.md
-* Added to ```docs/``` 
-* Automatically managed by build process
+### Get-GraphOauthAccessToken.Unit.Tests.ps1
+* Created tests for Get-GraphOauthAccessToken