@microsoft/sp-http-msgraph 1.23.2 → 1.24.0-beta.3

package/lib-commonjs/MSGraphClient.js

@@ -1,82 +1,60 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var sp_core_library_1 = require("@microsoft/sp-core-library");
-var sp_diagnostics_1 = require("@microsoft/sp-diagnostics");
-var sp_http_base_1 = require("@microsoft/sp-http-base");
-var SPHttpMsGraphStrings_resx_1 = tslib_1.__importDefault(require("./SPHttpMsGraphStrings.resx"));
-/**
- * MSGraphClient is used to perform REST calls against Microsoft Graph.
- *
- * @remarks The Microsoft Graph JavaScript client library is a lightweight wrapper around the
- * Microsoft Graph API. This class allows developers to start making REST calls to MSGraph without
- * needing to initialize the the MSGraph client library. If a custom configuration is desired,
- * the MSGraphClient api function needs to be provided with that custom configuration for
- * every request.
- *
- * For more information: {@link https://github.com/microsoftgraph/msgraph-sdk-javascript}
- *
- * @public
- */
-var MSGraphClient = /** @class */ (function () {
-    /**
-     * @param serviceScope - Provides services for the MSGraphClient to consume.
-     *
-     * @internal
-     */
-    function MSGraphClient(serviceScope) {
-        var _this = this;
-        serviceScope.whenFinished(function () {
-            MSGraphClient._graphBaseUrl = serviceScope
-                .consume(sp_http_base_1._GraphHttpClientContext.serviceKey)
-                .getGraphEndpointUrl();
-            if (!MSGraphClient._instance) {
-                MSGraphClient._instance = _this._createGraphClientInstance(sp_http_base_1._AadTokenProviders.configurable);
-            }
-        });
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return MSGraphClient;
     }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _spcorelibrary = require("@microsoft/sp-core-library");
+const _spdiagnostics = require("@microsoft/sp-diagnostics");
+const _sphttpbase = require("@microsoft/sp-http-base");
+const _SPHttpMsGraphStringsresx = /*#__PURE__*/ _interop_require_default._(require("./SPHttpMsGraphStrings.resx"));
+const _KillSwitches = require("./KillSwitches");
+class MSGraphClient {
     /**
-     * All calls to Microsoft Graph are chained together starting with the api function.
-     *
-     * @remarks Path supports the following formats:
-     * * me
-     * * /me
-     * * https://graph.microsoft.com/v1.0/me
-     * * https://graph.microsoft.com/beta/me
-     * * me/events?$filter=startswith(subject, 'ship')
-     *
-     * The authProvider and baseUrl option should not be used, as they have already been
-     * provided by the framework. See the official documentation here:
-     * https://github.com/microsoftgraph/msgraph-sdk-javascript
-     *
-     * @param path - The path for the request to MSGraph.
-     * @param config - Sets the configuration for this request.
-     */
-    MSGraphClient.prototype.api = function (path, config) {
-        sp_core_library_1.Validate.isNonemptyString(path, 'path');
-        MSGraphClient._instance.config = tslib_1.__assign(tslib_1.__assign({}, MSGraphClient._originalConfig), (config || {}));
+   * All calls to Microsoft Graph are chained together starting with the api function.
+   *
+   * @remarks Path supports the following formats:
+   * * me
+   * * /me
+   * * https://graph.microsoft.com/v1.0/me
+   * * https://graph.microsoft.com/beta/me
+   * * me/events?$filter=startswith(subject, 'ship')
+   *
+   * The authProvider and baseUrl option should not be used, as they have already been
+   * provided by the framework. See the official documentation here:
+   * https://github.com/microsoftgraph/msgraph-sdk-javascript
+   *
+   * @param path - The path for the request to MSGraph.
+   * @param config - Sets the configuration for this request.
+   */ api(path, config) {
+        _spcorelibrary.Validate.isNonemptyString(path, 'path');
+        MSGraphClient._instance.config = {
+            ...MSGraphClient._originalConfig,
+            ...config || {}
+        };
         return MSGraphClient._instance.api(path);
-    };
-    MSGraphClient.prototype._createGraphClientInstance = function (tokenProvider) {
-        var _this = this;
-        var graphClientModule;
+    }
+    _createGraphClientInstance(tokenProvider) {
+        let graphClientModule;
         if (!(MSGraphClient._window.MicrosoftGraph && MSGraphClient._window.MicrosoftGraph.Client)) {
-            throw new Error(SPHttpMsGraphStrings_resx_1.default.graphClientInitializationError);
-        }
-        else {
+            throw new Error(_SPHttpMsGraphStringsresx.default.graphClientInitializationError);
+        } else {
             // Workaround needed to interact with the Client object.
             // See https://github.com/microsoftgraph/msgraph-sdk-javascript/issues/47 for more details
             graphClientModule = MSGraphClient._window.MicrosoftGraph.Client;
             // Removing window variable reference to MSGraphJsSdk object
             MSGraphClient._window.MicrosoftGraph = undefined;
         }
-        var graphClient = graphClientModule.init({
-            authProvider: function (done) {
-                _this._getOAuthToken(tokenProvider)
-                    .then(function (token) {
-                    done(undefined /** error object */, token);
-                })
-                    .catch(function (e) {
+        const graphClient = graphClientModule.init({
+            authProvider: (done)=>{
+                this._getOAuthToken(tokenProvider).then((token)=>{
+                    done(undefined /** error object */ , token);
+                }).catch((e)=>{
                     // The IGraphRequest functions will return a rejected promise if it fails to get an OAuth2Token.
                     done(e, '');
                 });
@@ -85,22 +63,33 @@ var MSGraphClient = /** @class */ (function () {
         });
         MSGraphClient._originalConfig = graphClient.config;
         return graphClient;
-    };
-    MSGraphClient.prototype._getOAuthToken = function (tokenProvider) {
-        var qosMonitor = new sp_diagnostics_1._QosMonitor('MSGraphClient.FetchGraphToken');
-        return tokenProvider
-            .getToken(MSGraphClient._graphBaseUrl)
-            .then(function (response) {
+    }
+    _getOAuthToken(tokenProvider) {
+        const qosMonitor = new _spdiagnostics._QosMonitor('MSGraphClient.FetchGraphToken');
+        const tokenPromise = !(0, _KillSwitches.isGraphWellKnownResourceKSActive)() ? tokenProvider.getToken(MSGraphClient._graphBaseUrl, {
+            wellKnownResource: 'ms-graph'
+        }) : tokenProvider.getToken(MSGraphClient._graphBaseUrl);
+        return tokenPromise.then((response)=>{
             qosMonitor.writeSuccess();
             return response;
-        })
-            .catch(function (error) {
+        }).catch((error)=>{
             qosMonitor.writeUnexpectedFailure(error.message, error);
             throw error;
         });
-    };
-    MSGraphClient._window = window;
-    return MSGraphClient;
-}());
-exports.default = MSGraphClient;
-//# sourceMappingURL=MSGraphClient.js.map
+    }
+    /**
+   * @param serviceScope - Provides services for the MSGraphClient to consume.
+   *
+   * @internal
+   */ constructor(serviceScope){
+        serviceScope.whenFinished(()=>{
+            MSGraphClient._graphBaseUrl = serviceScope.consume(_sphttpbase._GraphHttpClientContext.serviceKey).getGraphEndpointUrl();
+            if (!MSGraphClient._instance) {
+                MSGraphClient._instance = this._createGraphClientInstance(_sphttpbase._AadTokenProviders.configurable);
+            }
+        });
+    }
+}
+MSGraphClient._window = window;
+
+//# sourceMappingURL=./MSGraphClient.js.map

package/lib-commonjs/MSGraphClientFactory.js

@@ -1,106 +1,100 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var sp_core_library_1 = require("@microsoft/sp-core-library");
-var sp_diagnostics_1 = require("@microsoft/sp-diagnostics");
-var MSGraphClient_1 = tslib_1.__importDefault(require("./MSGraphClient"));
-/**
- * Returns a preinitialized version of the MSGraphClient.
- * For more information: {@link https://docs.microsoft.com/en-us/sharepoint/dev/spfx/use-msgraph}
- *
- * @public
- */
-var MSGraphClientFactory = /** @class */ (function () {
-    /**
-     * @param serviceScope - Provides services for the MSGraphClient to consume.
-     *
-     * @internal
-     */
-    function MSGraphClientFactory(serviceScope) {
-        this._serviceScope = serviceScope;
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return MSGraphClientFactory;
     }
-    MSGraphClientFactory.prototype.getClient = function (version, options) {
-        var _this = this;
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _spcorelibrary = require("@microsoft/sp-core-library");
+const _spdiagnostics = require("@microsoft/sp-diagnostics");
+const _MSGraphClient = /*#__PURE__*/ _interop_require_default._(require("./MSGraphClient"));
+class MSGraphClientFactory {
+    getClient(version, options) {
         if (!version || version === '1') {
             // returns a v1 version of MSGraphClient
-            /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-            if (!MSGraphClient_1.default._instance) {
-                return Promise.resolve().then(function () { return tslib_1.__importStar(require(
-                /* webpackChunkName: 'sp-http-msgraphclient' */ '@microsoft/microsoft-graph-clientv1/lib/graph-js-sdk-web')); }).then(function () {
-                    return new MSGraphClient_1.default(_this._serviceScope);
+            /* eslint-disable-next-line @typescript-eslint/no-explicit-any */ if (!_MSGraphClient.default._instance) {
+                return Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard._(require(/* webpackChunkName: 'sp-http-msgraphclient' */ "@microsoft/microsoft-graph-clientv1/lib/graph-js-sdk-web"))).then(()=>{
+                    return new _MSGraphClient.default(this._serviceScope);
                 });
+            } else {
+                return Promise.resolve(new _MSGraphClient.default(this._serviceScope));
             }
-            else {
-                return Promise.resolve(new MSGraphClient_1.default(this._serviceScope));
-            }
-        }
-        else if (version === '3' &&
-            !sp_core_library_1._SPKillSwitch.isActivated('24401914-15d6-4c3c-aeea-4aace46d5586' /* '01/06/2022', 'use new MSGraphVersion' */)) {
-            var qosMonitor_1 = new sp_diagnostics_1._QosMonitor('MSGraphClientFactory.GetClientV3');
+        } else if (version === '3' && !_spcorelibrary._SPKillSwitch.isActivated('24401914-15d6-4c3c-aeea-4aace46d5586' /* '01/06/2022', 'use new MSGraphVersion' */ )) {
+            const qosMonitor = new _spdiagnostics._QosMonitor('MSGraphClientFactory.GetClientV3');
             // returns a v3 version of MSGraphClient
             // Should only import once no matter how many times it is called
-            return Promise.resolve().then(function () { return tslib_1.__importStar(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ './MSGraphClientV3')); }).then(function (msGraphClientV3) {
+            return Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard._(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ "./MSGraphClientV3"))).then((msGraphClientV3)=>{
                 // We create a new object every time rather than referencing an existing object in case the service scope changes
-                qosMonitor_1.writeSuccess({ version: 3, options: !!options });
-                return new msGraphClientV3.default(_this._serviceScope, options, undefined);
-            })
-                .catch(function (error) {
-                qosMonitor_1.writeUnexpectedFailure('ImportMSGraphV3ChunkFailed', error);
+                qosMonitor.writeSuccess({
+                    version: 3,
+                    options: !!options
+                });
+                return new msGraphClientV3.default(this._serviceScope, options, undefined);
+            }).catch((error)=>{
+                qosMonitor.writeUnexpectedFailure('ImportMSGraphV3ChunkFailed', error);
                 throw error;
             });
-        }
-        else {
-            var errorMessage = 'Not yet implemented.';
+        } else {
+            const errorMessage = 'Not yet implemented.';
             throw Error(errorMessage);
         }
-    };
+    }
     /**
-     * Returns an instance of the MSGraphClient that communicates with the current tenant's configurable Service Pricipal.
-     * Allows to specify custom middleware options.
-     *
-     * @param version - The version of the Graph API to use. 3.
-     * @param options - Client options for the Graph API.
-     */
-    MSGraphClientFactory.prototype.getClientWithMiddleware = function (version, options) {
-        var _this = this;
-        var qosMonitor = new sp_diagnostics_1._QosMonitor('MSGraphClientFactory.GetClientV3WithMiddleware');
+   * Returns an instance of the MSGraphClient that communicates with the current tenant's configurable Service Pricipal.
+   * Allows to specify custom middleware options.
+   *
+   * @param version - The version of the Graph API to use. 3.
+   * @param options - Client options for the Graph API.
+   */ getClientWithMiddleware(version, options) {
+        const qosMonitor = new _spdiagnostics._QosMonitor('MSGraphClientFactory.GetClientV3WithMiddleware');
         // returns a v3 version of MSGraphClient
         // Should only import once no matter how many times it is called
-        return Promise.resolve().then(function () { return tslib_1.__importStar(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ './MSGraphClientV3')); }).then(function (msGraphClientV3) {
+        return Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard._(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ "./MSGraphClientV3"))).then((msGraphClientV3)=>{
             // We create a new object every time rather than referencing an existing object in case the service scope changes
-            qosMonitor.writeSuccess({ version: 3 });
-            return new msGraphClientV3.default(_this._serviceScope, undefined, options);
-        })
-            .catch(function (error) {
+            qosMonitor.writeSuccess({
+                version: 3
+            });
+            return new msGraphClientV3.default(this._serviceScope, undefined, options);
+        }).catch((error)=>{
             qosMonitor.writeUnexpectedFailure('ImportMSGraphV3ChunkFailed', error);
             throw error;
         });
-    };
+    }
     /**
-     * Returns a v3 version of MSGraphClient with the 1P App Principal
-     *
-     * @internal
-     *
-     */
-    MSGraphClientFactory.prototype.getClientInternal = function (version, options) {
-        var _this = this;
-        var qosMonitor = new sp_diagnostics_1._QosMonitor('MSGraphClientFactory.GetInternalClientV3');
+   * Returns a v3 version of MSGraphClient with the 1P App Principal
+   *
+   * @internal
+   *
+   */ getClientInternal(version, options) {
+        const qosMonitor = new _spdiagnostics._QosMonitor('MSGraphClientFactory.GetInternalClientV3');
         // Should only import once no matter how many times it is called
-        return Promise.resolve().then(function () { return tslib_1.__importStar(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ './MSGraphClientV3')); }).then(function (msGraphClientV3) {
+        return Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard._(require(/* webpackChunkName: 'sp-http-msgraphclientv3' */ "./MSGraphClientV3"))).then((msGraphClientV3)=>{
             // We create a new object every time rather than referencing an existing object in case the service scope changes
-            qosMonitor.writeSuccess({ version: 3, options: !!options });
-            return new msGraphClientV3.default(_this._serviceScope, options, undefined, true);
-        })
-            .catch(function (error) {
+            qosMonitor.writeSuccess({
+                version: 3,
+                options: !!options
+            });
+            return new msGraphClientV3.default(this._serviceScope, options, undefined, true);
+        }).catch((error)=>{
             qosMonitor.writeUnexpectedFailure('ImportMSGraphV3ChunkFailed', error);
             throw error;
         });
-    };
+    }
     /**
-     * The service key for MSGraphClientFactory.
-     */
-    MSGraphClientFactory.serviceKey = sp_core_library_1.ServiceKey.create('sp-http:MSGraphClientFactory', MSGraphClientFactory);
-    return MSGraphClientFactory;
-}());
-exports.default = MSGraphClientFactory;
-//# sourceMappingURL=MSGraphClientFactory.js.map
+   * @param serviceScope - Provides services for the MSGraphClient to consume.
+   *
+   * @internal
+   */ constructor(serviceScope){
+        this._serviceScope = serviceScope;
+    }
+}
+/**
+   * The service key for MSGraphClientFactory.
+   */ MSGraphClientFactory.serviceKey = _spcorelibrary.ServiceKey.create('sp-http:MSGraphClientFactory', MSGraphClientFactory);
+
+//# sourceMappingURL=./MSGraphClientFactory.js.map