From 4504f09f6e85f09b0489debb547a17209d7176ea Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 3 Aug 2020 18:06:49 +0200 Subject: deal with refresh token in embed --- client/src/app/helpers/index.ts | 1 - client/src/app/helpers/peertube-web-storage.ts | 81 -------------------------- client/src/app/helpers/utils.ts | 10 ---- 3 files changed, 92 deletions(-) delete mode 100644 client/src/app/helpers/peertube-web-storage.ts (limited to 'client/src/app/helpers') diff --git a/client/src/app/helpers/index.ts b/client/src/app/helpers/index.ts index 06806402e..cc61255ba 100644 --- a/client/src/app/helpers/index.ts +++ b/client/src/app/helpers/index.ts @@ -1,6 +1,5 @@ export * from './locales' export * from './constants' export * from './i18n-utils' -export * from './peertube-web-storage' export * from './utils' export * from './zone' diff --git a/client/src/app/helpers/peertube-web-storage.ts b/client/src/app/helpers/peertube-web-storage.ts deleted file mode 100644 index 0db1301bd..000000000 --- a/client/src/app/helpers/peertube-web-storage.ts +++ /dev/null @@ -1,81 +0,0 @@ -// Thanks: https://github.com/capaj/localstorage-polyfill - -const valuesMap = new Map() - -function proxify (instance: MemoryStorage) { - return new Proxy(instance, { - set: function (obj, prop: string | number, value) { - if (MemoryStorage.prototype.hasOwnProperty(prop)) { - instance[prop] = value - } else { - instance.setItem(prop, value) - } - return true - }, - get: function (target, name: string | number) { - if (MemoryStorage.prototype.hasOwnProperty(name)) { - return instance[name] - } - if (valuesMap.has(name)) { - return instance.getItem(name) - } - } - }) -} - -class MemoryStorage { - [key: string]: any - [index: number]: string - - getItem (key: any) { - const stringKey = String(key) - if (valuesMap.has(key)) { - return String(valuesMap.get(stringKey)) - } - - return null - } - - setItem (key: any, val: any) { - valuesMap.set(String(key), String(val)) - } - - removeItem (key: any) { - valuesMap.delete(key) - } - - clear () { - valuesMap.clear() - } - - key (i: any) { - if (arguments.length === 0) { - throw new TypeError('Failed to execute "key" on "Storage": 1 argument required, but only 0 present.') - } - - const arr = Array.from(valuesMap.keys()) - return arr[i] - } - - get length () { - return valuesMap.size - } -} - -let peertubeLocalStorage: Storage -let peertubeSessionStorage: Storage -try { - peertubeLocalStorage = localStorage - peertubeSessionStorage = sessionStorage -} catch (err) { - const instanceLocalStorage = new MemoryStorage() - const instanceSessionStorage = new MemoryStorage() - - peertubeLocalStorage = proxify(instanceLocalStorage) - peertubeSessionStorage = proxify(instanceSessionStorage) -} - -export { - peertubeLocalStorage, - peertubeSessionStorage -} diff --git a/client/src/app/helpers/utils.ts b/client/src/app/helpers/utils.ts index 8e9f72adb..825b6ca96 100644 --- a/client/src/app/helpers/utils.ts +++ b/client/src/app/helpers/utils.ts @@ -81,15 +81,6 @@ function immutableAssign (target: A, source: B) { return Object.assign({}, target, source) } -function objectToUrlEncoded (obj: any) { - const str: string[] = [] - for (const key of Object.keys(obj)) { - str.push(encodeURIComponent(key) + '=' + encodeURIComponent(obj[key])) - } - - return str.join('&') -} - // Thanks: https://gist.github.com/ghinda/8442a57f22099bdb2e34 function objectToFormData (obj: any, form?: FormData, namespace?: string) { const fd = form || new FormData() @@ -207,7 +198,6 @@ export { sortBy, durationToString, lineFeedToHtml, - objectToUrlEncoded, getParameterByName, populateAsyncUserVideoChannels, getAbsoluteAPIUrl, -- cgit v1.2.3