Skip to content

Commit e762d52

Browse files
nicodecleyreplamber
nicodecleyre
authored and
plamber
committed
Adds 'CliRequestOptions' interface. Closes pnp#4277 
1 parent 329fd79 commit e762d52

File tree

109 files changed

+292
-396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+292
-396
lines changed

‎src/m365/aad/commands/o365group/o365group-recyclebinitem-remove.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Group } from '@microsoft/microsoft-graph-types';
2-
import { AxiosRequestConfig } from 'axios';
32
import { Cli } from '../../../../cli/Cli';
43
import { Logger } from '../../../../cli/Logger';
54
import GlobalOptions from '../../../../GlobalOptions';
6-
import request from '../../../../request';
5+
import request, { CliRequestOptions } from '../../../../request';
76
import { formatting } from '../../../../utils/formatting';
87
import { validation } from '../../../../utils/validation';
98
import GraphCommand from '../../../base/GraphCommand';
@@ -87,7 +86,7 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand {
8786
try {
8887
const groupId = await this.getGroupId(args.options);
8988

90-
const requestOptions: AxiosRequestConfig = {
89+
const requestOptions: CliRequestOptions = {
9190
url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
9291
headers: {
9392
accept: 'application/json;odata.metadata=none'
@@ -135,7 +134,7 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand {
135134
filterValue = `mailNickname eq '${formatting.encodeQueryParameter(mailNickname)}'`;
136135
}
137136

138-
const requestOptions: AxiosRequestConfig = {
137+
const requestOptions: CliRequestOptions = {
139138
url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
140139
headers: {
141140
accept: 'application/json;odata.metadata=none'

‎src/m365/aad/commands/o365group/o365group-recyclebinitem-restore.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Group } from '@microsoft/microsoft-graph-types';
2-
import { AxiosRequestConfig } from 'axios';
32
import { Logger } from '../../../../cli/Logger';
43
import GlobalOptions from '../../../../GlobalOptions';
5-
import request from '../../../../request';
4+
import request, { CliRequestOptions } from '../../../../request';
65
import { formatting } from '../../../../utils/formatting';
76
import { validation } from '../../../../utils/validation';
87
import GraphCommand from '../../../base/GraphCommand';
@@ -83,7 +82,7 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand {
8382

8483
try {
8584
const groupId = await this.getGroupId(args.options);
86-
const requestOptions: AxiosRequestConfig = {
85+
const requestOptions: CliRequestOptions = {
8786
url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
8887
headers: {
8988
accept: 'application/json;odata.metadata=none',
@@ -115,7 +114,7 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand {
115114
filterValue = `mailNickname eq '${formatting.encodeQueryParameter(mailNickname)}'`;
116115
}
117116

118-
const requestOptions: AxiosRequestConfig = {
117+
const requestOptions: CliRequestOptions = {
119118
url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
120119
headers: {
121120
accept: 'application/json;odata.metadata=none'

‎src/m365/aad/commands/user/user-guest-add.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { AxiosRequestConfig } from 'axios';
21
import { Logger } from '../../../../cli/Logger';
32
import GlobalOptions from '../../../../GlobalOptions';
4-
import request from '../../../../request';
3+
import request, { CliRequestOptions } from '../../../../request';
54
import GraphCommand from '../../../base/GraphCommand';
65
import commands from '../../commands';
76

@@ -80,7 +79,7 @@ class AadUserGuestAddCommand extends GraphCommand {
8079

8180
public async commandAction(logger: Logger, args: CommandArgs): Promise<void> {
8281
try {
83-
const requestOptions: AxiosRequestConfig = {
82+
const requestOptions: CliRequestOptions = {
8483
url: `${this.resource}/v1.0/invitations`,
8584
headers: {
8685
accept: 'application/json;odata.metadata=none'

‎src/m365/aad/commands/user/user-set.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { AxiosRequestConfig } from 'axios';
21
import auth from '../../../../Auth';
32
import { Logger } from '../../../../cli/Logger';
43
import GlobalOptions from '../../../../GlobalOptions';
5-
import request from '../../../../request';
4+
import request, { CliRequestOptions } from '../../../../request';
65
import { accessToken } from '../../../../utils/accessToken';
76
import { formatting } from '../../../../utils/formatting';
87
import { validation } from '../../../../utils/validation';
@@ -142,7 +141,7 @@ class AadUserSetCommand extends GraphCommand {
142141
if (this.verbose) {
143142
logger.logToStderr(`Setting the updated properties for the user ${args.options.userPrincipalName || args.options.objectId}`);
144143
}
145-
const requestOptions: AxiosRequestConfig = {
144+
const requestOptions: CliRequestOptions = {
146145
url: requestUrl,
147146
headers: {
148147
accept: 'application/json'
@@ -210,7 +209,7 @@ class AadUserSetCommand extends GraphCommand {
210209
currentPassword: options.currentPassword,
211210
newPassword: options.newPassword
212211
};
213-
const requestOptions: AxiosRequestConfig = {
212+
const requestOptions: CliRequestOptions = {
214213
url: `${requestUrl}/changePassword`,
215214
headers: {
216215
accept: 'application/json;odata.metadata=none'

‎src/m365/app/commands/permission/permission-list.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Application, AppRole, AppRoleAssignment, OAuth2PermissionGrant, PermissionScope, RequiredResourceAccess, ResourceAccess, ServicePrincipal } from '@microsoft/microsoft-graph-types';
2-
import { AxiosRequestConfig } from 'axios';
32
import { Cli } from '../../../../cli/Cli';
43
import { Logger } from '../../../../cli/Logger';
54
import Command from '../../../../Command';
6-
import request from '../../../../request';
5+
import request, { CliRequestOptions } from '../../../../request';
76
import * as appGetCommand from '../../../aad/commands/app/app-get';
87
import { Options as AppGetCommandOptions } from '../../../aad/commands/app/app-get';
98
import AppCommand from '../../../base/AppCommand';
@@ -62,7 +61,7 @@ class AppPermissionListCommand extends AppCommand {
6261

6362
const lookupUrl: string = servicePrincipalInfo.appId ? `?$filter=appId eq '${servicePrincipalInfo.appId}'&` : `/${servicePrincipalInfo.id}?`;
6463

65-
const requestOptions: AxiosRequestConfig = {
64+
const requestOptions: CliRequestOptions = {
6665
url: `${this.resource}/v1.0/servicePrincipals${lookupUrl}$select=appId,id,displayName`,
6766
headers: {
6867
accept: 'application/json;odata.metadata=none'
@@ -89,14 +88,14 @@ class AppPermissionListCommand extends AppCommand {
8988

9089
switch (mode) {
9190
case GetServicePrincipal.withPermissions:
92-
const appRoleAssignmentsRequestOptions: AxiosRequestConfig = {
91+
const appRoleAssignmentsRequestOptions: CliRequestOptions = {
9392
url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoleAssignments`,
9493
headers: {
9594
accept: 'application/json;odata.metadata=none'
9695
},
9796
responseType: 'json'
9897
};
99-
const oauth2PermissionGrantsRequestOptions: AxiosRequestConfig = {
98+
const oauth2PermissionGrantsRequestOptions: CliRequestOptions = {
10099
url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionGrants`,
101100
headers: {
102101
accept: 'application/json;odata.metadata=none'
@@ -109,14 +108,14 @@ class AppPermissionListCommand extends AppCommand {
109108
]);
110109
break;
111110
case GetServicePrincipal.withPermissionDefinitions:
112-
const oauth2PermissionScopesRequestOptions: AxiosRequestConfig = {
111+
const oauth2PermissionScopesRequestOptions: CliRequestOptions = {
113112
url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionScopes`,
114113
headers: {
115114
accept: 'application/json;odata.metadata=none'
116115
},
117116
responseType: 'json'
118117
};
119-
const appRolesRequestOptions: AxiosRequestConfig = {
118+
const appRolesRequestOptions: CliRequestOptions = {
120119
url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoles`,
121120
headers: {
122121
accept: 'application/json;odata.metadata=none'

‎src/m365/file/commands/file-list.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { Drive, DriveItem, Site } from '@microsoft/microsoft-graph-types';
2-
import { AxiosRequestConfig } from 'axios';
32
import { Logger } from '../../../cli/Logger';
43
import GlobalOptions from '../../../GlobalOptions';
5-
import request from '../../../request';
4+
import request, { CliRequestOptions } from '../../../request';
65
import { formatting } from '../../../utils/formatting';
76
import { odata } from '../../../utils/odata';
87
import { validation } from '../../../utils/validation';
@@ -103,7 +102,7 @@ class FileListCommand extends GraphCommand {
103102
}
104103

105104
const url: URL = new URL(webUrl);
106-
const requestOptions: AxiosRequestConfig = {
105+
const requestOptions: CliRequestOptions = {
107106
url: `${this.resource}/v1.0/sites/${formatting.encodeQueryParameter(url.host)}:${url.pathname}?$select=id`,
108107
headers: {
109108
accept: 'application/json;odata.metadata=none'
@@ -126,7 +125,7 @@ class FileListCommand extends GraphCommand {
126125
logger.logToStderr(`Getting document library...`);
127126
}
128127

129-
const requestOptions: AxiosRequestConfig = {
128+
const requestOptions: CliRequestOptions = {
130129
url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
131130
headers: {
132131
accept: 'application/json;odata.metadata=none'
@@ -165,7 +164,7 @@ class FileListCommand extends GraphCommand {
165164
}
166165

167166
const documentLibraryRelativeFolderUrl: string = folderUrl.href.replace(new RegExp(documentLibrary.webUrl as string, 'i'), '');
168-
const requestOptions: AxiosRequestConfig = {
167+
const requestOptions: CliRequestOptions = {
169168
url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
170169
headers: {
171170
accept: 'application/json;odata.metadata=none'
@@ -188,7 +187,7 @@ class FileListCommand extends GraphCommand {
188187
return Promise.resolve();
189188
}
190189

191-
const requestOptions: AxiosRequestConfig = {
190+
const requestOptions: CliRequestOptions = {
192191
url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
193192
headers: {
194193
accept: 'application/json;odata.metadata=none'

‎src/m365/outlook/commands/mail/mail-send.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
3-
import { AxiosRequestConfig } from 'axios';
43
import auth, { Auth } from '../../../../Auth';
54
import { Logger } from '../../../../cli/Logger';
65
import GlobalOptions from '../../../../GlobalOptions';
7-
import request from '../../../../request';
6+
import request, { CliRequestOptions } from '../../../../request';
87
import GraphCommand from '../../../base/GraphCommand';
98
import commands from '../../commands';
109
import { formatting } from '../../../../utils/formatting';
@@ -150,7 +149,7 @@ class OutlookMailSendCommand extends GraphCommand {
150149
throw `Specify a upn or user id in the 'sender' option when using app only authentication.`;
151150
}
152151

153-
const requestOptions: AxiosRequestConfig = {
152+
const requestOptions: CliRequestOptions = {
154153
url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + formatting.encodeQueryParameter(args.options.sender) : 'me'}/sendMail`,
155154
headers: {
156155
accept: 'application/json;odata.metadata=none',

‎src/m365/outlook/commands/message/message-get.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import auth, { Auth } from '../../../../Auth';
2-
import { AxiosRequestConfig } from 'axios';
32
import { Logger } from '../../../../cli/Logger';
43
import GlobalOptions from '../../../../GlobalOptions';
5-
import request from '../../../../request';
4+
import request, { CliRequestOptions } from '../../../../request';
65
import GraphCommand from '../../../base/GraphCommand';
76
import commands from '../../commands';
87

@@ -88,7 +87,7 @@ class OutlookMessageGetCommand extends GraphCommand {
8887

8988
requestUrl += `/messages/${args.options.id}`;
9089

91-
const requestOptions: AxiosRequestConfig = {
90+
const requestOptions: CliRequestOptions = {
9291
url: `${this.resource}/v1.0/${requestUrl}`,
9392
headers: {
9493
accept: 'application/json;odata.metadata=none'

‎src/m365/planner/commands/bucket/bucket-add.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import auth from '../../../../Auth';
22
import { Logger } from '../../../../cli/Logger';
33
import GlobalOptions from '../../../../GlobalOptions';
4-
import request from '../../../../request';
5-
import { AxiosRequestConfig } from 'axios';
4+
import request, { CliRequestOptions } from '../../../../request';
65
import { accessToken } from '../../../../utils/accessToken';
76
import { validation } from '../../../../utils/validation';
87
import { aadGroup } from '../../../../utils/aadGroup';
@@ -113,7 +112,7 @@ class PlannerBucketAddCommand extends GraphCommand {
113112
try {
114113
const planId = await this.getPlanId(args);
115114

116-
const requestOptions: AxiosRequestConfig = {
115+
const requestOptions: CliRequestOptions = {
117116
url: `${this.resource}/v1.0/planner/buckets`,
118117
headers: {
119118
'accept': 'application/json;odata.metadata=none'

‎src/m365/planner/commands/bucket/bucket-get.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { PlannerBucket } from '@microsoft/microsoft-graph-types';
2-
import { AxiosRequestConfig } from 'axios';
32
import auth from '../../../../Auth';
43
import { Logger } from '../../../../cli/Logger';
54
import GlobalOptions from '../../../../GlobalOptions';
6-
import request from '../../../../request';
5+
import request, { CliRequestOptions } from '../../../../request';
76
import { accessToken } from '../../../../utils/accessToken';
87
import { validation } from '../../../../utils/validation';
98
import { aadGroup } from '../../../../utils/aadGroup';
@@ -192,7 +191,7 @@ class PlannerBucketGetCommand extends GraphCommand {
192191
}
193192

194193
private async getBucketById(id: string): Promise<PlannerBucket> {
195-
const requestOptions: AxiosRequestConfig = {
194+
const requestOptions: CliRequestOptions = {
196195
url: `${this.resource}/v1.0/planner/buckets/${id}`,
197196
headers: {
198197
accept: 'application/json;odata.metadata=none'

0 commit comments

Comments
 (0)