Skip to content

Commit 910437c

Browse files
peombwapeombwa
authored
Merge branch 'dev' into po/readmeUpdate
2 parents f133446 + 2d988e2 commit 910437c

File tree

17 files changed

+181
-64
lines changed

17 files changed

+181
-64
lines changed

‎config/ModulesMapping.jsonc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"Security": "^Security\\.",
2828
"Sites": "^sites.site$|^sites.itemAnalytics$|^sites.columnDefinition$|^sites.contentType$|^sites.drive$|^sites.list$|^sites.sitePage$|^users.site$|^groups.site$|^sites.Functions$|^sites.Actions$",
2929
"Teams": "^teams\\.|^chats\\.|^users.chat$|^appCatalogs$|^users.userTeamwork$|^teamwork\\.|^users.team$|^users.userTeamwork$|^groups.team$",
30-
"Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$",
30+
"Users": "^users.user$|^users.directoryObject$|^users.licenseDetails$|^users.notification$|^users.outlookUser$|^users.profilePhoto$|^users.userSettings$|^users.extension$|^users.oAuth2PermissionGrant$|^users.todo$",
3131
"Users.Actions": "^users.Actions$",
3232
"Users.Functions": "^users.Functions$"
3333

src/Authentication/Authentication/Cmdlets/ConnectGraph.cs renamed to src/Authentication/Authentication/Cmdlets/ConnectMgGraph.cs

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
1717
using System.Net;
1818
using System.Globalization;
1919

