prehistoric-systems/Gitako
1
1
Fork 0
mirror of https://github.com/EnixCoda/Gitako.git synced 2026-03-11 08:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: simplify logics about access token

Browse source
This commit is contained in:
EnixCoda 2021-01-31 23:57:43 +08:00
parent b67905ec8c
commit 2a9ab02fda
No known key found for this signature in database
GPG key ID: 0C1A07377913A1DD
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/SideBar.tsx
View file

@ -16,9 +16,8 @@ import {
useGitHubAttachCopySnippetButton,
} from 'platforms/GitHub'
import * as React from 'react'
import { useUpdateEffect } from 'react-use'
import { cx } from 'utils/cx'
import { parseURLSearch } from 'utils/general'
import { parseURLSearch, run } from 'utils/general'
import { loadWithPJAX, useOnPJAXDone, usePJAX } from 'utils/hooks/usePJAX'
import { useProgressBar } from 'utils/hooks/useProgressBar'
import * as keyHelper from 'utils/keyHelper'
@ -27,7 +26,7 @@ import { Theme } from './Theme'
const RawGitako: React.FC<Props & ConnectorState> = function RawGitako(props) {
const configContext = useConfigs()
const accessToken = props.configContext.val.accessToken
const accessToken = props.configContext.val.accessToken || ''
const [baseSize] = React.useState(() => configContext.val.sideBarWidth)
useShrinkGitHubHeader(configContext.val.shrinkGitHubHeader)
@ -39,16 +38,18 @@ const RawGitako: React.FC<Props & ConnectorState> = function RawGitako(props) {
}, [intelligentToggle, props.metaData])
React.useEffect(() => {
const { init } = props
;(async function () {
run(async function () {
if (!accessToken) {
const accessToken = (await trySetUpAccessTokenWithCode()) || undefined
configContext.set({ accessToken })
const accessToken = await trySetUpAccessTokenWithCode()
if (accessToken) configContext.set({ accessToken })
}
init()
})()
})
}, [])
React.useEffect(() => {
props.init()
}, [accessToken])
React.useEffect(
function attachKeyDown() {
if (props.disabled || !configContext.val.shortcut) return
@ -81,11 +82,6 @@ const RawGitako: React.FC<Props & ConnectorState> = function RawGitako(props) {
const copySnippetButton = configContext.val.copySnippetButton
useGitHubAttachCopySnippetButton(copySnippetButton)
// init again when setting new accessToken
useUpdateEffect(() => {
props.init()
}, [accessToken || '']) // '' prevents duplicated requests
usePJAX()
useProgressBar()

4
src/utils/general.ts
View file

@ -183,3 +183,7 @@ export function withEffect<Method extends (...args: any[]) => any>(
return returnValue
}
}
export function run<T>(fn: () => T) {
return fn()
}