refactor: typescript
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -1,120 +0,0 @@
|
||||
import * as TwitchAuth from "./TwitchAuth.mjs";
|
||||
|
||||
function getTwurpleProxy(token){
|
||||
return new Proxy(token,{
|
||||
get(target, name, receiver){
|
||||
return target[name.toString().replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`)]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {import("./TwitchAuth.mjs").TwitchToken} token
|
||||
* @param {...string} scopes
|
||||
*/
|
||||
function hasScopes(token,...scopes){
|
||||
if(!token){
|
||||
return false
|
||||
}
|
||||
if(!scopes){
|
||||
return true
|
||||
}
|
||||
for(const scope of scopes){
|
||||
if(!token.scope.includes(scope)){
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
export default class SugoiAuthProvider {
|
||||
|
||||
/** @type {TwitchToken} */
|
||||
#token;
|
||||
|
||||
/** @type {String} */
|
||||
clientId;
|
||||
|
||||
constructor(client_id){
|
||||
this.clientId=client_id
|
||||
}
|
||||
|
||||
#setToken=(token)=>{
|
||||
this.#token=token
|
||||
return token
|
||||
}
|
||||
|
||||
/**
|
||||
* get a new token
|
||||
* @param {String[]} scopes
|
||||
* @returns {Promise<import("./TwitchAuth.mjs").TwitchToken>}
|
||||
*/
|
||||
async addUser(...scopes){
|
||||
this.#token=TwitchAuth.getUserToken(this.clientId,...scopes).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
|
||||
/**
|
||||
* use an existing token
|
||||
* @param {import("./TwitchAuth.mjs").TwitchToken} token
|
||||
* @returns {import("./TwitchAuth.mjs").TwitchToken}
|
||||
*/
|
||||
async addUserForToken(token){
|
||||
if(token.refresh_token){
|
||||
this.#token=TwitchAuth.refreshToken(token.refresh_token).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
this.#token=TwitchAuth.validateToken(token.access_token).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
|
||||
removeUser(){
|
||||
this.#token=null
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {String|Number} user
|
||||
* @param {String[][]} scopeSets
|
||||
* @returns {Promise<import("./TwitchAuth.mjs").TwitchToken | null>}
|
||||
*/
|
||||
async getAccessTokenForUser(user,...scopeSets){
|
||||
if((!scopeSets[0]) && (this.#token)){
|
||||
return this.#token
|
||||
}
|
||||
for(const scopes of scopeSets){
|
||||
if(hasScopes(this.#token,...scopes)){
|
||||
return this.#token
|
||||
}
|
||||
}
|
||||
this.#token=TwitchAuth.getUserTokenPassive(this.clientId,...(scopeSets[0]||[])).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {String|Number} user
|
||||
* @returns {Promise<import("./TwitchAuth.mjs").TwitchToken>}
|
||||
*/
|
||||
getAnyAccessToken(user){
|
||||
return this.#token || TwitchAuth.getAppToken(this.clientId)
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {String|Number} user
|
||||
* @returns {String[]}
|
||||
*/
|
||||
getCurrentScopesForUser(user){
|
||||
if(!this.#token || this.#token instanceof Promise){
|
||||
return []
|
||||
}
|
||||
return this.#token.scope
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {String|Number} user
|
||||
* @returns {Promise<import("./TwitchAuth.mjs").TwitchToken>}
|
||||
*/
|
||||
async refreshAccessTokenForUser(user){
|
||||
this.#token=TwitchAuth.refreshToken(this.#token.refresh_token).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
import * as TwitchAuth from "./TwitchAuth.ts";
|
||||
import { AccessTokenMaybeWithUserId, AuthProvider, AccessToken, AccessTokenWithUserId } from "@twurple/auth";
|
||||
|
||||
type Token = TwitchAuth.TwitchToken & AccessTokenMaybeWithUserId
|
||||
|
||||
function getTwurpleProxy(token: TwitchAuth.TwitchToken): Token {
|
||||
return new Proxy(token, {
|
||||
get(target, name, receiver) {
|
||||
return target[name.toString().replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`)]
|
||||
}
|
||||
}) as Token
|
||||
}
|
||||
|
||||
function hasScopes(token: Token, ...scopes: string[]) {
|
||||
if (!token) {
|
||||
return false
|
||||
}
|
||||
if (!scopes) {
|
||||
return true
|
||||
}
|
||||
for (const scope of scopes) {
|
||||
if (!token.scope.includes(scope)) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
export default class SugoiAuthProvider implements AuthProvider {
|
||||
|
||||
#token: Token
|
||||
clientId: string;
|
||||
|
||||
constructor(client_id: string) {
|
||||
this.clientId = client_id
|
||||
}
|
||||
|
||||
#setToken = (token: Token) => {
|
||||
this.#token = token
|
||||
return token
|
||||
}
|
||||
|
||||
async addUser(...scopes: string[]) {
|
||||
this.#token = await TwitchAuth.getUserToken(this.clientId, ...scopes).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
|
||||
async addUserForToken(token: TwitchAuth.TwitchToken) {
|
||||
if (token.refresh_token) {
|
||||
this.#token = await TwitchAuth.refreshToken(this.clientId, token.refresh_token).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
this.#token = await TwitchAuth.validateToken(token.access_token).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token
|
||||
}
|
||||
|
||||
removeUser() {
|
||||
this.#token = null
|
||||
}
|
||||
|
||||
async getAccessTokenForUser(user: string | number, ...scopeSets: string[][]) {
|
||||
if ((!scopeSets[0]) && (this.#token)) {
|
||||
return this.#token as AccessTokenWithUserId
|
||||
}
|
||||
for (const scopes of scopeSets) {
|
||||
if (hasScopes(this.#token, ...scopes)) {
|
||||
return this.#token as AccessTokenWithUserId
|
||||
}
|
||||
}
|
||||
this.#token = await TwitchAuth.getUserTokenPassive(this.clientId, ...(scopeSets[0] || [])).then(getTwurpleProxy).then(this.#setToken)
|
||||
return this.#token as AccessTokenWithUserId
|
||||
}
|
||||
|
||||
async getAnyAccessToken(user: string | number) {
|
||||
return this.#token || TwitchAuth.getAppToken(this.clientId).then(getTwurpleProxy)
|
||||
}
|
||||
|
||||
getCurrentScopesForUser(user: string | number) {
|
||||
if (!this.#token || this.#token instanceof Promise) {
|
||||
return []
|
||||
}
|
||||
return this.#token.scope
|
||||
}
|
||||
|
||||
async refreshAccessTokenForUser(user: string | number) {
|
||||
this.#token = await TwitchAuth.refreshToken(this.clientId, this.#token.refresh_token).then(this.#setToken)
|
||||
return this.#token as AccessTokenWithUserId
|
||||
}
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -1,27 +1,25 @@
|
||||
import fetch_retry from 'https://cdn.jsdelivr.net/npm/fetch-retry/+esm'
|
||||
import fetch_retry from 'fetch-retry'
|
||||
const fetch = fetch_retry(globalThis.fetch, {
|
||||
retries: 10,
|
||||
retryDelay: attempts => attempts * 1000
|
||||
})
|
||||
|
||||
/**
|
||||
* @typedef {Object} TwitchToken
|
||||
* @property {String} access_token
|
||||
* @property {Number} expires_in
|
||||
* @property {Number} obtainment_timestamp
|
||||
* @property {String} token_type
|
||||
* @property {Number} [user_id]
|
||||
* @property {Array<String>} [scope]
|
||||
* @property {String} [refresh_token]
|
||||
* @property {String} [login]
|
||||
* @property {String} [client_id]
|
||||
*/
|
||||
export interface TwitchToken {
|
||||
access_token: string
|
||||
expires_in: number
|
||||
obtainment_timestamp: number
|
||||
token_type: string
|
||||
user_id?: number
|
||||
scope?: Array<string>
|
||||
refresh_token?: string
|
||||
login?: string
|
||||
client_id?: string
|
||||
}
|
||||
|
||||
/**
|
||||
* @typedef {Object} AuthCode
|
||||
* @property {String} code
|
||||
* @property {String} scope
|
||||
*/
|
||||
export interface AuthCode {
|
||||
code: string
|
||||
scope: string
|
||||
}
|
||||
|
||||
const redirect_uri = location.origin + location.pathname
|
||||
const proxy_uri = new URL('/oauth2/token', import.meta.url)
|
||||
@@ -31,17 +29,17 @@ const proxy_uri = new URL('/oauth2/token', import.meta.url)
|
||||
* @param {TwitchToken} token
|
||||
* @returns {TwitchToken}
|
||||
*/
|
||||
function stamp(token) {
|
||||
function stamp(token: TwitchToken): TwitchToken {
|
||||
token.obtainment_timestamp = Date.now()
|
||||
return token
|
||||
}
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#client-credentials-grant-flow
|
||||
* @param {String} client_id
|
||||
* @param {string} client_id
|
||||
* @returns {Promise<TwitchToken>}
|
||||
*/
|
||||
export function getAppToken(client_id) {
|
||||
export function getAppToken(client_id: string): Promise<TwitchToken> {
|
||||
const searchParams = new URLSearchParams({
|
||||
client_id: client_id,
|
||||
grant_type: 'client_credentials'
|
||||
@@ -61,11 +59,11 @@ export function getAppToken(client_id) {
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#implicit-grant-flow
|
||||
* @param {String} client_id
|
||||
* @param {Array<String>|String} scopes
|
||||
* @param {string} client_id
|
||||
* @param {Array<string>|string} scopes
|
||||
* @returns {Promise<AuthCode>}
|
||||
*/
|
||||
export function requestAccessToken(client_id, ...scopes) {
|
||||
export function requestAccessToken(client_id: string, ...scopes: Array<string>) {
|
||||
console.debug('requesting access token')
|
||||
const url = new URL('https://id.twitch.tv/oauth2/authorize')
|
||||
url.searchParams.append('response_type', 'token')
|
||||
@@ -76,11 +74,11 @@ export function requestAccessToken(client_id, ...scopes) {
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#get-the-user-to-authorize-your-app
|
||||
* @param {String} client_id
|
||||
* @param {Array<String>|String} scopes
|
||||
* @param {string} client_id
|
||||
* @param {Array<string>|string} scopes
|
||||
* @returns {Promise<AuthCode>}
|
||||
*/
|
||||
export function requestAuthCode(client_id, ...scopes) {
|
||||
export function requestAuthCode(client_id: string, ...scopes: Array<string>): Promise<any> {
|
||||
console.debug('requesting authorization code')
|
||||
const url = new URL('https://id.twitch.tv/oauth2/authorize')
|
||||
url.searchParams.append('response_type', 'code')
|
||||
@@ -92,11 +90,11 @@ export function requestAuthCode(client_id, ...scopes) {
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#use-the-authorization-code-to-get-a-token
|
||||
* @param {String} client_id
|
||||
* @param {String} code
|
||||
* @param {string} client_id
|
||||
* @param {string} code
|
||||
* @returns {Promise<TwitchToken>}
|
||||
*/
|
||||
export function exchangeCode(client_id, code) {
|
||||
export function exchangeCode(client_id: string, code: string): Promise<TwitchToken> {
|
||||
console.debug('exchanging authorization code')
|
||||
const searchParams = new URLSearchParams({
|
||||
client_id: client_id,
|
||||
@@ -118,10 +116,10 @@ export function exchangeCode(client_id, code) {
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/validate-tokens/#how-to-validate-a-token
|
||||
* @param {String} access_token
|
||||
* @param {string} access_token
|
||||
* @returns {TwitchToken}
|
||||
*/
|
||||
export function validateToken(access_token) {
|
||||
export async function validateToken(access_token: string): Promise<TwitchToken> {
|
||||
console.debug('validating token')
|
||||
return fetch('https://id.twitch.tv/oauth2/validate', {
|
||||
headers: { authorization: 'OAuth ' + access_token }
|
||||
@@ -130,7 +128,7 @@ export function validateToken(access_token) {
|
||||
throw new Error(await response.text())
|
||||
}
|
||||
/** @type {TwitchToken} */
|
||||
const token = await response.json()
|
||||
const token: any = await response.json()
|
||||
token.access_token = access_token
|
||||
token.scope = token.scopes
|
||||
delete token.scopes
|
||||
@@ -141,11 +139,11 @@ export function validateToken(access_token) {
|
||||
|
||||
/**
|
||||
* https://dev.twitch.tv/docs/authentication/refresh-tokens/#how-to-use-a-refresh-token
|
||||
* @param {String} client_id
|
||||
* @param {String} refresh_token
|
||||
* @param {string} client_id
|
||||
* @param {string} refresh_token
|
||||
* @returns {Promise<TwitchToken>}
|
||||
*/
|
||||
export function refreshToken(client_id, refresh_token) {
|
||||
export function refreshToken(client_id: string, refresh_token: string): Promise<TwitchToken> {
|
||||
console.debug('refreshing token')
|
||||
const searchParams = new URLSearchParams({
|
||||
client_id: client_id,
|
||||
@@ -169,10 +167,10 @@ export function refreshToken(client_id, refresh_token) {
|
||||
* refresh token, access token, or error message, in that order,
|
||||
* and if it finds none of those, starts the auth code grant flow.
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#authorization-code-grant-flow
|
||||
* @param {String} client_id
|
||||
* @param {string} client_id
|
||||
* @returns {TwitchToken}
|
||||
*/
|
||||
export async function getUserToken(client_id, ...scopes) {
|
||||
export async function getUserToken(client_id: string, ...scopes): Promise<TwitchToken> {
|
||||
const token=await getUserTokenPassive(client_id, ...scopes)
|
||||
if(!token){
|
||||
return requestAuthCode(client_id, ...scopes)
|
||||
@@ -184,10 +182,10 @@ export async function getUserToken(client_id, ...scopes) {
|
||||
* This function checks the url search parameters and hash for an auth code,
|
||||
* refresh token, access token, or error message, in that order.
|
||||
* https://dev.twitch.tv/docs/authentication/getting-tokens-oauth/#authorization-code-grant-flow
|
||||
* @param {String} client_id
|
||||
* @param {string} client_id
|
||||
* @returns {TwitchToken}
|
||||
*/
|
||||
export function getUserTokenPassive(client_id, ...scopes){
|
||||
export async function getUserTokenPassive(client_id: string, ...scopes): Promise<TwitchToken>{
|
||||
console.debug('scopes requested:',...scopes)
|
||||
const params = new URLSearchParams(location.search + '&' + location.hash.substring(1))
|
||||
if (params.has('code')) {
|
||||
@@ -0,0 +1,3 @@
|
||||
var d=i=>{throw TypeError(i)};var o=(i,t,h)=>t.has(i)||d("Cannot "+h);var n=(i,t,h)=>(o(i,t,"read from private field"),h?h.call(i):t.get(i)),c=(i,t,h)=>t.has(i)?d("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(i):t.set(i,h),u=(i,t,h,e)=>(o(i,t,"write to private field"),e?e.call(i,h):t.set(i,h),h);var l,r,a,s,w=class{constructor(t,h=(e,f)=>globalThis.fetch(e,f)){c(this,l,new URL(import.meta.url).origin);c(this,r,null);c(this,a,null);c(this,s,null);u(this,s,h),u(this,r,t),t.getAccessTokenForUser(void 0).then(e=>caches.open(e.userId+"/"+t.clientId)).then(e=>u(this,a,e))}async fetch(t,h={}){if(t=new URL(t,n(this,l)),t.origin==n(this,l)){let e=await n(this,r).getAccessTokenForUser(void 0);h.headers||(h.headers={}),h.headers.authorization="OAuth "+e.accessToken}if("method"in h)switch(h.method){case"PUT":case"POST":{let e=await n(this,s).call(this,t,h);if(!e.ok)return e;let f=await new Request(t,h).blob();return n(this,a).put(t,new Response(f)),e}case"DELETE":{let e=await n(this,s).call(this,t,h);return e.ok&&n(this,a).delete(t),e}}return n(this,s).call(this,t,h).then(async e=>{if(e.status>=500)throw new Error(e.statusText+`
|
||||
`+await e.text());return n(this,a).put(t,e.clone()),e}).catch(e=>(console.warn(e),n(this,a).match(t)))}};l=new WeakMap,r=new WeakMap,a=new WeakMap,s=new WeakMap;export{w as default};
|
||||
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiV2ViU3RvcmFnZS50cyJdLAogICJtYXBwaW5ncyI6ICIyVUFBQSxJQUFBQSxFQUFBQyxFQUFBQyxFQUFBQyxFQU9xQkMsRUFBckIsS0FBZ0MsQ0FlNUIsWUFBWUMsRUFBcURDLEVBQWlDLENBQUNDLEVBQVNDLElBQWtCLFdBQVcsTUFBTUQsRUFBU0MsQ0FBTyxFQUFJLENBYm5LQyxFQUFBLEtBQUFULEVBQVUsSUFBSSxJQUFJLFlBQVksR0FBRyxFQUFFLFFBQ25DUyxFQUFBLEtBQUFSLEVBQXVELE1BQ3ZEUSxFQUFBLEtBQUFQLEVBQWdCLE1BQ2hCTyxFQUFBLEtBQUFOLEVBQWtDLE1BVzlCTyxFQUFBLEtBQUtQLEVBQVNHLEdBQ2RJLEVBQUEsS0FBS1QsRUFBaUJJLEdBQ3RCQSxFQUFjLHNCQUFzQixNQUFTLEVBQ3hDLEtBQUtNLEdBQVMsT0FBTyxLQUFLQSxFQUFNLE9BQVMsSUFBTU4sRUFBYyxRQUFRLENBQUMsRUFDdEUsS0FBS08sR0FBU0YsRUFBQSxLQUFLUixFQUFTVSxFQUFLLENBQzFDLENBT0EsTUFBTSxNQUFNTCxFQUF3QkMsRUFBcUIsQ0FBQyxFQUFHLENBRXpELEdBREFELEVBQVcsSUFBSSxJQUFJQSxFQUFVTSxFQUFBLEtBQUtiLEVBQU8sRUFDckNPLEVBQVMsUUFBVU0sRUFBQSxLQUFLYixHQUFTLENBQ2pDLElBQU1XLEVBQVEsTUFBTUUsRUFBQSxLQUFLWixHQUFlLHNCQUFzQixNQUFTLEVBQ2xFTyxFQUFRLFVBQ1RBLEVBQVEsUUFBVSxDQUFDLEdBRXZCQSxFQUFRLFFBQVEsY0FBbUIsU0FBV0csRUFBTSxXQUN4RCxDQUNBLEdBQUksV0FBWUgsRUFDWixPQUFRQSxFQUFRLE9BQVEsQ0FDcEIsSUFBSyxNQUNMLElBQUssT0FBUSxDQUNULElBQU1NLEVBQVcsTUFBTUQsRUFBQSxLQUFLVixHQUFMLFVBQVlJLEVBQVVDLEdBQzdDLEdBQUksQ0FBQ00sRUFBUyxHQUNWLE9BQU9BLEVBRVgsSUFBTUMsRUFBTyxNQUFNLElBQUksUUFBUVIsRUFBVUMsQ0FBTyxFQUFFLEtBQUssRUFDdkQsT0FBQUssRUFBQSxLQUFLWCxHQUFPLElBQUlLLEVBQVUsSUFBSSxTQUFTUSxDQUFJLENBQUMsRUFDckNELENBQ1gsQ0FDQSxJQUFLLFNBQVUsQ0FDWCxJQUFNQSxFQUFXLE1BQU1ELEVBQUEsS0FBS1YsR0FBTCxVQUFZSSxFQUFVQyxHQUM3QyxPQUFLTSxFQUFTLElBR2RELEVBQUEsS0FBS1gsR0FBTyxPQUFPSyxDQUFRLEVBQ3BCTyxDQUNYLENBQ0osQ0FFSixPQUFPRCxFQUFBLEtBQUtWLEdBQUwsVUFBWUksRUFBVUMsR0FDeEIsS0FBSyxNQUFNTSxHQUFZLENBQ3BCLEdBQUlBLEVBQVMsUUFBVSxJQUNuQixNQUFNLElBQUksTUFBTUEsRUFBUyxXQUFhO0FBQUEsRUFBTyxNQUFNQSxFQUFTLEtBQUssQ0FBQyxFQUV0RSxPQUFBRCxFQUFBLEtBQUtYLEdBQU8sSUFBSUssRUFBVU8sRUFBUyxNQUFNLENBQUMsRUFDbkNBLENBQ1gsQ0FBQyxFQUFFLE1BQU1FLElBQ0wsUUFBUSxLQUFLQSxDQUFLLEVBQ1hILEVBQUEsS0FBS1gsR0FBTyxNQUFNSyxDQUFRLEVBRXpDLENBQ0osQ0FDSixFQXRFSVAsRUFBQSxZQUNBQyxFQUFBLFlBQ0FDLEVBQUEsWUFDQUMsRUFBQSIsCiAgIm5hbWVzIjogWyJfb3JpZ2luIiwgIl9hdXRoX3Byb3ZpZGVyIiwgIl9jYWNoZSIsICJfZmV0Y2giLCAiV2ViU3RvcmFnZSIsICJhdXRoX3Byb3ZpZGVyIiwgImZldGNoIiwgInJlc291cmNlIiwgIm9wdGlvbnMiLCAiX19wcml2YXRlQWRkIiwgIl9fcHJpdmF0ZVNldCIsICJ0b2tlbiIsICJjYWNoZSIsICJfX3ByaXZhdGVHZXQiLCAicmVzcG9uc2UiLCAiYmxvYiIsICJlcnJvciJdCn0K
|
||||
@@ -8,12 +8,9 @@
|
||||
export default class WebStorage {
|
||||
|
||||
#origin = new URL(import.meta.url).origin
|
||||
/** @type {import('@twurple/auth').AuthProvider} */
|
||||
#auth_provider = null;
|
||||
/** @type {Cache} */
|
||||
#cache = null
|
||||
/** @type {fetch} */
|
||||
#fetch = null
|
||||
#auth_provider: import('@twurple/auth').AuthProvider = null;
|
||||
#cache: Cache = null
|
||||
#fetch: typeof globalThis.fetch = null
|
||||
|
||||
/**
|
||||
* Creates a fetch request wrapper that returns cached responses when the server can't be reached.
|
||||
@@ -23,10 +20,10 @@ export default class WebStorage {
|
||||
* @param {import('@twurple/auth').AuthProvider} auth_provider used to add the authentication header to requests for web storage
|
||||
* @param {fetch} fetch defaults to `globalThis.fetch`, allows you to further customize fetch behavior via chaining, for example with `fetch-retry`
|
||||
*/
|
||||
constructor(auth_provider, fetch = (resource,options)=>{return globalThis.fetch(resource,options)}) {
|
||||
constructor(auth_provider: import('@twurple/auth').AuthProvider, fetch: typeof globalThis.fetch = (resource,options)=>{return globalThis.fetch(resource,options)}) {
|
||||
this.#fetch = fetch
|
||||
this.#auth_provider = auth_provider
|
||||
auth_provider.getAccessTokenForUser()
|
||||
auth_provider.getAccessTokenForUser(undefined)
|
||||
.then(token => caches.open(token.userId + '/' + auth_provider.clientId))
|
||||
.then(cache => this.#cache = cache)
|
||||
}
|
||||
@@ -36,10 +33,10 @@ export default class WebStorage {
|
||||
* @param {String | URL} resource
|
||||
* @param {RequestInit} options
|
||||
*/
|
||||
async fetch(resource, options={}) {
|
||||
async fetch(resource: string | URL, options: RequestInit={}) {
|
||||
resource = new URL(resource, this.#origin)
|
||||
if (resource.origin == this.#origin) {
|
||||
const token = await this.#auth_provider.getAccessTokenForUser()
|
||||
const token = await this.#auth_provider.getAccessTokenForUser(undefined)
|
||||
if (!options.headers) {
|
||||
options.headers = {}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
/*
|
||||
access-control-allow-origin: *
|
||||
File diff suppressed because one or more lines are too long
@@ -1,63 +0,0 @@
|
||||
import * as TwitchAuth from './TwitchAuth.mjs'
|
||||
/** @type {import('./TwitchAuth.mjs').TwitchToken} */
|
||||
let token=null;
|
||||
|
||||
export function request_auth(client_id,scope,redirect_uri=location.origin+location.pathname){
|
||||
return TwitchAuth.requestAuthCode(client_id,...scope.split(' '))
|
||||
}
|
||||
|
||||
export function get_url_params(){
|
||||
return Object.fromEntries(new URLSearchParams(location.search))
|
||||
}
|
||||
|
||||
export async function fetch_tokens(client_id,code,redirect_uri=location.origin+location.path){
|
||||
client_id=client_id
|
||||
token=await TwitchAuth.exchangeCode(client_id,code)
|
||||
token.client_id=client_id
|
||||
return token
|
||||
}
|
||||
|
||||
export function get_headers(tokens){
|
||||
return {
|
||||
'Authorization':'Bearer '+tokens.access_token,
|
||||
'Client-ID':tokens.client_id
|
||||
}
|
||||
}
|
||||
|
||||
export async function validate_tokens(tokens){
|
||||
const validation=await TwitchAuth.validateToken(tokens.access_token)
|
||||
Object.assign(tokens,validation)
|
||||
tokens.scope=validation.scopes
|
||||
tokens.auth_headers=get_headers(tokens)
|
||||
token=tokens
|
||||
return token
|
||||
}
|
||||
|
||||
export function set_local_tokens(client_id,tokens){
|
||||
token=tokens
|
||||
return token
|
||||
}
|
||||
|
||||
export function get_local_tokens(client_id){
|
||||
return token
|
||||
}
|
||||
|
||||
export async function refresh_tokens(client_id,refresh_token){
|
||||
token=await TwitchAuth.refreshToken(client_id,refresh_token)
|
||||
return token
|
||||
}
|
||||
|
||||
export function set_refresh_timeout(client_id,tokens){
|
||||
return setTimeout(()=>{
|
||||
TwitchAuth.refreshToken(client_id,tokens.refresh_token)
|
||||
.then(new_tokens=>Object.assign(tokens,new_tokens))
|
||||
},tokens.expires_in*999)
|
||||
}
|
||||
|
||||
export async function get_tokens(client_id,scope='',redirect_uri=location.origin+location.pathname,auth_return=false){
|
||||
token=await TwitchAuth.getUserToken(client_id,...scope.split(' ')).then(validate_tokens)
|
||||
set_refresh_timeout(client_id,token)
|
||||
return token
|
||||
}
|
||||
|
||||
export default get_tokens
|
||||
@@ -0,0 +1,72 @@
|
||||
import * as TwitchAuth from './TwitchAuth.ts'
|
||||
|
||||
interface AuthHeaders {
|
||||
'Authorization': string,
|
||||
'Client-ID': string
|
||||
}
|
||||
|
||||
interface Token extends TwitchAuth.TwitchToken {
|
||||
auth_headers: AuthHeaders
|
||||
}
|
||||
|
||||
let token: Token=null;
|
||||
|
||||
export function request_auth(client_id: string,scope: string,redirect_uri=location.origin+location.pathname){
|
||||
return TwitchAuth.requestAuthCode(client_id,...scope.split(' '))
|
||||
}
|
||||
|
||||
export function get_url_params(){
|
||||
return Object.fromEntries(new URLSearchParams(location.search))
|
||||
}
|
||||
|
||||
export async function fetch_tokens(client_id: string,code: string,redirect_uri=location.origin+location.pathname): Promise<Token>{
|
||||
client_id=client_id
|
||||
token=await TwitchAuth.exchangeCode(client_id,code) as Token
|
||||
token.client_id=client_id
|
||||
return token
|
||||
}
|
||||
|
||||
export function get_headers(tokens: Token): AuthHeaders{
|
||||
return {
|
||||
'Authorization':'Bearer '+tokens.access_token,
|
||||
'Client-ID':tokens.client_id
|
||||
}
|
||||
}
|
||||
|
||||
export async function validate_tokens(tokens: Token): Promise<Token>{
|
||||
const validation=await TwitchAuth.validateToken(tokens.access_token)
|
||||
Object.assign(tokens,validation)
|
||||
tokens.scope=validation.scope
|
||||
tokens.auth_headers=get_headers(tokens)
|
||||
token=tokens
|
||||
return token
|
||||
}
|
||||
|
||||
export function set_local_tokens(client_id: string,tokens: Token){
|
||||
token=tokens
|
||||
return token
|
||||
}
|
||||
|
||||
export function get_local_tokens(client_id: string){
|
||||
return token
|
||||
}
|
||||
|
||||
export async function refresh_tokens(client_id: string,refresh_token: string){
|
||||
token=await TwitchAuth.refreshToken(client_id,refresh_token) as Token
|
||||
return token
|
||||
}
|
||||
|
||||
export function set_refresh_timeout(client_id: string,tokens: Token){
|
||||
return setTimeout(()=>{
|
||||
TwitchAuth.refreshToken(client_id,tokens.refresh_token)
|
||||
.then(new_tokens=>Object.assign(tokens,new_tokens))
|
||||
},tokens.expires_in*999)
|
||||
}
|
||||
|
||||
export async function get_tokens(client_id: string,scope='',redirect_uri=location.origin+location.pathname,auth_return=false){
|
||||
token=await TwitchAuth.getUserToken(client_id,...scope.split(' ')).then(validate_tokens)
|
||||
set_refresh_timeout(client_id,token)
|
||||
return token
|
||||
}
|
||||
|
||||
export default get_tokens
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "es2020",
|
||||
"module": "es2020",
|
||||
"moduleResolution": "node",
|
||||
"allowImportingTsExtensions": true,
|
||||
"noEmit": true,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user