fix: naming, shadow root, etc

DimensionDev · Sep 19, 2019 · 6320d1c · 6320d1c
1 parent ae5b6b3
commit 6320d1c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/extension/background-script/CryptoServices/getMyProveBio.ts b/src/extension/background-script/CryptoServices/getMyProveBio.ts
@@ -2,13 +2,13 @@ import { encodeArrayBuffer } from '../../../utils/type-transform/String-ArrayBuf
 import { toCompressSecp256k1Point } from '../../../utils/type-transform/SECP256k1-Compression'
 import { queryMyIdentityAtDB } from '../../../database/people'
 import { PersonIdentifier } from '../../../database/type'
-import { getActivatedWorker } from '../../../social-network/worker'
+import { getWorker } from '../../../social-network/worker'
 //#endregion
 //#region ProvePost, create & verify
 export async function getMyProveBio(whoAmI: PersonIdentifier): Promise<string | null> {
     const myIdentity = await queryMyIdentityAtDB(whoAmI)
     if (!myIdentity) return null
     const pub = await crypto.subtle.exportKey('jwk', myIdentity.publicKey)
     const compressed = toCompressSecp256k1Point(pub.x!, pub.y!)
-    return getActivatedWorker(whoAmI.network).publicKeyEncoder(encodeArrayBuffer(compressed))
+    return getWorker(whoAmI.network).publicKeyEncoder(encodeArrayBuffer(compressed))
 }
diff --git a/src/extension/background-script/CryptoServices/verifyOthersProve.ts b/src/extension/background-script/CryptoServices/verifyOthersProve.ts
@@ -3,11 +3,11 @@ import { geti18nString } from '../../../utils/i18n'
 import { unCompressSecp256k1Point } from '../../../utils/type-transform/SECP256k1-Compression'
 import { storeNewPersonDB } from '../../../database/people'
 import { PersonIdentifier } from '../../../database/type'
-import { getActivatedWorker } from '../../../social-network/worker'
+import { getWorker } from '../../../social-network/worker'
 import { import_ECDH_256k1_Key } from '../../../utils/crypto.subtle'
 
 export async function verifyOthersProve(bio: string, others: PersonIdentifier): Promise<boolean> {
-    const compressedX = getActivatedWorker(others.network).publicKeyDecoder(bio)
+    const compressedX = getWorker(others.network).publicKeyDecoder(bio)
     if (!compressedX) return false
     const { x, y } = unCompressSecp256k1Point(decodeArrayBuffer(compressedX))
     const key: JsonWebKey = {

diff --git a/src/social-network-provider/twitter.com/ui/fetch.ts b/src/social-network-provider/twitter.com/ui/fetch.ts
@@ -4,10 +4,10 @@ import { PersonIdentifier } from '../../../database/type'
 import { host } from '../index'
 import { getEmptyPostInfo, SocialNetworkUI, SocialNetworkUIInformationCollector } from '../../../social-network/ui'
 import { deconstructPayload } from '../../../utils/type-transform/Payload'
-import { notEmpty } from '../../../utils/assert'
 import { instanceOfTwitterUI } from './index'
 import { resolveInfoFromBioCard } from '../utils/fetch'
 import { uploadToService } from '../utils/user'
+import { isNil } from 'lodash-es'
 
 const resolveLastRecognizedIdentity = (self: SocialNetworkUI) => {
     const selfSelector = selfInfoSelectors().screenName
@@ -16,9 +16,12 @@ const resolveLastRecognizedIdentity = (self: SocialNetworkUI) => {
         const screenName = selfInfoSelectors().screenName.evaluate()
         const nickname = selfInfoSelectors().name.evaluate()
         const avatar = selfInfoSelectors().userAvatar.evaluate()
-        const identifier = new PersonIdentifier(host, notEmpty(screenName, 'user id not found'))
-        if (!identifier.isUnknown) {
-            ref.value = { identifier, nickname, avatar }
+        if (!isNil(screenName)) {
+            ref.value = {
+                identifier: new PersonIdentifier(host, screenName),
+                nickname,
+                avatar,
+            }
         }
     }
     new MutationObserverWatcher(selfSelector)

diff --git a/src/social-network-provider/twitter.com/ui/inject.tsx b/src/social-network-provider/twitter.com/ui/inject.tsx
@@ -6,9 +6,14 @@ import { renderInShadowRoot } from '../../../utils/jss/renderInShadowRoot'
 import { SocialNetworkUIInjections } from '../../../social-network/ui'
 import { nop } from '../../../utils/utils'
 
-// Closing the afterShadowRoot prevents external access to after shadow. This cannot protect before shadow.
+// Closing these shadowRoot prevents external access to them.
 const newMOW = (i: LiveSelector<HTMLElement, true>) =>
-    new MOW(i).setDomProxyOption({ afterShadowRootInit: { mode: 'closed' } }).startWatch()
+    new MOW(i)
+        .setDomProxyOption({
+            beforeShadowRootInit: { mode: 'closed' },
+            afterShadowRootInit: { mode: 'closed' },
+        })
+        .startWatch()
 
 const injectPostBox = () => {
     const target = newMOW(newPostEditorBelow())

diff --git a/src/social-network/worker.ts b/src/social-network/worker.ts
@@ -41,7 +41,7 @@ export interface SocialNetworkWorkerDefinition extends SocialNetworkWorkerAndUI
 }
 
 export type SocialNetworkWorker = Required<SocialNetworkWorkerDefinition>
-export const getActivatedWorker = getCurrentNetworkWorker
+export const getWorker = getCurrentNetworkWorker
 
 export const definedSocialNetworkWorkers = new Set<SocialNetworkWorker>()
 export function defineSocialNetworkWorker(worker: SocialNetworkWorkerDefinition) {