fix(twitch-auth): update to newer passport-twitch package

Fixes mjangir#14

.prettierrc

@@ -2,5 +2,6 @@
   "trailingComma": "es5",
   "semi": true,
   "singleQuote": true,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "endOfLine": "crlf"
 }

package.json

@@ -10,7 +10,7 @@
     "test": "lerna run test --",
     "build": "lerna run build",
     "prepublish": "lerna run prepublish",
-    "format": "prettier --write 'website/src/**/*.{ts,tsx,js,jsx,md,mdx}' 'website/docs/**/*.{md,mdx}' 'packages/*/src/**/*' 'README.md'",
+    "format": "prettier --write website/src/**/*.{ts,tsx,js,jsx,md,mdx} website/docs/**/*.{md,mdx} packages/*/src/**/* README.md",
     "changeset": "changeset",
     "release": "changeset publish",
     "postinstall": "husky install",

packages/nestjs-hybrid-auth-twitch/package.json

@@ -42,10 +42,9 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
+    "@hewmen/passport-twitch": "^1.0.4",
     "@nestjs-hybrid-auth/core": "^1.0.0",
     "@types/lodash": "^4.14.174",
-    "@types/passport-twitch-latest": "^1.0.1",
-    "lodash": "^4.17.21",
-    "passport-twitch-latest": "^1.0.0"
+    "lodash": "^4.17.21"
   }
 }

packages/nestjs-hybrid-auth-twitch/src/twitch.strategy.ts

@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
-import { Strategy } from 'passport-twitch-latest';
+import { Strategy } from '@hewmen/passport-twitch';
 import { merge } from 'lodash';
 import { TwitchAuthModuleOptions, TwitchAuthResult } from './twitch.types';
 import { TWITCH_HYBRID_AUTH_OPTIONS } from './twitch.constants';

packages/nestjs-hybrid-auth-twitch/src/twitch.types.ts

@@ -1,9 +1,18 @@
 import { Request } from 'express';
-import {
-  StrategyOptions,
-  StrategyOptionsWithRequest,
-  TwitchProfile,
-} from 'passport-twitch-latest';
+
+import * as PassportOauth2 from 'passport-oauth2';
+
+type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
+
+type StrategyOptions = Optional<
+  PassportOauth2.StrategyOptions,
+  'authorizationURL' | 'tokenURL'
+>;
+
+type StrategyOptionsWithRequest = Optional<
+  PassportOauth2.StrategyOptionsWithRequest,
+  'authorizationURL' | 'tokenURL'
+>;
 
 type TwitchAuthStrategyOptionsWithoutRequest = {
   [K in keyof StrategyOptions]: StrategyOptions[K];
@@ -30,6 +39,21 @@ export interface TwitchAuthModuleOptionsFactory {
     | TwitchAuthModuleOptions;
 }
 
+interface TwitchProfile {
+  broadcaster_type: 'partner' | 'affiliate' | '';
+  description: string;
+  display_name: string;
+  id: string;
+  login: string;
+  offline_image_url: string;
+  profile_image_url: string;
+  type: 'staff' | 'admin' | 'global_mod' | '';
+  view_count: number;
+  email?: string;
+  created_at: string;
+  provider: string;
+}
+
 export interface TwitchAuthResult {
   originalRequest: Request;
   accessToken: string;

tsconfig.json

@@ -5,6 +5,6 @@
     "allowJs": false,
     "baseUrl": ".",
     "typeRoots": ["./node_modules/@types", "./types"],
-    "types": ["passport-twitch-latest"]
+    "types": []
   }
 }