Skip to content

Commit

Permalink
Added logging
Browse files Browse the repository at this point in the history
  • Loading branch information
nicodecleyre committed Jul 18, 2023
1 parent f7ba773 commit ff6ad48
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/m365/spo/commands/file/file-move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class SpoFileMoveCommand extends SpoCommand {
const targetFileServerRelativeUrl: string = `${urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;

try {
await spo.removeFile(contextResponse.WebFullUrl, targetFileServerRelativeUrl, true);
await spo.removeFile(contextResponse.WebFullUrl, targetFileServerRelativeUrl, true, logger, this.verbose);
}
catch (err: any) {
if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/spo.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ describe('utils/spo', () => {
});


await spo.removeFile('https://contoso.sharepoint.com', 'SharedDocuments/Document.docx', true);
await spo.removeFile('https://contoso.sharepoint.com', 'SharedDocuments/Document.docx', true, logger, true);
assert(postStub.called);
});
});
14 changes: 13 additions & 1 deletion src/utils/spo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,19 @@ export const spo = {
return roledefinition;
},

async removeFile(webUrl: string, url: string, recycle?: boolean): Promise<void> {
/**
* removes a file by url
* @param webUrl The web url
* @param url The url of the file
* @param url If file should be recycled or not
* @param logger The logger object
* @param verbose Set for verbose logging
*/
async removeFile(webUrl: string, url: string, recycle?: boolean, logger?: Logger, verbose?: boolean): Promise<void> {
if (verbose && logger) {
logger.logToStderr(`Removing file with url ${url}`);
}

const serverRelativePath = urlUtil.getServerRelativePath(webUrl, url);
let requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;

Expand Down

0 comments on commit ff6ad48

Please sign in to comment.