mirror of
https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party
synced 2025-12-26 20:50:30 +08:00
feat: add authentication token support
This commit is contained in:
parent
47fd7add5f
commit
f541b5ead1
@ -142,6 +142,7 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
|
||||
useProxy: item.useProxy || false,
|
||||
allowFixedInterval: item.allowFixedInterval || false,
|
||||
autoUpdate: item.autoUpdate ?? false,
|
||||
authToken: item.authToken,
|
||||
updated: new Date().getTime()
|
||||
} as IProfileItem
|
||||
switch (newItem.type) {
|
||||
@ -159,14 +160,24 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
|
||||
} else {
|
||||
urlObj.searchParams.delete('proxy')
|
||||
}
|
||||
res = await chromeRequest.get(urlObj.toString(), {
|
||||
headers: {
|
||||
const headers: Record<string, string> = {
|
||||
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
|
||||
},
|
||||
}
|
||||
if (item.authToken) {
|
||||
headers['Authorization'] = item.authToken
|
||||
}
|
||||
res = await chromeRequest.get(urlObj.toString(), {
|
||||
headers,
|
||||
responseType: 'text',
|
||||
timeout: subscriptionTimeout
|
||||
})
|
||||
} else {
|
||||
const headers: Record<string, string> = {
|
||||
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
|
||||
}
|
||||
if (item.authToken) {
|
||||
headers['Authorization'] = item.authToken
|
||||
}
|
||||
res = await chromeRequest.get(item.url, {
|
||||
proxy: newItem.useProxy
|
||||
? {
|
||||
@ -175,9 +186,7 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
|
||||
port: mixedPort
|
||||
}
|
||||
: false,
|
||||
headers: {
|
||||
'User-Agent': userAgent || `mihomo.party/v${app.getVersion()} (clash.meta)`
|
||||
},
|
||||
headers,
|
||||
responseType: 'text',
|
||||
timeout: subscriptionTimeout
|
||||
})
|
||||
|
||||
@ -91,6 +91,18 @@ const EditInfoModal: React.FC<Props> = (props) => {
|
||||
}}
|
||||
/>
|
||||
</SettingItem>
|
||||
<SettingItem title={t('profiles.editInfo.authToken')}>
|
||||
<Input
|
||||
size="sm"
|
||||
type="password"
|
||||
className={cn(inputWidth)}
|
||||
value={values.authToken || ''}
|
||||
onValueChange={(v) => {
|
||||
setValues({ ...values, authToken: v })
|
||||
}}
|
||||
placeholder={t('profiles.editInfo.authTokenPlaceholder')}
|
||||
/>
|
||||
</SettingItem>
|
||||
<SettingItem title={t('profiles.editInfo.useProxy')}>
|
||||
<Switch
|
||||
size="sm"
|
||||
|
||||
@ -438,6 +438,8 @@
|
||||
"profiles.editInfo.title": "Edit Information",
|
||||
"profiles.editInfo.name": "Name",
|
||||
"profiles.editInfo.url": "Subscription URL",
|
||||
"profiles.editInfo.authToken": "Authorization Token",
|
||||
"profiles.editInfo.authTokenPlaceholder": "Bearer token or other auth header value",
|
||||
"profiles.editInfo.useProxy": "Use Proxy to Update",
|
||||
"profiles.editInfo.interval": "Upd. Interval",
|
||||
"profiles.editInfo.intervalPlaceholder": "e.g.: 30 or '0 * * * *'",
|
||||
|
||||
@ -443,6 +443,8 @@
|
||||
"profiles.editInfo.title": "编辑信息",
|
||||
"profiles.editInfo.name": "名称",
|
||||
"profiles.editInfo.url": "订阅地址",
|
||||
"profiles.editInfo.authToken": "授权令牌",
|
||||
"profiles.editInfo.authTokenPlaceholder": "Bearer token 或其他认证头值",
|
||||
"profiles.editInfo.useProxy": "使用代理更新",
|
||||
"profiles.editInfo.interval": "更新间隔",
|
||||
"profiles.editInfo.intervalPlaceholder": "例如:30 或 '0 * * * *'",
|
||||
|
||||
@ -7,7 +7,8 @@ import {
|
||||
DropdownItem,
|
||||
DropdownMenu,
|
||||
DropdownTrigger,
|
||||
Input
|
||||
Input,
|
||||
Tooltip
|
||||
} from '@heroui/react'
|
||||
import BasePage from '@renderer/components/base/base-page'
|
||||
import ProfileItem from '@renderer/components/profiles/profile-item'
|
||||
@ -50,6 +51,8 @@ const Profiles: React.FC = () => {
|
||||
const navigate = useNavigate()
|
||||
const [sortedItems, setSortedItems] = useState(items)
|
||||
const [useProxy, setUseProxy] = useState(false)
|
||||
const [authToken, setAuthToken] = useState('')
|
||||
const [showAdvanced, setShowAdvanced] = useState(false)
|
||||
const [subStoreImporting, setSubStoreImporting] = useState(false)
|
||||
const [importing, setImporting] = useState(false)
|
||||
const [updating, setUpdating] = useState(false)
|
||||
@ -125,8 +128,15 @@ const Profiles: React.FC = () => {
|
||||
}, [subs, collections])
|
||||
const handleImport = async (): Promise<void> => {
|
||||
setImporting(true)
|
||||
await addProfileItem({ name: '', type: 'remote', url, useProxy })
|
||||
await addProfileItem({
|
||||
name: '',
|
||||
type: 'remote',
|
||||
url,
|
||||
useProxy,
|
||||
authToken: authToken || undefined
|
||||
})
|
||||
setUrl('')
|
||||
setAuthToken('')
|
||||
setImporting(false)
|
||||
}
|
||||
const pageRef = useRef<HTMLDivElement>(null)
|
||||
@ -225,13 +235,15 @@ const Profiles: React.FC = () => {
|
||||
}
|
||||
>
|
||||
<div className="sticky profiles-sticky top-0 z-40 bg-background">
|
||||
<div className="flex p-2">
|
||||
<div className="flex flex-col gap-2 p-2">
|
||||
<div className="flex gap-2">
|
||||
<Input
|
||||
size="sm"
|
||||
placeholder={t('profiles.input.placeholder')}
|
||||
value={url}
|
||||
onValueChange={setUrl}
|
||||
onKeyUp={handleInputKeyUp}
|
||||
className="flex-1"
|
||||
endContent={
|
||||
<>
|
||||
<Button
|
||||
@ -258,10 +270,19 @@ const Profiles: React.FC = () => {
|
||||
}
|
||||
/>
|
||||
|
||||
<Tooltip content={t('profiles.editInfo.authToken')} placement="bottom">
|
||||
<Button
|
||||
size="sm"
|
||||
variant={showAdvanced ? 'solid' : 'light'}
|
||||
isIconOnly
|
||||
onPress={() => setShowAdvanced(!showAdvanced)}
|
||||
>
|
||||
🔑
|
||||
</Button>
|
||||
</Tooltip>
|
||||
<Button
|
||||
size="sm"
|
||||
color="primary"
|
||||
className="ml-2"
|
||||
isDisabled={isUrlEmpty}
|
||||
isLoading={importing}
|
||||
onPress={handleImport}
|
||||
@ -279,7 +300,7 @@ const Profiles: React.FC = () => {
|
||||
<Button
|
||||
isLoading={subStoreImporting}
|
||||
title="Sub-Store"
|
||||
className="ml-2 substore-import"
|
||||
className="substore-import"
|
||||
size="sm"
|
||||
isIconOnly
|
||||
color="primary"
|
||||
@ -346,7 +367,7 @@ const Profiles: React.FC = () => {
|
||||
)}
|
||||
<Dropdown>
|
||||
<DropdownTrigger>
|
||||
<Button className="ml-2 new-profile" size="sm" isIconOnly color="primary">
|
||||
<Button className="new-profile" size="sm" isIconOnly color="primary">
|
||||
<FaPlus />
|
||||
</Button>
|
||||
</DropdownTrigger>
|
||||
@ -377,6 +398,19 @@ const Profiles: React.FC = () => {
|
||||
</DropdownMenu>
|
||||
</Dropdown>
|
||||
</div>
|
||||
{showAdvanced && (
|
||||
<Input
|
||||
size="sm"
|
||||
type="password"
|
||||
placeholder={t('profiles.editInfo.authTokenPlaceholder')}
|
||||
value={authToken}
|
||||
onValueChange={setAuthToken}
|
||||
onKeyUp={handleInputKeyUp}
|
||||
className="w-full"
|
||||
startContent={<span className="text-default-400 text-sm">🔑</span>}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<Divider />
|
||||
</div>
|
||||
<DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={onDragEnd}>
|
||||
|
||||
1
src/shared/types.d.ts
vendored
1
src/shared/types.d.ts
vendored
@ -492,6 +492,7 @@ interface IProfileItem {
|
||||
substore?: boolean
|
||||
allowFixedInterval?: boolean
|
||||
autoUpdate?: boolean
|
||||
authToken?: string
|
||||
}
|
||||
|
||||
interface ISubStoreSub {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user