fix(twitch): fix setting up own app generator

Author: sogehige

d.ts/src/helpers/socket.d.ts

@@ -3,21 +3,9 @@ import type { AlertInterface, EmitData } from '@entity/alert';
 import type { BetsInterface } from '@entity/bets';
 import type { CacheTitlesInterface } from '@entity/cacheTitles';
 import type { ChecklistInterface } from '@entity/checklist';
-
-import { AliasGroup, Alias } from '~/database/entity/alias';
-
 import type { CommandsCountInterface, CommandsGroupInterface, CommandsInterface } from '@entity/commands';
-
-import { CacheGamesInterface } from '~/database/entity/cacheGames';
-
 import type { CooldownInterface } from '@entity/cooldown';
-
-import { Plugin } from '~/database/entity/plugins';
-
 import type { EventInterface, Events } from '@entity/event';
-
-import { MenuItem } from '~/helpers/panel';
-
 import type { EventListInterface } from '@entity/eventList';
 import type { GalleryInterface } from '@entity/gallery';
 import type { HighlightInterface } from '@entity/highlight';
@@ -47,6 +35,11 @@ import { FindConditions } from 'typeorm';
 import { QuickActions } from '../../../src/database/entity/dashboard';
 import { WidgetCustomInterface, WidgetSocialInterface } from '../../../src/database/entity/widget';
 
+import { AliasGroup, Alias } from '~/database/entity/alias';
+import { CacheGamesInterface } from '~/database/entity/cacheGames';
+import { Plugin } from '~/database/entity/plugins';
+import { MenuItem } from '~/helpers/panel';
+
 type Configuration = {
   [x:string]: Configuration | string;
 };
@@ -295,6 +288,7 @@ export type ClientToServerEventsWithNamespace = {
     'broadcaster': (cb: (error: Error | string | null, username: string) => void) => void,
     'twitch::revoke': (data: { accountType: 'bot' | 'broadcaster' }, cb: (err: Error | string | null) => void) => void,
     'twitch::token': (data: { accessToken: string, refreshToken: string, accountType: 'bot' | 'broadcaster' }, cb: (err: Error | string | null) => void) => void,
+    'twitch::token::ownApp': (data: { accessToken: string, refreshToken: string, accountType: 'bot' | 'broadcaster', clientId: string, clientSecret: string }, cb: (err: Error | string | null) => void) => void,
   },
   '/core/socket': GenericEvents & {
     'purgeAllConnections': (cb: (error: Error | string | null) => void, socket?: Socket) => void,

src/services/twitch.ts

@@ -5,14 +5,6 @@ import { dayjs, timezone } from '@sogebot/ui-helpers/dayjsHelper';
 import { getTime } from '@sogebot/ui-helpers/getTime';
 import { capitalize } from 'lodash';
 
-import {
-  command, default_permission, example, persistent, settings,
-} from '../decorators';
-import { onChange, onLoad, onStartup, onStreamStart } from '../decorators/on';
-import Expects from '../expects';
-import emitter from '../helpers/interfaceEmitter';
-import { debug, error, info } from '../helpers/log';
-import users from '../users';
 import Service from './_interface';
 import { init as apiIntervalInit, stop as apiIntervalStop } from './twitch/api/interval';
 import { createClip } from './twitch/calls/createClip';
@@ -22,6 +14,14 @@ import EventSub from './twitch/eventsub';
 import PubSub from './twitch/pubsub';
 import { cleanErrors } from './twitch/token/refresh';
 import { cache, validate } from './twitch/token/validate';
+import {
+  command, default_permission, example, persistent, settings,
+} from '../decorators';
+import { onChange, onLoad, onStartup, onStreamStart } from '../decorators/on';
+import Expects from '../expects';
+import emitter from '../helpers/interfaceEmitter';
+import { debug, error, info } from '../helpers/log';
+import users from '../users';
 
 import { AppDataSource } from '~/database';
 import {
@@ -387,8 +387,23 @@ class Twitch extends Service {
       emitter.emit('set', '/services/twitch', `tokenService`, 'SogeBot Token Generator v2');
       emitter.emit('set', '/services/twitch', `${accountType}RefreshToken`, refreshToken);
       emitter.emit('set', '/services/twitch', `${accountType}AccessToken`, accessToken);
-      await validate(accountType);
-      cb(null);
+      emitter.emit('set', '/services/twitch', `${accountType}TokenValid`, true);
+      await validate(accountType, 0, true);
+      setTimeout(async () => {
+        cb(null);
+      }, 1000);
+    });
+    adminEndpoint('/services/twitch', 'twitch::token::ownApp', async ({ accessToken, refreshToken, accountType, clientId, clientSecret }, cb) => {
+      emitter.emit('set', '/services/twitch', `tokenService`, 'Own Twitch App');
+      emitter.emit('set', '/services/twitch', `${accountType}AccessToken`, accessToken);
+      emitter.emit('set', '/services/twitch', `${accountType}RefreshToken`, refreshToken);
+      emitter.emit('set', '/services/twitch', `tokenServiceCustomClientId`, clientId);
+      emitter.emit('set', '/services/twitch', `tokenServiceCustomClientSecret`, clientSecret);
+      emitter.emit('set', '/services/twitch', `${accountType}TokenValid`, true);
+      await validate(accountType, 0, true);
+      setTimeout(async () => {
+        cb(null);
+      }, 1000);
     });
   }
 

src/services/twitch/token/validate.ts

@@ -2,10 +2,10 @@ import * as constants from '@sogebot/ui-helpers/constants';
 import { Mutex } from 'async-mutex';
 import axios from 'axios';
 
+import { refresh } from './refresh';
 import { setStatus } from '../../../helpers/parser';
 import { tmiEmitter } from '../../../helpers/tmi';
 import client from '../api/client';
-import { refresh } from './refresh';
 
 import emitter from '~/helpers/interfaceEmitter';
 import {
@@ -49,7 +49,7 @@ const mutex = new Mutex();
       "user_id": "<authorized user ID>"
     }
   */
-export const validate = async (type: 'bot' | 'broadcaster', retry = 0): Promise < boolean > => {
+export const validate = async (type: 'bot' | 'broadcaster', retry = 0, force = false): Promise < boolean > => {
   const release = await mutex.acquire();
   try {
     debug('oauth.validate', `Validation: ${type} - ${retry} retries`);
@@ -62,7 +62,7 @@ export const validate = async (type: 'bot' | 'broadcaster', retry = 0): Promise
     }
 
     let token: string | null;
-    if (expirationDate[type] - Date.now() > 5 * constants.MINUTE && expirationDate[type] !== -1) {
+    if (!force && expirationDate[type] - Date.now() > 5 * constants.MINUTE && expirationDate[type] !== -1) {
       debug('oauth.validate', `Skipping refresh token for ${type}, expiration time: ${new Date(expirationDate[type]).toISOString()}`);
       return true;
     } else {