3 Commits
Author SHA1 Message Date
sugoidogo a27f8804e4 fix type error part 2
docker.yml / build (push) Successful in 46s
2026-08-02 04:18:24 -07:00
sugoidogo 2788275d25 fix type error
docker.yml / build (push) Failing after 39s
2026-08-02 04:15:36 -07:00
sugoidogo 2265fd39e0 always ensure userId is present on tokens
docker.yml / build (push) Failing after 35s
2026-08-02 04:11:11 -07:00
+11 -5
View File
@@ -2,12 +2,18 @@ import type { AccessTokenMaybeWithUserId, AccessTokenWithUserId, AuthProvider }
import type { UserIdResolvable } from "@twurple/api"
import * as TwitchAuth from "./TwitchAuth";
async function getTwurpleProxy(token: TwitchAuth.TwitchToken): Promise<AccessTokenWithUserId> {
async function ensureUserId(token: TwitchAuth.TwitchToken | null): Promise<TwitchAuth.TwitchToken | null> {
if (!token) return null
if (!token.user_id) {
const refresh_token = token.refresh_token
token = await TwitchAuth.validateToken(token.access_token)
token.refresh_token = refresh_token
}
return token
}
async function getTwurpleProxy(token: TwitchAuth.TwitchToken): Promise<AccessTokenWithUserId> {
token=await ensureUserId(token)
return new Proxy(token, {
get(target, name, receiver) {
return target[name.toString().replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`) as keyof TwitchAuth.TwitchToken]
@@ -16,12 +22,12 @@ async function getTwurpleProxy(token: TwitchAuth.TwitchToken): Promise<AccessTok
}
export class SugoiAuthProvider implements AuthProvider {
#token: TwitchAuth.TwitchToken | Promise<TwitchAuth.TwitchToken | null> | null = null;
#token: TwitchAuth.TwitchToken | Promise<TwitchAuth.TwitchToken> | Promise<TwitchAuth.TwitchToken | null> | null = null;
clientId: string;
constructor(clientId:string,proxyOrigin?:string) {
this.clientId = clientId;
if (proxyOrigin) TwitchAuth.setProxyOrigin(proxyOrigin);
this.#token=TwitchAuth.getUserTokenPassive(clientId).catch()
this.#token = TwitchAuth.getUserTokenPassive(clientId).then(ensureUserId)
}
#authorize(scopes: string[]) {
const promise = TwitchAuth.requestAuthCode(this.clientId, ...scopes)
@@ -61,8 +67,8 @@ export class SugoiAuthProvider implements AuthProvider {
const token=await this.#token
if (!token) throw new Error("unauthorized")
if (!token.refresh_token) throw new Error("missing refresh token")
this.#token = await TwitchAuth.refreshToken(this.clientId, token.refresh_token)
return getTwurpleProxy(this.#token)
this.#token = await TwitchAuth.refreshToken(this.clientId, token.refresh_token).then(ensureUserId)
return getTwurpleProxy(this.#token!)
}
}