From e4cff467714d256bb4851db3a401ea86858fa28e Mon Sep 17 00:00:00 2001
From: alexbcberio <alexbcberio@gmail.com>
Date: Sat, 19 Jun 2021 23:52:39 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Extract=20ClientCredential?=
 =?UTF-8?q?s=20and=20add=20return=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/helpers/twitch.ts       | 12 ++++--------
 src/interfaces/ClientCredentials.ts |  4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 src/interfaces/ClientCredentials.ts

diff --git a/src/backend/helpers/twitch.ts b/src/backend/helpers/twitch.ts
index 04181dd..66a9698 100644
--- a/src/backend/helpers/twitch.ts
+++ b/src/backend/helpers/twitch.ts
@@ -2,6 +2,7 @@ import { AccessToken, RefreshableAuthProvider, StaticAuthProvider } from "twitch
 import { getTokenData, saveTokenData } from "./tokenData";
 
 import { ApiClient } from "twitch";
+import { ClientCredentials } from "../../interfaces/ClientCredentials";
 import { TokenData } from "../../interfaces/TokenData";
 
 const LOG_PREFIX = "[Twitch] ";
@@ -14,11 +15,6 @@ export {
   getUsernameFromId
 }
 
-interface ClientCredentials {
-  clientId: string;
-  clientSecret: string;
-}
-
 function getClientCredentials(): ClientCredentials {
   if (
     !process.env.TWITCH_CLIENT_ID ||
@@ -68,7 +64,7 @@ async function getAuthProvider(): Promise<RefreshableAuthProvider> {
 			expiry,
       onRefresh: onRefresh
     }
-  ) as RefreshableAuthProvider;
+  );
 
   return refreshAuthProvider;
 }
@@ -90,13 +86,13 @@ async function onRefresh(refreshData: AccessToken): Promise<void> {
   await saveTokenData(newTokenData);
 }
 
-async function getApiClient() {
+async function getApiClient(): Promise<ApiClient> {
   const authProvider = await getAuthProvider();
 
   return await new ApiClient({ authProvider });
 }
 
-async function getUsernameFromId(userId: number) {
+async function getUsernameFromId(userId: number): Promise<string | null> {
   const apiClient = await getApiClient();
   const user = await apiClient.helix.users.getUserById(userId);
 
diff --git a/src/interfaces/ClientCredentials.ts b/src/interfaces/ClientCredentials.ts
new file mode 100644
index 0000000..96cc9e4
--- /dev/null
+++ b/src/interfaces/ClientCredentials.ts
@@ -0,0 +1,4 @@
+export interface ClientCredentials {
+  clientId: string;
+  clientSecret: string;
+}
\ No newline at end of file