20-
[Cmdlet(VerbsCommunications.Connect, "Graph", DefaultParameterSetName = Constants.UserParameterSet)]
21-
public class ConnectGraph : PSCmdlet, IModuleAssemblyInitializer, IModuleAssemblyCleanup
20+
[Cmdlet(VerbsCommunications.Connect, "MgGraph", DefaultParameterSetName = Constants.UserParameterSet)]
21+
[Alias("Connect-Graph")]
22+
public class ConnectMgGraph : PSCmdlet, IModuleAssemblyInitializer, IModuleAssemblyCleanup
2223
{
2324
[Parameter(ParameterSetName = Constants.UserParameterSet,
2425
Position = 1,
@@ -29,11 +30,13 @@ public class ConnectGraph : PSCmdlet, IModuleAssemblyInitializer, IModuleAssembl
2930
Position = 1,
3031
Mandatory = true,
3132
HelpMessage = "The client id of your application.")]
33+
[Alias("AppId")]
3234
public string ClientId { get; set; }
3335

3436
[Parameter(ParameterSetName = Constants.AppParameterSet,
3537
Position = 2,
3638
HelpMessage = "The name of your certificate. The Certificate will be retrieved from the current user's certificate store.")]
39+
[Alias("CertificateSubject")]
3740
public string CertificateName { get; set; }
3841

3942
[Parameter(ParameterSetName = Constants.AppParameterSet,
@@ -85,7 +88,8 @@ protected override void ProcessRecord()
8588
TimeSpan authTimeout = new TimeSpan(0, 0, Constants.MaxDeviceCodeTimeOut);
8689
cancellationTokenSource = new CancellationTokenSource(authTimeout);
8790
authContext.AuthType = AuthenticationType.Delegated;
88-
authContext.Scopes = Scopes ?? new string[] { "User.Read" };
91+
string[] processedScopes = ProcessScopes(Scopes);
92+
authContext.Scopes = processedScopes.Length == 0 ? new string[] { "User.Read" } : processedScopes;
8993
// Default to CurrentUser but allow the customer to change this via `ContextScope` param.
9094
authContext.ContextScope = this.IsParameterBound(nameof(ContextScope)) ? ContextScope : ContextScope.CurrentUser;
9195
}
@@ -190,6 +194,31 @@ protected override void StopProcessing()
190194
base.StopProcessing();
191195
}
192196

197+
/// <summary>
198+
/// Processes user provided scopes by removing whitespace and splitting comma separated scopes.
199+
/// </summary>
200+
/// <param name="scopes">An array of scopes.</param>
201+
/// <returns>A formated array of scopes.</returns>
202+
private string[] ProcessScopes(string[] scopes)
203+
{
204+
if (scopes == null)
205+
{
206+
return new string[0];
207+
}
208+
209+
List<string> formatedScopes = new List<string>();
210+
foreach (string scope in scopes)
211+
{
212+
string[] cleanScopes = scope.Split(',')
213+
.Select(s => s.Trim())
214+
.Where(s => !string.IsNullOrWhiteSpace(s))
215+
.ToArray();
216+
217+
formatedScopes.AddRange(cleanScopes);
218+
}
219+
return formatedScopes.ToArray();
220+
}
221+
193222
private void ValidateParameters()
194223
{
195224
switch (ParameterSetName)

src/Authentication/Authentication/Cmdlets/DisconnectGraph.cs renamed to src/Authentication/Authentication/Cmdlets/DisconnectMgGraph.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
66
using Microsoft.Graph.PowerShell.Authentication.Helpers;
77
using System;
88
using System.Management.Automation;
9-
[Cmdlet(VerbsCommunications.Disconnect, "Graph")]
10-
public class DisconnectGraph : PSCmdlet
9+
[Cmdlet(VerbsCommunications.Disconnect, "MgGraph")]
10+
[Alias("Disconnect-Graph")]
11+
public class DisconnectMgGraph : PSCmdlet
1112
{
1213
protected override void BeginProcessing()
1314
{

src/Authentication/Authentication/Cmdlets/InvokeGraphRequest.cs renamed to src/Authentication/Authentication/Cmdlets/InvokeMgGraphRequest.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222

2323
namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
2424
{
25-
[Cmdlet(VerbsLifecycle.Invoke, "GraphRequest", DefaultParameterSetName = Constants.UserParameterSet)]
26-
public class InvokeGraphRequest : PSCmdlet
25+
[Cmdlet(VerbsLifecycle.Invoke, "MgGraphRequest", DefaultParameterSetName = Constants.UserParameterSet)]
26+
[Alias("Invoke-GraphRequest")]
27+
public class InvokeMgGraphRequest : PSCmdlet
2728
{
2829
private readonly CancellationTokenSource _cancellationTokenSource;
2930
private readonly InvokeGraphRequestUserAgent _graphRequestUserAgent;
3031
private string _originalFilePath;
3132

32-
public InvokeGraphRequest()
33+
public InvokeMgGraphRequest()
3334
{
3435
_cancellationTokenSource = new CancellationTokenSource();
3536
_graphRequestUserAgent = new InvokeGraphRequestUserAgent(this);

‎src/Authentication/Authentication/Helpers/HttpHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Microsoft.Graph.PowerShell.Authentication.Helpers
1717
public static class HttpHelpers
1818
{
1919
/// The version for current assembly.
20-
private static AssemblyName AssemblyInfo = typeof(ConnectGraph).GetTypeInfo().Assembly.GetName();
20+
private static AssemblyName AssemblyInfo = typeof(ConnectMgGraph).GetTypeInfo().Assembly.GetName();
2121

2222
/// The value for the Auth module version header.
2323
private static string AuthModuleVersionHeaderValue =

‎src/Authentication/Authentication/Helpers/PathUtils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Microsoft.Graph.PowerShell.Authentication.Helpers
1313
/// </summary>
1414
internal static class PathUtils
1515
{
16-
public static string ResolveFilePath(string filePath, InvokeGraphRequest command, bool isLiteralPath)
16+
public static string ResolveFilePath(string filePath, InvokeMgGraphRequest command, bool isLiteralPath)
1717
{
1818
string path = null;
1919
try

‎src/Authentication/Authentication/Helpers/StreamHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ internal static string StreamToString(this Stream stream, Encoding encoding)
7979
}
8080

8181
internal static void SaveStreamToFile(this Stream baseResponseStream, string filePath,
82-
InvokeGraphRequest invokeGraphRequest, CancellationToken token)
82+
InvokeMgGraphRequest invokeGraphRequest, CancellationToken token)
8383
{
8484
// If the web cmdlet should resume, append the file instead of overwriting.
8585
const FileMode fileMode = FileMode.Create;

‎src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ FormatsToProcess = './Microsoft.Graph.Authentication.format.ps1xml'
7272
FunctionsToExport = @()
7373

7474
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75-
CmdletsToExport = 'Connect-Graph', 'Disconnect-Graph', 'Get-MgContext', 'Get-MgProfile',
76-
'Select-MgProfile', 'Invoke-GraphRequest'
75+
CmdletsToExport = 'Connect-MgGraph', 'Disconnect-MgGraph', 'Get-MgContext', 'Get-MgProfile',
76+
'Select-MgProfile', 'Invoke-MgGraphRequest'
7777

7878
# Variables to export from this module
7979
# VariablesToExport = @()
8080

8181
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
82-
AliasesToExport = @()
82+
AliasesToExport = @('Connect-Graph', 'Disconnect-Graph', 'Invoke-GraphRequest')
8383

8484
# DSC resources to export from this module
8585
# DscResourcesToExport = @()

‎src/Devices.CorporateManagement/Devices.CorporateManagement/Microsoft.Graph.Devices.CorporateManagement.psd1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 8/25/2020
6+
# Generated on: 9/17/2020
77
#
88

99
@{
@@ -18,7 +18,7 @@ ModuleVersion = '0.9.2'
1818
CompatiblePSEditions = 'Core', 'Desktop'
1919

2020
# ID used to uniquely identify this module
21-
GUID = 'c98c22c6-c6b6-45eb-933c-1bf07aaf050c'
21+
GUID = 'ac483866-d9f0-46c2-adf6-00c5b17eaca8'
2222

2323
# Author of this module
2424
Author = 'Microsoft Corporation'
@@ -163,7 +163,7 @@ FunctionsToExport =
163163
'Get-MgUserManagedDeviceConfigurationState',
164164
'Get-MgUserManagedDeviceDetectedApp',
165165
'Get-MgUserManagedDeviceDetectedAppByRef',
166-
'Get-MgUserManagedDeviceLogCollectionRequest',
166+
'Get-MgUserManagedDeviceLogCollectionResponse',
167167
'Get-MgUserManagedDeviceMobileAppConfigurationState',
168168
'Get-MgUserManagedDeviceSecurityBaselineState',
169169
'Get-MgUserManagedDeviceSecurityBaselineStateSettingState',
@@ -246,7 +246,7 @@ FunctionsToExport =
246246
'New-MgUserManagedDeviceCompliancePolicyState',
247247
'New-MgUserManagedDeviceConfigurationState',
248248
'New-MgUserManagedDeviceDetectedAppByRef',
249-
'New-MgUserManagedDeviceLogCollectionRequest',
249+
'New-MgUserManagedDeviceLogCollectionResponse',
250250
'New-MgUserManagedDeviceMobileAppConfigurationState',
251251
'New-MgUserManagedDeviceSecurityBaselineState',
252252
'New-MgUserManagedDeviceSecurityBaselineStateSettingState',
@@ -328,7 +328,7 @@ FunctionsToExport =
328328
'Remove-MgUserManagedDevice', 'Remove-MgUserManagedDeviceCategory',
329329
'Remove-MgUserManagedDeviceCompliancePolicyState',
330330
'Remove-MgUserManagedDeviceConfigurationState',
331-
'Remove-MgUserManagedDeviceLogCollectionRequest',
331+
'Remove-MgUserManagedDeviceLogCollectionResponse',
332332
'Remove-MgUserManagedDeviceMobileAppConfigurationState',
333333
'Remove-MgUserManagedDeviceSecurityBaselineState',
334334
'Remove-MgUserManagedDeviceSecurityBaselineStateSettingState',
@@ -432,7 +432,7 @@ FunctionsToExport =
432432
'Update-MgUserManagedDevice', 'Update-MgUserManagedDeviceCategory',
433433
'Update-MgUserManagedDeviceCompliancePolicyState',
434434
'Update-MgUserManagedDeviceConfigurationState',
435-
'Update-MgUserManagedDeviceLogCollectionRequest',
435+
'Update-MgUserManagedDeviceLogCollectionResponse',
436436
'Update-MgUserManagedDeviceMobileAppConfigurationState',
437437
'Update-MgUserManagedDeviceSecurityBaselineState',
438438
'Update-MgUserManagedDeviceSecurityBaselineStateSettingState',

‎src/Devices.CorporateManagement/Devices.CorporateManagement/readme.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ directive:
5252
variant: ^Update$|^UpdateExpanded$|^UpdateViaIdentity$|^UpdateViaIdentityExpanded$
5353
set:
5454
subject: $1Multiple$2
55+
# https://docs.microsoft.com/en-us/graph/api/resources/intune-devices-devicelogcollectionresponse?view=graph-rest-beta
56+
- where:
57+
subject: ^(UserManagedDeviceLogCollection)(Request)$
58+
set:
59+
subject: $1Response
5560
- where:
5661
verb: Update
5762
subject: ^(DeviceAppManagement)(PolicySet)$

0 commit comments

Comments
 (0)