@pnp/cli-microsoft365 6.4.0-beta.27e599e → 6.4.0-beta.33050ca

package/dist/Command.js

@@ -370,7 +370,7 @@ class Command {
             if (!value || typeof value !== 'string') {
                 return;
             }
-            const lowerCaseValue = value.toLowerCase();
+            const lowerCaseValue = value.toLowerCase().trim();
             if (lowerCaseValue === '@meid') {
                 args.options[option] = accessToken_1.accessToken.getUserIdFromAccessToken(token);
             }

package/dist/m365/spo/commands/homesite/homesite-set.js

@@ -13,11 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoHomeSiteSetCommand_instances, _SpoHomeSiteSetCommand_initOptions, _SpoHomeSiteSetCommand_initValidators;
+var _SpoHomeSiteSetCommand_instances, _SpoHomeSiteSetCommand_initTelemetry, _SpoHomeSiteSetCommand_initOptions, _SpoHomeSiteSetCommand_initValidators, _SpoHomeSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -32,43 +30,63 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoHomeSiteSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initTypes).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                if (this.verbose) {
+                    logger.logToStderr(`Setting the SharePoint home site to: ${args.options.siteUrl}...`);
+                    logger.logToStderr('Attempting to retrieve the SharePoint admin URL.');
+                }
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoAdminUrl}/_api/SPO.Tenant`,
                     headers: {
-                        'X-RequestDigest': reqDigest.FormDigestValue
+                        accept: 'application/json;odata=nometadata',
+                        'content-Type': 'application/json'
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    responseType: 'json',
+                    data: {
+                        sphSiteUrl: args.options.siteUrl
+                    }
                 };
-                const res = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
+                if (args.options.vivaConnectionsDefaultStart !== undefined) {
+                    requestOptions.url += '/SetSPHSiteWithConfiguration';
+                    requestOptions.data.configuration = { vivaConnectionsDefaultStart: args.options.vivaConnectionsDefaultStart };
                 }
                 else {
-                    logger.log(json[json.length - 1]);
+                    requestOptions.url += '/SetSPHSite';
                 }
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res.value);
             }
             catch (err) {
-                this.handleRejectedPromise(err);
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }
 }
-_SpoHomeSiteSetCommand_instances = new WeakSet(), _SpoHomeSiteSetCommand_initOptions = function _SpoHomeSiteSetCommand_initOptions() {
+_SpoHomeSiteSetCommand_instances = new WeakSet(), _SpoHomeSiteSetCommand_initTelemetry = function _SpoHomeSiteSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            vivaConnectionsDefaultStart: typeof args.options.vivaConnectionsDefaultStart !== 'undefined'
+        });
+    });
+}, _SpoHomeSiteSetCommand_initOptions = function _SpoHomeSiteSetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--vivaConnectionsDefaultStart [vivaConnectionsDefaultStart]',
+        autocomplete: ['true', 'false']
     });
 }, _SpoHomeSiteSetCommand_initValidators = function _SpoHomeSiteSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+}, _SpoHomeSiteSetCommand_initTypes = function _SpoHomeSiteSetCommand_initTypes() {
+    this.types.boolean.push('vivaConnectionsDefaultStart');
 };
 module.exports = new SpoHomeSiteSetCommand();
 //# sourceMappingURL=homesite-set.js.map

package/dist/utils/validation.js

@@ -11,7 +11,7 @@ exports.validation = {
         }
         const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
         // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
-        return guidRegEx.test(guid) || guid.toLocaleLowerCase().trim() === "@meid";
+        return guidRegEx.test(guid) || guid.toLowerCase().trim() === '@meid';
     },
     isValidTeamsChannelId(guid) {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);
@@ -23,7 +23,8 @@ exports.validation = {
     },
     isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
-        return upnRegEx.test(upn);
+        // verify if the upn is a valid upn. @meusername will be replaced in a later stage with the actual username of the logged in user
+        return upnRegEx.test(upn) || upn.toLowerCase().trim() === '@meusername';
     },
     isDateInRange(date, monthOffset) {
         const d = new Date(date);

package/docs/docs/cmd/spo/homesite/homesite-set.md

@@ -11,14 +11,17 @@ m365 spo homesite set [options]
 ## Options
 
 `-u, --siteUrl <siteUrl>`
-: The URL of the site to set as Home Site.
+: The URL of the site to set as Home site.
+
+`--vivaConnectionsDefaultStart [vivaConnectionsDefaultStart]`
+: When set to `true`, the Viva Connections landing experience is set to the SharePoint home site. If set to `false`, the Viva Connections home experience will be used.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
 !!! important
-    To use this command you have to have permissions to access the tenant admin site.
+    To use this command you must be a Global or SharePoint administrator.
 
 ## Examples
 
@@ -28,8 +31,22 @@ Set the specified site as the Home Site.
 m365 spo homesite set --siteUrl https://contoso.sharepoint.com/sites/comms
 ```
 
+Sets the Home site to the provided site collection url and sets the Viva Connections landing experience to the SharePoint home site
+
+```sh
+m365 spo homesite set --siteUrl https://contoso.sharepoint.com/sites/comms --vivaConnectionsDefaultStart true
+```
+
+Sets the Home site to the provided site collection url and sets the Viva Connections landing experience to the default experience
+
+```sh
+m365 spo homesite set --siteUrl https://contoso.sharepoint.com/sites/comms --vivaConnectionsDefaultStart false
+```
+
 ## Response
 
+### Standard response
+
 === "JSON"
 
     ```json
@@ -54,6 +71,34 @@ m365 spo homesite set --siteUrl https://contoso.sharepoint.com/sites/comms
     The Home site has been set to https://contoso.sharepoint.com. It may take some time for the change to apply. Check aka.ms/homesites for details.
     ```
 
+### `vivaConnectionsDefaultStart` response
+
+When we make use of the option `vivaConnectionsDefaultStart` the response will differ. 
+
+=== "JSON"
+
+    ```json
+    "The Home site has been set to https://contoso.sharepoint.com and the Viva Connections default experience to True. It may take some time for the change to apply. Check aka.ms/homesites for details."
+    ```
+
+=== "Text"
+
+    ```text
+    The Home site has been set to https://contoso.sharepoint.com and the Viva Connections default experience to True. It may take some time for the change to apply. Check aka.ms/homesites for details.
+    ```
+
+=== "CSV"
+
+    ```csv
+    The Home site has been set to https://contoso.sharepoint.com and the Viva Connections default experience to True. It may take some time for the change to apply. Check aka.ms/homesites for details.
+    ```
+
+=== "Markdown"
+
+    ```md
+    The Home site has been set to https://contoso.sharepoint.com and the Viva Connections default experience to True. It may take some time for the change to apply. Check aka.ms/homesites for details.
+    ```
+
 ## More information
 
 - SharePoint home sites: a landing for your organization on the intelligent intranet: [https://techcommunity.microsoft.com/t5/Microsoft-SharePoint-Blog/SharePoint-home-sites-a-landing-for-your-organization-on-the/ba-p/621933](https://techcommunity.microsoft.com/t5/Microsoft-SharePoint-Blog/SharePoint-home-sites-a-landing-for-your-organization-on-the/ba-p/621933)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.4.0-beta.27e599e",
+  "version": "6.4.0-beta.33050ca",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",