@dereekb/zoom 13.32.0 → 13.34.0

package/index.cjs.js

@@ -1656,14 +1656,17 @@ function _ts_generator$1(thisArg, body) {
         });
         // MARK: Make User Context
         var makeUserContext = function makeUserContext(input) {
-            var userAccessTokenFactory = oauthContext.makeUserAccessTokenFactory({
+            var userAccessTokenFactory = oauthContext.makeAccessTokenFactory({
                 refreshToken: input.refreshToken,
-                userAccessTokenCache: input.accessTokenCache
+                accessTokenCache: input.accessTokenCache
             });
             var userAccessTokenStringFactory = zoomAccessTokenStringFactory(userAccessTokenFactory);
-            var userFetch = fetchFactory({
+            var userBaseFetch = fetchFactory({
                 zoomAccessTokenStringFactory: userAccessTokenStringFactory
             });
+            // wrapped for the same reason the server fetch is: without it a per-user call's error skips
+            // Zoom's parsed error family and its rate-limit header handling
+            var userFetch = handleZoomErrorFetch(userBaseFetch, logZoomServerErrorFunction);
             var userFetchJson = fetch.fetchJsonFunction(userFetch, {
                 handleFetchJsonParseErrorFunction: fetch.returnNullHandleFetchJsonParseErrorFunction
             });
@@ -1752,6 +1755,36 @@ function _ts_generator$1(thisArg, body) {
 /**
  * The Zoom OAuth API URL for the US datacenter.
  */ var ZOOM_OAUTH_API_URL = 'https://zoom.us/oauth';
+/**
+ * Returns whether the credential is a {@link ZoomRefreshTokenCredential}.
+ *
+ * Checked before the account arm on purpose: `accountId` is also ambient on {@link ZoomOAuthConfig},
+ * so a credential carrying both reads as a user credential that picked up an accountId — never the
+ * reverse.
+ *
+ * @param credential - The credential to check.
+ * @returns True when the credential carries a refresh token.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function isZoomRefreshTokenCredential(credential) {
+    return credential.refreshToken != null;
+}
+/**
+ * The ambient credential a {@link ZoomOAuthConfig} authenticates the app's own calls with.
+ *
+ * Zoom's ambient credential is fully determined by the config — there is no choice to configure, so
+ * it is derived here rather than being a settable field.
+ *
+ * @param config - The OAuth configuration.
+ * @returns The account credential for that configuration.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function zoomOAuthConfigAccountCredential(config) {
+    return {
+        accountId: config.accountId,
+        accessTokenCache: config.accessTokenCache
+    };
+}
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -1881,6 +1914,25 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+/**
+ * Maps a {@link ZoomOAuthAccessTokenResponse} to a {@link ZoomAccessToken}.
+ *
+ * @param response - The token response returned by the Zoom token endpoint.
+ * @returns The equivalent ZoomAccessToken, with `expiresAt` resolved against the current time.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function zoomAccessTokenFromTokenResponse(response) {
+    var createdAt = Date.now();
+    var access_token = response.access_token, api_url = response.api_url, scope = response.scope, expires_in = response.expires_in;
+    var accessToken = {
+        accessToken: access_token,
+        apiDomain: api_url,
+        expiresIn: expires_in,
+        expiresAt: new Date(createdAt + expires_in * util.MS_IN_SECOND),
+        scope: scope
+    };
+    return accessToken;
+}
 /**
  * Creates a ZoomOAuth instance factory from the given configuration.
  *
@@ -1889,7 +1941,8 @@ function _ts_generator(thisArg, body) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function zoomOAuthFactory(factoryConfig) {
-    var fetchHandler = zoomRateLimitedFetchHandler();
+    var _factoryConfig_fetchHandler;
+    var fetchHandler = (_factoryConfig_fetchHandler = factoryConfig.fetchHandler) !== null && _factoryConfig_fetchHandler !== void 0 ? _factoryConfig_fetchHandler : zoomRateLimitedFetchHandler();
     var logZoomServerErrorFunction = factoryConfig.logZoomServerErrorFunction, _factoryConfig_fetchFactory = factoryConfig.fetchFactory, fetchFactory = _factoryConfig_fetchFactory === void 0 ? function() {
         return fetch.fetchApiFetchService.makeFetch({
             baseUrl: ZOOM_OAUTH_API_URL,
@@ -1905,18 +1958,6 @@ function _ts_generator(thisArg, body) {
         });
     } : _factoryConfig_fetchFactory;
     return function(config) {
-        var accessTokenFromTokenResponse = function accessTokenFromTokenResponse(result) {
-            var createdAt = Date.now();
-            var access_token = result.access_token, api_url = result.api_url, scope = result.scope, expires_in = result.expires_in;
-            var accessToken = {
-                accessToken: access_token,
-                apiDomain: api_url,
-                expiresIn: expires_in,
-                expiresAt: new Date(createdAt + expires_in * util.MS_IN_SECOND),
-                scope: scope
-            };
-            return accessToken;
-        };
         if (!config.clientId) {
             throw new Error('ZoomOAuthConfig missing clientId.');
         } else if (!config.clientSecret) {
@@ -1929,62 +1970,73 @@ function _ts_generator(thisArg, body) {
         var fetchJson = fetch.fetchJsonFunction(fetch$1, {
             handleFetchJsonParseErrorFunction: fetch.returnNullHandleFetchJsonParseErrorFunction
         });
-        var tokenRefresher = function tokenRefresher() {
-            return _async_to_generator(function() {
-                var accessToken;
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            return [
-                                4,
-                                serverAccessToken(oauthContext)()
-                            ];
-                        case 1:
-                            accessToken = _state.sent();
-                            return [
-                                2,
-                                accessTokenFromTokenResponse(accessToken)
-                            ];
-                    }
-                });
-            })();
-        };
-        var loadAccessToken = zoomOAuthZoomAccessTokenFactory({
-            tokenRefresher: tokenRefresher,
-            accessTokenCache: config.accessTokenCache
-        });
-        // User Access Token
-        var makeUserAccessTokenFactory = function makeUserAccessTokenFactory(input) {
-            var userTokenRefresher = function userTokenRefresher() {
-                return _async_to_generator(function() {
-                    var accessToken;
-                    return _ts_generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    userAccessToken(oauthContext)(input)
-                                ];
-                            case 1:
-                                accessToken = _state.sent();
-                                return [
-                                    2,
-                                    accessTokenFromTokenResponse(accessToken)
-                                ];
-                        }
-                    });
-                })();
-            };
+        // MARK: Access Token
+        // both grants are Basic-authed with the SAME client pair (see zoomOAuthApiFetchJsonInput), and the
+        // guards above already require it — so unlike Cal.com there is no credential this context cannot
+        // exchange. All a credential selects is which grant is used
+        var makeAccessTokenFactory = function makeAccessTokenFactory(credential) {
+            var tokenRefresher;
+            if (isZoomRefreshTokenCredential(credential)) {
+                var refreshToken = credential.refreshToken;
+                tokenRefresher = function tokenRefresher() {
+                    return _async_to_generator(function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        userAccessToken(oauthContext)({
+                                            refreshToken: refreshToken
+                                        })
+                                    ];
+                                case 1:
+                                    return [
+                                        2,
+                                        zoomAccessTokenFromTokenResponse.apply(void 0, [
+                                            _state.sent()
+                                        ])
+                                    ];
+                            }
+                        });
+                    })();
+                };
+            } else {
+                var accountId = credential.accountId;
+                tokenRefresher = function tokenRefresher() {
+                    return _async_to_generator(function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        serverAccessToken(oauthContext)({
+                                            accountId: accountId
+                                        })
+                                    ];
+                                case 1:
+                                    return [
+                                        2,
+                                        zoomAccessTokenFromTokenResponse.apply(void 0, [
+                                            _state.sent()
+                                        ])
+                                    ];
+                            }
+                        });
+                    })();
+                };
+            }
             return zoomOAuthZoomAccessTokenFactory({
-                tokenRefresher: userTokenRefresher,
-                accessTokenCache: input.userAccessTokenCache
+                tokenRefresher: tokenRefresher,
+                accessTokenCache: credential.accessTokenCache
             });
         };
+        // built once, so the account credential's in-memory tier is shared across the whole context
+        var loadAccessToken = makeAccessTokenFactory(zoomOAuthConfigAccountCredential(config));
         var oauthContext = {
             fetch: fetch$1,
             fetchJson: fetchJson,
             loadAccessToken: loadAccessToken,
-            makeUserAccessTokenFactory: makeUserAccessTokenFactory,
+            makeAccessTokenFactory: makeAccessTokenFactory,
             config: config
         };
         var zoomOAuth = {
@@ -2125,6 +2177,7 @@ exports.getUser = getUser;
 exports.handleZoomErrorFetch = handleZoomErrorFetch;
 exports.handleZoomErrorFetchFactory = handleZoomErrorFetchFactory;
 exports.handleZoomOAuthErrorFetch = handleZoomOAuthErrorFetch;
+exports.isZoomRefreshTokenCredential = isZoomRefreshTokenCredential;
 exports.listMeetingsForUser = listMeetingsForUser;
 exports.listMeetingsForUserPageFactory = listMeetingsForUserPageFactory;
 exports.listUsers = listUsers;
@@ -2143,10 +2196,12 @@ exports.serverAccessToken = serverAccessToken;
 exports.silenceZoomErrorWithCodesFunction = silenceZoomErrorWithCodesFunction;
 exports.updateMeeting = updateMeeting;
 exports.userAccessToken = userAccessToken;
+exports.zoomAccessTokenFromTokenResponse = zoomAccessTokenFromTokenResponse;
 exports.zoomAccessTokenStringFactory = zoomAccessTokenStringFactory;
 exports.zoomFactory = zoomFactory;
 exports.zoomFetchPageFactory = zoomFetchPageFactory;
 exports.zoomOAuthApiFetchJsonInput = zoomOAuthApiFetchJsonInput;
+exports.zoomOAuthConfigAccountCredential = zoomOAuthConfigAccountCredential;
 exports.zoomOAuthFactory = zoomOAuthFactory;
 exports.zoomOAuthServerBasicAuthorizationHeaderValue = zoomOAuthServerBasicAuthorizationHeaderValue;
 exports.zoomOAuthZoomAccessTokenFactory = zoomOAuthZoomAccessTokenFactory;

package/index.esm.js

@@ -1654,14 +1654,17 @@ function _ts_generator$1(thisArg, body) {
         });
         // MARK: Make User Context
         var makeUserContext = function makeUserContext(input) {
-            var userAccessTokenFactory = oauthContext.makeUserAccessTokenFactory({
+            var userAccessTokenFactory = oauthContext.makeAccessTokenFactory({
                 refreshToken: input.refreshToken,
-                userAccessTokenCache: input.accessTokenCache
+                accessTokenCache: input.accessTokenCache
             });
             var userAccessTokenStringFactory = zoomAccessTokenStringFactory(userAccessTokenFactory);
-            var userFetch = fetchFactory({
+            var userBaseFetch = fetchFactory({
                 zoomAccessTokenStringFactory: userAccessTokenStringFactory
             });
+            // wrapped for the same reason the server fetch is: without it a per-user call's error skips
+            // Zoom's parsed error family and its rate-limit header handling
+            var userFetch = handleZoomErrorFetch(userBaseFetch, logZoomServerErrorFunction);
             var userFetchJson = fetchJsonFunction(userFetch, {
                 handleFetchJsonParseErrorFunction: returnNullHandleFetchJsonParseErrorFunction
             });
@@ -1750,6 +1753,36 @@ function _ts_generator$1(thisArg, body) {
 /**
  * The Zoom OAuth API URL for the US datacenter.
  */ var ZOOM_OAUTH_API_URL = 'https://zoom.us/oauth';
+/**
+ * Returns whether the credential is a {@link ZoomRefreshTokenCredential}.
+ *
+ * Checked before the account arm on purpose: `accountId` is also ambient on {@link ZoomOAuthConfig},
+ * so a credential carrying both reads as a user credential that picked up an accountId — never the
+ * reverse.
+ *
+ * @param credential - The credential to check.
+ * @returns True when the credential carries a refresh token.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function isZoomRefreshTokenCredential(credential) {
+    return credential.refreshToken != null;
+}
+/**
+ * The ambient credential a {@link ZoomOAuthConfig} authenticates the app's own calls with.
+ *
+ * Zoom's ambient credential is fully determined by the config — there is no choice to configure, so
+ * it is derived here rather than being a settable field.
+ *
+ * @param config - The OAuth configuration.
+ * @returns The account credential for that configuration.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function zoomOAuthConfigAccountCredential(config) {
+    return {
+        accountId: config.accountId,
+        accessTokenCache: config.accessTokenCache
+    };
+}
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -1879,6 +1912,25 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+/**
+ * Maps a {@link ZoomOAuthAccessTokenResponse} to a {@link ZoomAccessToken}.
+ *
+ * @param response - The token response returned by the Zoom token endpoint.
+ * @returns The equivalent ZoomAccessToken, with `expiresAt` resolved against the current time.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */ function zoomAccessTokenFromTokenResponse(response) {
+    var createdAt = Date.now();
+    var access_token = response.access_token, api_url = response.api_url, scope = response.scope, expires_in = response.expires_in;
+    var accessToken = {
+        accessToken: access_token,
+        apiDomain: api_url,
+        expiresIn: expires_in,
+        expiresAt: new Date(createdAt + expires_in * MS_IN_SECOND),
+        scope: scope
+    };
+    return accessToken;
+}
 /**
  * Creates a ZoomOAuth instance factory from the given configuration.
  *
@@ -1887,7 +1939,8 @@ function _ts_generator(thisArg, body) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function zoomOAuthFactory(factoryConfig) {
-    var fetchHandler = zoomRateLimitedFetchHandler();
+    var _factoryConfig_fetchHandler;
+    var fetchHandler = (_factoryConfig_fetchHandler = factoryConfig.fetchHandler) !== null && _factoryConfig_fetchHandler !== void 0 ? _factoryConfig_fetchHandler : zoomRateLimitedFetchHandler();
     var logZoomServerErrorFunction = factoryConfig.logZoomServerErrorFunction, _factoryConfig_fetchFactory = factoryConfig.fetchFactory, fetchFactory = _factoryConfig_fetchFactory === void 0 ? function() {
         return fetchApiFetchService.makeFetch({
             baseUrl: ZOOM_OAUTH_API_URL,
@@ -1903,18 +1956,6 @@ function _ts_generator(thisArg, body) {
         });
     } : _factoryConfig_fetchFactory;
     return function(config) {
-        var accessTokenFromTokenResponse = function accessTokenFromTokenResponse(result) {
-            var createdAt = Date.now();
-            var access_token = result.access_token, api_url = result.api_url, scope = result.scope, expires_in = result.expires_in;
-            var accessToken = {
-                accessToken: access_token,
-                apiDomain: api_url,
-                expiresIn: expires_in,
-                expiresAt: new Date(createdAt + expires_in * MS_IN_SECOND),
-                scope: scope
-            };
-            return accessToken;
-        };
         if (!config.clientId) {
             throw new Error('ZoomOAuthConfig missing clientId.');
         } else if (!config.clientSecret) {
@@ -1927,62 +1968,73 @@ function _ts_generator(thisArg, body) {
         var fetchJson = fetchJsonFunction(fetch, {
             handleFetchJsonParseErrorFunction: returnNullHandleFetchJsonParseErrorFunction
         });
-        var tokenRefresher = function tokenRefresher() {
-            return _async_to_generator(function() {
-                var accessToken;
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            return [
-                                4,
-                                serverAccessToken(oauthContext)()
-                            ];
-                        case 1:
-                            accessToken = _state.sent();
-                            return [
-                                2,
-                                accessTokenFromTokenResponse(accessToken)
-                            ];
-                    }
-                });
-            })();
-        };
-        var loadAccessToken = zoomOAuthZoomAccessTokenFactory({
-            tokenRefresher: tokenRefresher,
-            accessTokenCache: config.accessTokenCache
-        });
-        // User Access Token
-        var makeUserAccessTokenFactory = function makeUserAccessTokenFactory(input) {
-            var userTokenRefresher = function userTokenRefresher() {
-                return _async_to_generator(function() {
-                    var accessToken;
-                    return _ts_generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                return [
-                                    4,
-                                    userAccessToken(oauthContext)(input)
-                                ];
-                            case 1:
-                                accessToken = _state.sent();
-                                return [
-                                    2,
-                                    accessTokenFromTokenResponse(accessToken)
-                                ];
-                        }
-                    });
-                })();
-            };
+        // MARK: Access Token
+        // both grants are Basic-authed with the SAME client pair (see zoomOAuthApiFetchJsonInput), and the
+        // guards above already require it — so unlike Cal.com there is no credential this context cannot
+        // exchange. All a credential selects is which grant is used
+        var makeAccessTokenFactory = function makeAccessTokenFactory(credential) {
+            var tokenRefresher;
+            if (isZoomRefreshTokenCredential(credential)) {
+                var refreshToken = credential.refreshToken;
+                tokenRefresher = function tokenRefresher() {
+                    return _async_to_generator(function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        userAccessToken(oauthContext)({
+                                            refreshToken: refreshToken
+                                        })
+                                    ];
+                                case 1:
+                                    return [
+                                        2,
+                                        zoomAccessTokenFromTokenResponse.apply(void 0, [
+                                            _state.sent()
+                                        ])
+                                    ];
+                            }
+                        });
+                    })();
+                };
+            } else {
+                var accountId = credential.accountId;
+                tokenRefresher = function tokenRefresher() {
+                    return _async_to_generator(function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        serverAccessToken(oauthContext)({
+                                            accountId: accountId
+                                        })
+                                    ];
+                                case 1:
+                                    return [
+                                        2,
+                                        zoomAccessTokenFromTokenResponse.apply(void 0, [
+                                            _state.sent()
+                                        ])
+                                    ];
+                            }
+                        });
+                    })();
+                };
+            }
             return zoomOAuthZoomAccessTokenFactory({
-                tokenRefresher: userTokenRefresher,
-                accessTokenCache: input.userAccessTokenCache
+                tokenRefresher: tokenRefresher,
+                accessTokenCache: credential.accessTokenCache
             });
         };
+        // built once, so the account credential's in-memory tier is shared across the whole context
+        var loadAccessToken = makeAccessTokenFactory(zoomOAuthConfigAccountCredential(config));
         var oauthContext = {
             fetch: fetch,
             fetchJson: fetchJson,
             loadAccessToken: loadAccessToken,
-            makeUserAccessTokenFactory: makeUserAccessTokenFactory,
+            makeAccessTokenFactory: makeAccessTokenFactory,
             config: config
         };
         var zoomOAuth = {
@@ -2092,4 +2144,4 @@ function _ts_generator(thisArg, body) {
     };
 }
 
-export { DEFAULT_ZOOM_API_RATE_LIMIT, DEFAULT_ZOOM_API_RATE_LIMIT_RESET_PERIOD, DEFAULT_ZOOM_RATE_LIMITED_TOO_MANY_REQUESTS_LOG_FUNCTION, DEFAULT_ZOOM_RATE_LIMITED_TOO_MANY_REQUETS_LOG_FUNCTION, DELETE_MEETING_DOES_NOT_EXIST_ERROR_CODE, ZOOM_ACCOUNTS_INVALID_GRANT_ERROR_CODE, ZOOM_API_URL, ZOOM_OAUTH_API_URL, ZOOM_RATE_LIMIT_CATEGORY_HEADER, ZOOM_RATE_LIMIT_LIMIT_HEADER, ZOOM_RATE_LIMIT_REMAINING_HEADER, ZOOM_RATE_LIMIT_RETRY_AFTER_HEADER, ZOOM_RATE_LIMIT_TYPE_HEADER, ZOOM_SUCCESS_CODE, ZOOM_TOO_MANY_REQUESTS_ERROR_CODE, ZOOM_TOO_MANY_REQUESTS_HTTP_STATUS_CODE, ZoomApprovalType, ZoomMeetingType, ZoomMonthlyWeek, ZoomMonthlyWeekDay, ZoomOAuthAccessTokenError, ZoomOAuthAuthFailureError, ZoomRecurrenceType, ZoomRegistrationType, ZoomServerError, ZoomServerFetchResponseError, ZoomTooManyRequestsError, ZoomUserType, createMeetingForUser, deleteMeeting, getMeeting, getPastMeeting, getPastMeetingParticipants, getPastMeetingParticipantsPageFactory, getUser, handleZoomErrorFetch, handleZoomErrorFetchFactory, handleZoomOAuthErrorFetch, listMeetingsForUser, listMeetingsForUserPageFactory, listUsers, listUsersPageFactory, logZoomErrorToConsole, logZoomOAuthErrorToConsole, logZoomServerErrorFunction, mapToZoomPageResult, omitSilenceZoomErrorKeys, parseZoomApiError, parseZoomApiServerErrorResponseData, parseZoomOAuthError, parseZoomOAuthServerErrorResponseData, parseZoomServerErrorData, serverAccessToken, silenceZoomErrorWithCodesFunction, updateMeeting, userAccessToken, zoomAccessTokenStringFactory, zoomFactory, zoomFetchPageFactory, zoomOAuthApiFetchJsonInput, zoomOAuthFactory, zoomOAuthServerBasicAuthorizationHeaderValue, zoomOAuthZoomAccessTokenFactory, zoomRateLimitHeaderDetails, zoomRateLimitedFetchHandler };
+export { DEFAULT_ZOOM_API_RATE_LIMIT, DEFAULT_ZOOM_API_RATE_LIMIT_RESET_PERIOD, DEFAULT_ZOOM_RATE_LIMITED_TOO_MANY_REQUESTS_LOG_FUNCTION, DEFAULT_ZOOM_RATE_LIMITED_TOO_MANY_REQUETS_LOG_FUNCTION, DELETE_MEETING_DOES_NOT_EXIST_ERROR_CODE, ZOOM_ACCOUNTS_INVALID_GRANT_ERROR_CODE, ZOOM_API_URL, ZOOM_OAUTH_API_URL, ZOOM_RATE_LIMIT_CATEGORY_HEADER, ZOOM_RATE_LIMIT_LIMIT_HEADER, ZOOM_RATE_LIMIT_REMAINING_HEADER, ZOOM_RATE_LIMIT_RETRY_AFTER_HEADER, ZOOM_RATE_LIMIT_TYPE_HEADER, ZOOM_SUCCESS_CODE, ZOOM_TOO_MANY_REQUESTS_ERROR_CODE, ZOOM_TOO_MANY_REQUESTS_HTTP_STATUS_CODE, ZoomApprovalType, ZoomMeetingType, ZoomMonthlyWeek, ZoomMonthlyWeekDay, ZoomOAuthAccessTokenError, ZoomOAuthAuthFailureError, ZoomRecurrenceType, ZoomRegistrationType, ZoomServerError, ZoomServerFetchResponseError, ZoomTooManyRequestsError, ZoomUserType, createMeetingForUser, deleteMeeting, getMeeting, getPastMeeting, getPastMeetingParticipants, getPastMeetingParticipantsPageFactory, getUser, handleZoomErrorFetch, handleZoomErrorFetchFactory, handleZoomOAuthErrorFetch, isZoomRefreshTokenCredential, listMeetingsForUser, listMeetingsForUserPageFactory, listUsers, listUsersPageFactory, logZoomErrorToConsole, logZoomOAuthErrorToConsole, logZoomServerErrorFunction, mapToZoomPageResult, omitSilenceZoomErrorKeys, parseZoomApiError, parseZoomApiServerErrorResponseData, parseZoomOAuthError, parseZoomOAuthServerErrorResponseData, parseZoomServerErrorData, serverAccessToken, silenceZoomErrorWithCodesFunction, updateMeeting, userAccessToken, zoomAccessTokenFromTokenResponse, zoomAccessTokenStringFactory, zoomFactory, zoomFetchPageFactory, zoomOAuthApiFetchJsonInput, zoomOAuthConfigAccountCredential, zoomOAuthFactory, zoomOAuthServerBasicAuthorizationHeaderValue, zoomOAuthZoomAccessTokenFactory, zoomRateLimitHeaderDetails, zoomRateLimitedFetchHandler };

package/nestjs/index.cjs.js

@@ -107,7 +107,6 @@ function _define_property$8(obj, key, value) {
     var clientSecret = configService.getOrThrow(clientSecretKey);
     var config = {
         zoomOAuth: {
-            authEntityType: 'account',
             accountId: accountId,
             clientId: clientId,
             clientSecret: clientSecret
@@ -216,7 +215,7 @@ function _non_iterable_rest() {
 function _non_iterable_spread$2() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _object_spread$3(target) {
+function _object_spread$2(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -608,7 +607,7 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
         } else {
             var rawExpiresAt = token.expiresAt;
             var expiresAt = rawExpiresAt != null && !_instanceof(rawExpiresAt, Date) ? new Date(rawExpiresAt) : rawExpiresAt;
-            result = _object_spread_props$2(_object_spread$3({}, token), {
+            result = _object_spread_props$2(_object_spread$2({}, token), {
                 expiresAt: expiresAt
             });
         }
@@ -806,21 +805,6 @@ function _define_property$6(obj, key, value) {
     }
     return obj;
 }
-function _object_spread$2(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property$6(target, key, source[key]);
-        });
-    }
-    return target;
-}
 exports.ZoomOAuthApi = /*#__PURE__*/ function() {
     function ZoomOAuthApi(config, cacheService) {
         _class_call_check$6(this, ZoomOAuthApi);
@@ -830,10 +814,17 @@ exports.ZoomOAuthApi = /*#__PURE__*/ function() {
         _define_property$6(this, "zoomOAuth", void 0);
         this.config = config;
         this.cacheService = cacheService;
+        var _config_zoomOAuth = config.zoomOAuth, clientId = _config_zoomOAuth.clientId, clientSecret = _config_zoomOAuth.clientSecret, accountId = _config_zoomOAuth.accountId;
         var accessTokenCache = (_config_zoomOAuth_accessTokenCache = config.zoomOAuth.accessTokenCache) !== null && _config_zoomOAuth_accessTokenCache !== void 0 ? _config_zoomOAuth_accessTokenCache : cacheService.loadZoomAccessTokenCache();
-        this.zoomOAuth = zoom.zoomOAuthFactory((_config_factoryConfig = config.factoryConfig) !== null && _config_factoryConfig !== void 0 ? _config_factoryConfig : {})(_object_spread$2({
+        // the fields the OAuth context needs are named rather than spread: the spread used to come AFTER
+        // `accessTokenCache`, so a present-but-undefined key on the service config would overwrite the
+        // cache just resolved from the cache service
+        this.zoomOAuth = zoom.zoomOAuthFactory((_config_factoryConfig = config.factoryConfig) !== null && _config_factoryConfig !== void 0 ? _config_factoryConfig : {})({
+            clientId: clientId,
+            clientSecret: clientSecret,
+            accountId: accountId,
             accessTokenCache: accessTokenCache
-        }, config.zoomOAuth));
+        });
     }
     _create_class$5(ZoomOAuthApi, [
         {

package/nestjs/index.esm.js

@@ -105,7 +105,6 @@ function _define_property$8(obj, key, value) {
     var clientSecret = configService.getOrThrow(clientSecretKey);
     var config = {
         zoomOAuth: {
-            authEntityType: 'account',
             accountId: accountId,
             clientId: clientId,
             clientSecret: clientSecret
@@ -214,7 +213,7 @@ function _non_iterable_rest() {
 function _non_iterable_spread$2() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _object_spread$3(target) {
+function _object_spread$2(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -606,7 +605,7 @@ var DEFAULT_FILE_ZOOM_ACCOUNTS_ACCESS_TOKEN_CACHE_SERVICE_PATH = '.tmp/zoom-acce
         } else {
             var rawExpiresAt = token.expiresAt;
             var expiresAt = rawExpiresAt != null && !_instanceof(rawExpiresAt, Date) ? new Date(rawExpiresAt) : rawExpiresAt;
-            result = _object_spread_props$2(_object_spread$3({}, token), {
+            result = _object_spread_props$2(_object_spread$2({}, token), {
                 expiresAt: expiresAt
             });
         }
@@ -804,21 +803,6 @@ function _define_property$6(obj, key, value) {
     }
     return obj;
 }
-function _object_spread$2(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property$6(target, key, source[key]);
-        });
-    }
-    return target;
-}
 var ZoomOAuthApi = /*#__PURE__*/ function() {
     function ZoomOAuthApi(config, cacheService) {
         _class_call_check$6(this, ZoomOAuthApi);
@@ -828,10 +812,17 @@ var ZoomOAuthApi = /*#__PURE__*/ function() {
         _define_property$6(this, "zoomOAuth", void 0);
         this.config = config;
         this.cacheService = cacheService;
+        var _config_zoomOAuth = config.zoomOAuth, clientId = _config_zoomOAuth.clientId, clientSecret = _config_zoomOAuth.clientSecret, accountId = _config_zoomOAuth.accountId;
         var accessTokenCache = (_config_zoomOAuth_accessTokenCache = config.zoomOAuth.accessTokenCache) !== null && _config_zoomOAuth_accessTokenCache !== void 0 ? _config_zoomOAuth_accessTokenCache : cacheService.loadZoomAccessTokenCache();
-        this.zoomOAuth = zoomOAuthFactory((_config_factoryConfig = config.factoryConfig) !== null && _config_factoryConfig !== void 0 ? _config_factoryConfig : {})(_object_spread$2({
+        // the fields the OAuth context needs are named rather than spread: the spread used to come AFTER
+        // `accessTokenCache`, so a present-but-undefined key on the service config would overwrite the
+        // cache just resolved from the cache service
+        this.zoomOAuth = zoomOAuthFactory((_config_factoryConfig = config.factoryConfig) !== null && _config_factoryConfig !== void 0 ? _config_factoryConfig : {})({
+            clientId: clientId,
+            clientSecret: clientSecret,
+            accountId: accountId,
             accessTokenCache: accessTokenCache
-        }, config.zoomOAuth));
+        });
     }
     _create_class$5(ZoomOAuthApi, [
         {

package/nestjs/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/zoom/nestjs",
-  "version": "13.32.0",
+  "version": "13.34.0",
   "peerDependencies": {
-    "@dereekb/nestjs": "13.32.0",
-    "@dereekb/rxjs": "13.32.0",
-    "@dereekb/util": "13.32.0",
-    "@dereekb/zoom": "13.32.0",
+    "@dereekb/nestjs": "13.34.0",
+    "@dereekb/rxjs": "13.34.0",
+    "@dereekb/util": "13.34.0",
+    "@dereekb/zoom": "13.34.0",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "express": "^5.2.1"

package/nestjs/src/lib/oauth/oauth.config.d.ts

@@ -1,8 +1,13 @@
 import { type ZoomOAuthConfig, type ZoomOAuthFactoryConfig } from '@dereekb/zoom';
 import { type ConfigService } from '@nestjs/config';
-export interface ZoomOAuthServiceApiConfig extends Omit<ZoomOAuthConfig, 'userRefreshToken' | 'type'> {
-    readonly authEntityType: 'account';
-}
+/**
+ * The environment-facing Zoom OAuth configuration.
+ *
+ * Stays flat, mirroring the ZOOM_* variables it is read from. Previously omitted `userRefreshToken`
+ * and `type`, neither of which exists on {@link ZoomOAuthConfig} — a no-op that would have silently
+ * stripped either key had one ever been added.
+ */
+export type ZoomOAuthServiceApiConfig = ZoomOAuthConfig;
 /**
  * Configuration for ZoomService
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/zoom",
-  "version": "13.32.0",
+  "version": "13.34.0",
   "exports": {
     "./nestjs": {
       "module": "./nestjs/index.esm.js",
@@ -17,9 +17,9 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/nestjs": "13.32.0",
-    "@dereekb/rxjs": "13.32.0",
-    "@dereekb/util": "13.32.0",
+    "@dereekb/nestjs": "13.34.0",
+    "@dereekb/rxjs": "13.34.0",
+    "@dereekb/util": "13.34.0",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "express": "^5.2.1",

package/src/lib/oauth/oauth.config.d.ts

@@ -24,19 +24,84 @@ export interface ZoomOAuthConfig extends ZoomAuthClientIdAndSecretPair, ZoomAcco
 export interface ZoomOAuthFetchFactoryParams {
 }
 export type ZoomOAuthFetchFactory = FactoryWithInput<ConfiguredFetch, ZoomOAuthFetchFactoryParams>;
-export type ZoomOAuthMakeUserAccessTokenFactoryParams = {
+/**
+ * Credential for the app's own (account-level) calls.
+ *
+ * Exchanged as `grant_type=account_credentials`, authenticated with the client pair on
+ * {@link ZoomOAuthConfig}. Unlike Cal.com's api-key equivalent the resulting token DOES expire, so
+ * this arm carries its own cache.
+ */
+export interface ZoomAccountCredential extends ZoomAccountIdRef {
+    readonly accessTokenCache?: Maybe<ZoomAccessTokenCache>;
+}
+/**
+ * Credential for acting as a specific user.
+ *
+ * Exchanged as `grant_type=refresh_token`, authenticated with the same client pair.
+ */
+export interface ZoomRefreshTokenCredential {
     readonly refreshToken: ZoomRefreshToken;
-    readonly userAccessTokenCache?: Maybe<ZoomAccessTokenCache>;
-};
-export type ZoomOAuthMakeUserAccessTokenFactory = FactoryWithRequiredInput<ZoomAccessTokenFactory, ZoomOAuthMakeUserAccessTokenFactoryParams>;
+    /**
+     * Cache for THIS user's access token.
+     *
+     * Must be scoped to the user that owns the refresh token — handing it the account-level cache
+     * would let a user token and the app's own token overwrite each other.
+     */
+    readonly accessTokenCache?: Maybe<ZoomAccessTokenCache>;
+}
+/**
+ * A credential Zoom calls can be made with.
+ *
+ * One union for the app's own calls and for any per-user one; the credential selects the grant.
+ * The client pair authenticates BOTH exchanges and so lives on the config rather than here.
+ */
+export type ZoomAuthCredential = ZoomAccountCredential | ZoomRefreshTokenCredential;
+/**
+ * Returns whether the credential is a {@link ZoomRefreshTokenCredential}.
+ *
+ * Checked before the account arm on purpose: `accountId` is also ambient on {@link ZoomOAuthConfig},
+ * so a credential carrying both reads as a user credential that picked up an accountId — never the
+ * reverse.
+ *
+ * @param credential - The credential to check.
+ * @returns True when the credential carries a refresh token.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */
+export declare function isZoomRefreshTokenCredential(credential: ZoomAuthCredential): credential is ZoomRefreshTokenCredential;
+/**
+ * The ambient credential a {@link ZoomOAuthConfig} authenticates the app's own calls with.
+ *
+ * Zoom's ambient credential is fully determined by the config — there is no choice to configure, so
+ * it is derived here rather than being a settable field.
+ *
+ * @param config - The OAuth configuration.
+ * @returns The account credential for that configuration.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */
+export declare function zoomOAuthConfigAccountCredential(config: ZoomOAuthConfig): ZoomAccountCredential;
+export type ZoomOAuthMakeAccessTokenFactory = FactoryWithRequiredInput<ZoomAccessTokenFactory, ZoomAuthCredential>;
 /**
  * Context used for performing fetch() and fetchJson() calls with a configured fetch instance.
  */
 export interface ZoomOAuthContext {
     readonly fetch: ConfiguredFetch;
     readonly fetchJson: FetchJsonFunction;
+    /**
+     * Resolves the access token for the app's own calls.
+     *
+     * `makeAccessTokenFactory(zoomOAuthConfigAccountCredential(config))`, built once at construction so
+     * its in-memory token tier is shared across the whole context.
+     */
     readonly loadAccessToken: ZoomAccessTokenFactory;
-    readonly makeUserAccessTokenFactory: ZoomOAuthMakeUserAccessTokenFactory;
+    /**
+     * Builds an access token factory for one credential.
+     *
+     * Each returned factory owns its own cache tier, so refreshing one credential never overwrites
+     * another's token.
+     */
+    readonly makeAccessTokenFactory: ZoomOAuthMakeAccessTokenFactory;
     readonly config: ZoomOAuthConfig;
 }
 export interface ZoomOAuthContextRef {
@@ -46,7 +111,3 @@ export interface ZoomOAuthContextRef {
  * @deprecated use ZoomOAuthFetchFactoryParams instead.
  */
 export type ZoomOAuthFetchFactoryInput = ZoomOAuthFetchFactoryParams;
-/**
- * @deprecated use ZoomOAuthMakeUserAccessTokenFactoryParams instead.
- */
-export type ZoomOAuthMakeUserAccessTokenFactoryInput = ZoomOAuthMakeUserAccessTokenFactoryParams;

package/src/lib/oauth/oauth.factory.d.ts

@@ -1,13 +1,30 @@
+import { type FetchHandler } from '@dereekb/util/fetch';
 import { type ZoomOAuthConfig, type ZoomOAuthContextRef, type ZoomOAuthFetchFactory } from './oauth.config';
 import { type LogZoomServerErrorFunction } from '../zoom.error.api';
-import { type ZoomAccessTokenCache, type ZoomAccessTokenFactory, type ZoomAccessTokenRefresher } from './oauth';
+import { type ZoomAccessToken, type ZoomAccessTokenCache, type ZoomAccessTokenFactory, type ZoomAccessTokenRefresher } from './oauth';
 import { type Maybe, type Milliseconds } from '@dereekb/util';
+import { type ZoomOAuthAccessTokenResponse } from './oauth.api';
 export type ZoomOAuth = ZoomOAuthContextRef;
+/**
+ * Maps a {@link ZoomOAuthAccessTokenResponse} to a {@link ZoomAccessToken}.
+ *
+ * @param response - The token response returned by the Zoom token endpoint.
+ * @returns The equivalent ZoomAccessToken, with `expiresAt` resolved against the current time.
+ *
+ * @__NO_SIDE_EFFECTS__
+ */
+export declare function zoomAccessTokenFromTokenResponse(response: ZoomOAuthAccessTokenResponse): ZoomAccessToken;
 export interface ZoomOAuthFactoryConfig {
     /**
      * Creates a new fetch instance to use when making calls.
      */
     readonly fetchFactory?: ZoomOAuthFetchFactory;
+    /**
+     * Custom FetchHandler to use with the default fetchFactory.
+     *
+     * Defaults to a {@link zoomRateLimitedFetchHandler}. Ignored when a `fetchFactory` is provided.
+     */
+    readonly fetchHandler?: Maybe<FetchHandler>;
     /**
      * Custom log error function.
      */

package/src/lib/zoom/zoom.config.d.ts

@@ -1,9 +1,9 @@
-import { type FactoryWithInput, type FactoryWithRequiredInput, type Maybe } from '@dereekb/util';
+import { type FactoryWithInput, type FactoryWithRequiredInput } from '@dereekb/util';
 import { type ConfiguredFetch, type FetchJsonFunction } from '@dereekb/util/fetch';
-import { type ZoomConfig, type ZoomRefreshToken } from '../zoom.config';
+import { type ZoomConfig } from '../zoom.config';
 import { type ZoomRateLimiterRef } from '../zoom.limit';
-import { type ZoomAccessTokenCache, type ZoomAccessTokenStringFactory } from '../oauth/oauth';
-export type ZoomApiKey = ZoomRefreshToken;
+import { type ZoomAccessTokenStringFactory } from '../oauth/oauth';
+import { type ZoomRefreshTokenCredential } from '../oauth/oauth.config';
 export interface ZoomFetchFactoryParams {
     readonly zoomAccessTokenStringFactory: ZoomAccessTokenStringFactory;
 }
@@ -39,22 +39,14 @@ export interface ZoomServerContext extends ZoomContext {
     readonly makeUserContext: ZoomUserContextFactory;
     readonly config: ZoomConfig;
 }
-export interface ZoomUserContextFactoryParams {
-    /**
-     * The user's refresh token.
-     */
-    readonly refreshToken: ZoomRefreshToken;
-    /**
-     * Optional cache to use for the user's access token.
-     *
-     * The cache should only be configured for the user that owns the refresh token.
-     */
-    readonly accessTokenCache?: Maybe<ZoomAccessTokenCache>;
-}
 /**
- * Creates a ZoomUserContext from the input.
+ * Creates a ZoomUserContext from a user's credential.
+ *
+ * Deliberately the refresh-token arm of {@link ZoomAuthCredential} rather than the full union: a
+ * user context acts as a connected user, while the account credential is the app's own identity —
+ * which is the server context's job.
  */
-export type ZoomUserContextFactory = FactoryWithRequiredInput<ZoomUserContext, ZoomUserContextFactoryParams>;
+export type ZoomUserContextFactory = FactoryWithRequiredInput<ZoomUserContext, ZoomRefreshTokenCredential>;
 /**
  * Context used for performing fetch requests for a specific user.
  */
@@ -71,7 +63,3 @@ export interface ZoomServerContextRef {
  * @deprecated use ZoomFetchFactoryParams instead.
  */
 export type ZoomFetchFactoryInput = ZoomFetchFactoryParams;
-/**
- * @deprecated use ZoomUserContextFactoryParams instead.
- */
-export type ZoomUserContextFactoryInput = ZoomUserContextFactoryParams;