@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.efe1dcb

package/dist/m365/tenant/commands/status/status-list.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 class TenantStatusListCommand extends Command_1.default {
     get name() {
@@ -26,7 +26,7 @@ class TenantStatusListCommand extends Command_1.default {
         }
         const serviceUrl = 'https://manage.office.com/api/v1.0';
         const statusEndpoint = typeof args.options.workload !== 'undefined' ? `ServiceComms/CurrentStatus?$filter=Workload eq '${encodeURIComponent(args.options.workload)}'` : 'ServiceComms/CurrentStatus';
-        const tenantId = Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+        const tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
         const requestOptions = {
             url: `${serviceUrl}/${tenantId}/${statusEndpoint}`,
             headers: {

package/dist/m365/todo/commands/list/list-list.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class TodoListListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class TodoListListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.LIST_LIST;
     }
@@ -13,10 +14,10 @@ class TodoListListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
         return ['displayName', 'id'];
     }
     commandAction(logger, args, cb) {
-        this
-            .getAllItems(`${this.resource}/v1.0/me/todo/lists`, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/me/todo/lists`, logger)
+            .then((items) => {
+            logger.log(items);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

package/dist/m365/todo/commands/task/task-list.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class TodoTaskListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class TodoTaskListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_LIST;
     }
@@ -44,14 +45,14 @@ class TodoTaskListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
             .getTodoListId(args)
             .then((listId) => {
             const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
-            return this.getAllItems(endpoint, logger, true);
+            return utils_1.odata.getAllItems(endpoint, logger);
         })
-            .then(() => {
+            .then((items) => {
             if (args.options.output === 'json') {
-                logger.log(this.items);
+                logger.log(items);
             }
             else {
-                logger.log(this.items.map(m => {
+                logger.log(items.map(m => {
                     return {
                         id: m.id,
                         title: m.title,

package/dist/request.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const stream_1 = require("stream");
 const Auth_1 = require("./Auth");
-const Utils_1 = require("./Utils");
+const utils_1 = require("./utils");
 const packageJSON = require('../package.json');
 class Request {
     constructor() {
@@ -60,7 +60,7 @@ class Request {
                     if (config.responseType !== 'stream') {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Utils_1.default.filterObject(config, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(utils_1.formatting.filterObject(config, properties), null, 2));
                 }
                 return config;
             });
@@ -75,14 +75,14 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, Utils_1.default.filterObject(response, properties)), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, utils_1.formatting.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, Utils_1.default.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, utils_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });

package/dist/utils/accessToken.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.accessToken = void 0;
+exports.accessToken = {
+    getTenantIdFromAccessToken(accessToken) {
+        let tenantId = '';
+        if (!accessToken || accessToken.length === 0) {
+            return tenantId;
+        }
+        const chunks = accessToken.split('.');
+        if (chunks.length !== 3) {
+            return tenantId;
+        }
+        const tokenString = Buffer.from(chunks[1], 'base64').toString();
+        try {
+            const token = JSON.parse(tokenString);
+            tenantId = token.tid;
+        }
+        catch (_a) {
+        }
+        return tenantId;
+    },
+    getUserNameFromAccessToken(accessToken) {
+        let userName = '';
+        if (!accessToken || accessToken.length === 0) {
+            return userName;
+        }
+        const chunks = accessToken.split('.');
+        if (chunks.length !== 3) {
+            return userName;
+        }
+        const tokenString = Buffer.from(chunks[1], 'base64').toString();
+        try {
+            const token = JSON.parse(tokenString);
+            // if authenticated using certificate, there is no upn so use
+            // app display name instead
+            userName = token.upn || token.app_displayname;
+        }
+        catch (_a) {
+        }
+        return userName;
+    }
+};
+//# sourceMappingURL=accessToken.js.map

package/dist/utils/formatting.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatting = void 0;
+const stripJsonComments = require("strip-json-comments");
+exports.formatting = {
+    escapeXml(s) {
+        if (!s) {
+            return s;
+        }
+        return s.toString().replace(/[<>&"]/g, (c) => {
+            let char = c;
+            switch (c) {
+                case '<':
+                    char = '&lt;';
+                    break;
+                case '>':
+                    char = '&gt;';
+                    break;
+                case '&':
+                    char = '&amp;';
+                    break;
+                case '"':
+                    char = '&quot;';
+                    break;
+            }
+            return char;
+        });
+    },
+    parseJsonWithBom(s) {
+        return JSON.parse(s.replace(/^\uFEFF/, ''));
+    },
+    filterObject(obj, propertiesToInclude) {
+        return Object.keys(obj)
+            .filter(key => propertiesToInclude.includes(key))
+            .reduce((filtered, key) => {
+            filtered[key] = obj[key];
+            return filtered;
+        }, {});
+    },
+    parseCsvToJson(s) {
+        const rows = s.split('\n');
+        const jsonObj = [];
+        const headers = rows[0].split(',');
+        for (let i = 1; i < rows.length; i++) {
+            const data = rows[i].split(',');
+            const obj = {};
+            for (let j = 0; j < data.length; j++) {
+                const value = data[j].trim();
+                const numValue = parseInt(value);
+                obj[headers[j].trim()] = isNaN(numValue) || numValue.toString() !== value ? value : numValue;
+            }
+            jsonObj.push(obj);
+        }
+        return jsonObj;
+    },
+    encodeQueryParameter(value) {
+        if (!value) {
+            return value;
+        }
+        return encodeURIComponent(value).replace(/'/g, "''");
+    },
+    removeSingleLineComments(s) {
+        return stripJsonComments(s);
+    }
+};
+//# sourceMappingURL=formatting.js.map

package/dist/utils/fsUtil.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fsUtil = void 0;
+const fs = require("fs");
+const path = require("path");
+exports.fsUtil = {
+    readdirR(dir) {
+        return fs.statSync(dir).isDirectory()
+            ? Array.prototype.concat(...fs.readdirSync(dir).map(f => exports.fsUtil.readdirR(path.join(dir, f))))
+            : dir;
+    },
+    // from: https://stackoverflow.com/a/22185855
+    copyRecursiveSync(src, dest, replaceTokens) {
+        const exists = fs.existsSync(src);
+        const stats = exists && fs.statSync(src);
+        const isDirectory = exists && stats.isDirectory();
+        if (replaceTokens) {
+            dest = replaceTokens(dest);
+        }
+        if (isDirectory) {
+            if (!fs.existsSync(dest)) {
+                fs.mkdirSync(dest);
+            }
+            fs.readdirSync(src).forEach(function (childItemName) {
+                exports.fsUtil.copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName), replaceTokens);
+            });
+        }
+        else {
+            fs.copyFileSync(src, dest);
+        }
+    },
+    getSafeFileName(input) {
+        return input.replace(/'/g, "''");
+    }
+};
+//# sourceMappingURL=fsUtil.js.map

package/dist/utils/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./accessToken"), exports);
+__exportStar(require("./formatting"), exports);
+__exportStar(require("./fsUtil"), exports);
+__exportStar(require("./odata"), exports);
+__exportStar(require("./sinonUtil"), exports);
+__exportStar(require("./spfx"), exports);
+__exportStar(require("./spo"), exports);
+__exportStar(require("./urlUtil"), exports);
+__exportStar(require("./validation"), exports);
+//# sourceMappingURL=index.js.map

package/dist/utils/odata.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.odata = void 0;
+const request_1 = require("../request");
+exports.odata = {
+    getAllItems(url, logger, metadata) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            let items = [];
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: `application/json;odata.metadata=${metadata !== null && metadata !== void 0 ? metadata : 'none'}`
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            items = res.value;
+            const nextLink = (_a = res['@odata.nextLink']) !== null && _a !== void 0 ? _a : res.nextLink;
+            if (nextLink) {
+                const nextPageItems = yield exports.odata.getAllItems(nextLink, logger, metadata);
+                items = items.concat(nextPageItems);
+            }
+            return items;
+        });
+    }
+};
+//# sourceMappingURL=odata.js.map

package/dist/utils/sinonUtil.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sinonUtil = void 0;
+exports.sinonUtil = {
+    restore(method) {
+        if (!method) {
+            return;
+        }
+        if (!Array.isArray(method)) {
+            method = [method];
+        }
+        method.forEach((m) => {
+            if (m && m.restore) {
+                m.restore();
+            }
+        });
+    }
+};
+//# sourceMappingURL=sinonUtil.js.map

package/dist/{m365/spfx/commands/project/project-upgrade/Utils.js → utils/spfx.js}

@@ -1,32 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = void 0;
-const fs = require("fs");
-const path = require("path");
-const stripJsonComments = require("strip-json-comments");
-class Utils {
-    static removeSingleLineComments(s) {
-        return stripJsonComments(s);
-    }
-    static getAllFiles(dir) {
-        return fs.statSync(dir).isDirectory()
-            ? Array.prototype.concat(...fs.readdirSync(dir).map(f => Utils.getAllFiles(path.join(dir, f))))
-            : dir;
-    }
-    static isReactProject(project) {
+exports.spfx = void 0;
+exports.spfx = {
+    isReactProject(project) {
         return (typeof project.yoRcJson !== 'undefined' &&
             typeof project.yoRcJson['@microsoft/generator-sharepoint'] !== 'undefined' &&
             project.yoRcJson["@microsoft/generator-sharepoint"].framework === 'react') ||
             (typeof project.packageJson !== 'undefined' &&
                 typeof project.packageJson.dependencies['react'] !== 'undefined');
-    }
-    static isKnockoutProject(project) {
+    },
+    isKnockoutProject(project) {
         return (typeof project.yoRcJson !== 'undefined' &&
             typeof project.yoRcJson['@microsoft/generator-sharepoint'] !== 'undefined' &&
             project.yoRcJson["@microsoft/generator-sharepoint"].framework === 'knockout') ||
             (typeof project.packageJson !== 'undefined' &&
                 typeof project.packageJson.dependencies['knockout'] !== 'undefined');
     }
-}
-exports.Utils = Utils;
-//# sourceMappingURL=Utils.js.map
+};
+//# sourceMappingURL=spfx.js.map