formatting

This commit is contained in:
2025-01-26 12:13:03 +00:00
parent fca32bf7f2
commit bb1c1944ca
+26 -23
View File
@@ -1,5 +1,8 @@
import fetch_retry from 'https://cdn.jsdelivr.net/npm/fetch-retry/+esm' import fetch_retry from 'https://cdn.jsdelivr.net/npm/fetch-retry/+esm'
const fetch = fetch_retry(globalThis.fetch, { retries: 10, retryDelay: attempts => attempts * 1000 }) const fetch = fetch_retry(globalThis.fetch, {
retries: 10,
retryDelay: attempts => attempts * 1000
})
/** /**
* @typedef {Object} TwitchToken * @typedef {Object} TwitchToken
@@ -20,7 +23,7 @@ const fetch = fetch_retry(globalThis.fetch, { retries: 10, retryDelay: attempts
* @property {String} scope * @property {String} scope
*/ */
const redirect_uri = location.origin+location.pathname const redirect_uri = location.origin + location.pathname
const proxy_uri = new URL('/oauth2/token', import.meta.url) const proxy_uri = new URL('/oauth2/token', import.meta.url)
/** /**
@@ -65,10 +68,10 @@ export function getAppToken(client_id) {
export function requestAccessToken(client_id, ...scopes) { export function requestAccessToken(client_id, ...scopes) {
console.debug('requesting access token') console.debug('requesting access token')
const url = new URL('https://id.twitch.tv/oauth2/authorize') const url = new URL('https://id.twitch.tv/oauth2/authorize')
url.searchParams.append('response_type','token') url.searchParams.append('response_type', 'token')
url.searchParams.append('client_id', client_id) url.searchParams.append('client_id', client_id)
url.searchParams.append('scope', scopes.join(' ')) url.searchParams.append('scope', scopes.join(' '))
location.assign(url+'&redirect_uri='+redirect_uri) location.assign(url + '&redirect_uri=' + redirect_uri)
} }
/** /**
@@ -80,10 +83,10 @@ export function requestAccessToken(client_id, ...scopes) {
export function requestAuthCode(client_id, ...scopes) { export function requestAuthCode(client_id, ...scopes) {
console.debug('requesting authorization code') console.debug('requesting authorization code')
const url = new URL('https://id.twitch.tv/oauth2/authorize') const url = new URL('https://id.twitch.tv/oauth2/authorize')
url.searchParams.append('response_type','code') url.searchParams.append('response_type', 'code')
url.searchParams.append('client_id', client_id) url.searchParams.append('client_id', client_id)
url.searchParams.append('scope', scopes.join(' ')) url.searchParams.append('scope', scopes.join(' '))
location.assign(url+'&redirect_uri='+redirect_uri) location.assign(url + '&redirect_uri=' + redirect_uri)
return new Promise() return new Promise()
} }
@@ -127,11 +130,11 @@ export function validateToken(access_token) {
throw new Error(await response.json()) throw new Error(await response.json())
} }
/** @type {TwitchToken} */ /** @type {TwitchToken} */
const token=await response.json() const token = await response.json()
token.access_token=access_token token.access_token = access_token
token.scope=token.scopes token.scope = token.scopes
delete token.scopes delete token.scopes
token.token_type='bearer' token.token_type = 'bearer'
return stamp(token) return stamp(token)
}) })
} }
@@ -169,25 +172,25 @@ export function refreshToken(client_id, refresh_token) {
* @param {String} client_id * @param {String} client_id
* @returns {TwitchToken} * @returns {TwitchToken}
*/ */
export function getUserToken(client_id,...scopes){ export function getUserToken(client_id, ...scopes) {
const params=new URLSearchParams(location.search+'&'+location.hash.substring(1)) const params = new URLSearchParams(location.search + '&' + location.hash.substring(1))
if(params.has('code')){ if (params.has('code')) {
const code=params.get('code') const code = params.get('code')
history.replaceState(null,'',redirect_uri) history.replaceState(null, '', redirect_uri)
return exchangeCode(client_id,code) return exchangeCode(client_id, code)
} }
if(params.has('refresh_token')){ if (params.has('refresh_token')) {
return refreshToken(client_id,params.get('refresh_token')) return refreshToken(client_id, params.get('refresh_token'))
} }
if(params.has('access_token')){ if (params.has('access_token')) {
return validateToken(params.get('access_token')) return validateToken(params.get('access_token'))
} }
if(params.has('error')){ if (params.has('error')) {
const error_message=params.get('error')+': '+params.get('error_description') const error_message = params.get('error') + ': ' + params.get('error_description')
history.replaceState(null,'',redirect_uri) history.replaceState(null, '', redirect_uri)
throw new Error(error_message) throw new Error(error_message)
} }
return requestAuthCode(client_id,...scopes) return requestAuthCode(client_id, ...scopes)
} }
export default getUserToken export default getUserToken