move InvalidTokenTypeError to twitch-auth and use it more

twurple · Dec 6, 2020 · 5caccae · 5caccae
1 parent 8c1442a
commit 5caccae
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/...witch/src/Errors/InvalidTokenTypeError.ts → ...-auth/src/Errors/InvalidTokenTypeError.ts b/...witch/src/Errors/InvalidTokenTypeError.ts → ...-auth/src/Errors/InvalidTokenTypeError.ts
diff --git a/packages/twitch-auth/src/index.ts b/packages/twitch-auth/src/index.ts
@@ -20,6 +20,7 @@ export type { RefreshConfig } from './AuthProvider/RefreshableAuthProvider';
 export { StaticAuthProvider } from './AuthProvider/StaticAuthProvider';
 
 export { InvalidTokenError } from './Errors/InvalidTokenError';
+export { InvalidTokenTypeError } from './Errors/InvalidTokenTypeError';
 
 // twitch-auth@^1 compat
 export { getAppAccessToken, getUserAccessToken, refreshUserAccessToken } from './legacy';

diff --git a/packages/twitch-chat-client/src/ChatClient.ts b/packages/twitch-chat-client/src/ChatClient.ts
@@ -6,9 +6,8 @@ import { delay, Enumerable } from '@d-fischer/shared-utils';
 import type { Listener } from '@d-fischer/typed-event-emitter';
 import { IrcClient, MessageTypes } from 'ircv3';
 import type { CommercialLength } from 'twitch';
-import { InvalidTokenError, InvalidTokenTypeError } from 'twitch';
+import { getTokenInfo, InvalidTokenError, InvalidTokenTypeError } from 'twitch-auth';
 import type { AuthProvider, AccessToken } from 'twitch-auth';
-import { getTokenInfo } from 'twitch-auth';
 import { TwitchCommandsCapability } from './Capabilities/TwitchCommandsCapability';
 import { ClearChat } from './Capabilities/TwitchCommandsCapability/MessageTypes/ClearChat';
 import { HostTarget } from './Capabilities/TwitchCommandsCapability/MessageTypes/HostTarget';

diff --git a/packages/twitch-eventsub/src/EventSubListener.ts b/packages/twitch-eventsub/src/EventSubListener.ts
@@ -6,6 +6,7 @@ import type { Request, RequestHandler } from 'httpanda';
 import { Server } from 'httpanda';
 import type { ApiClient, HelixEventSubSubscription, UserIdResolvable } from 'twitch';
 import { extractUserId } from 'twitch';
+import { InvalidTokenTypeError } from 'twitch-auth';
 import type { ConnectionAdapter } from './Adapters/ConnectionAdapter';
 import type { ConnectCompatibleApp } from './ConnectCompatibleApp';
 import type { EventSubStreamOfflineEvent } from './Events/EventSubStreamOfflineEvent';
@@ -64,7 +65,7 @@ export class EventSubListener {
 	 */
 	constructor(apiClient: ApiClient, adapter: ConnectionAdapter, secret: string, config: EventSubConfig = {}) {
 		if (apiClient.tokenType !== 'app') {
-			throw new Error(
+			throw new InvalidTokenTypeError(
 				'EventSub requires app access tokens to work; please use the ClientCredentialsAuthProvider in your API client.'
 			);
 		}

diff --git a/packages/twitch-pubsub-client/src/PubSubClient.ts b/packages/twitch-pubsub-client/src/PubSubClient.ts
@@ -1,7 +1,7 @@
 import { Enumerable } from '@d-fischer/shared-utils';
 import type { ApiClient, UserIdResolvable } from 'twitch';
 import { extractUserId } from 'twitch';
-import { getValidTokenFromProvider } from 'twitch-auth';
+import { getValidTokenFromProvider, InvalidTokenTypeError } from 'twitch-auth';
 import { BasicPubSubClient } from './BasicPubSubClient';
 import type { PubSubBitsBadgeUnlockMessage } from './Messages/PubSubBitsBadgeUnlockMessage';
 import type { PubSubBitsMessage } from './Messages/PubSubBitsMessage';
@@ -46,7 +46,7 @@ export class PubSubClient {
 			userId = extractUserId(user);
 		} else {
 			if (apiClient.tokenType === 'app') {
-				throw new Error(
+				throw new InvalidTokenTypeError(
 					'App tokens are not supported by PubSubClient; you need to pass authentication representing a user.'
 				);
 			}

diff --git a/packages/twitch/src/index.ts b/packages/twitch/src/index.ts
@@ -132,7 +132,6 @@ export type { CheermoteDisplayInfo } from './API/Shared/BaseCheermoteList';
 
 export { ConfigError } from './Errors/ConfigError';
 export { HellFreezesOverError } from './Errors/HellFreezesOverError';
-export { InvalidTokenTypeError } from './Errors/InvalidTokenTypeError';
 export { NoSubscriptionProgramError } from './Errors/NoSubscriptionProgramError';
 export { StreamNotLiveError } from './Errors/StreamNotLiveError';
 
@@ -154,6 +153,7 @@ export type { TwitchApiCallOptions as TwitchAPICallOptions } from 'twitch-api-ca
 export {
 	AccessToken,
 	InvalidTokenError,
+	InvalidTokenTypeError,
 	StaticAuthProvider,
 	ClientCredentialsAuthProvider,
 	RefreshableAuthProvider,