jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

feat(partner): require WeChat OAuth before store photo upload

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jacy-dukang
2026-07-03 15:44:46 +08:00
parent 81413e4d08
commit cabc9e6ebb
11 changed files with 231 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/h5-partner/src/App.tsx
+30 -1
View File
@@ -1,4 +1,5 @@
import { Routes, Route, Navigate } from 'react-router-dom';
import { Routes, Route, Navigate, useLocation, useNavigate } from 'react-router-dom';
import { useEffect } from 'react';
import TabLayout from './layouts/TabLayout';
import LoginPage from './pages/LoginPage';
import HomePage from './pages/HomePage';
@@ -12,9 +13,36 @@ import BillsPage from './pages/BillsPage';
import ReshipPage from './pages/ReshipPage';
import WeeklyReportPage from './pages/WeeklyReportPage';
import LeaderboardPage from './pages/LeaderboardPage';
import { handlePartnerWechatCallback, savePartnerWechatAuth } from './lib/wechat-auth';
import { isWechatEnv } from './lib/weixin';
function WechatOAuthHandler() {
const location = useLocation();
const navigate = useNavigate();
useEffect(() => {
if (!isWechatEnv() || !location.search.includes('code=')) return;
void handlePartnerWechatCallback()
.then((result) => {
if (!result || !savePartnerWechatAuth(result)) return;
const params = new URLSearchParams(location.search);
params.delete('code');
params.delete('state');
const qs = params.toString();
navigate(`${location.pathname}${qs ? `?${qs}` : ''}`, { replace: true });
})
.catch(() => {
/* 页面内组件会提示 */
});
}, [location.pathname, location.search, navigate]);
return null;
}
export default function App() {
return (
<>
<WechatOAuthHandler />
<Routes>
<Route path="/login" element={<LoginPage />} />
<Route element={<TabLayout />}>
@@ -32,5 +60,6 @@ export default function App() {
<Route path="/orders/:id" element={<OrderDetailPage />} />
<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
</>
);
}
apps/h5-partner/src/components/OssUploadField.tsx
+67 -10
View File
@@ -1,5 +1,11 @@
import { useEffect, useId, useRef, useState } from 'react';
import { uploadFileToOss, type OssMediaType } from '../lib/upload';
import {
authorizePartnerWechat,
fetchPartnerProfile,
needsWechatAuth,
type PartnerProfile,
} from '../lib/wechat-auth';
import { isWechatEnv, weixinSdk } from '../lib/weixin';
type OssUploadFieldProps = {
@@ -11,6 +17,9 @@ type OssUploadFieldProps = {
wide?: boolean;
compact?: boolean;
label?: string;
/** 父级已确认微信授权时可跳过检查 */
wechatReady?: boolean;
onWechatReadyChange?: (ready: boolean) => void;
};
const DEFAULT_MAX_MB = 10;
@@ -24,22 +33,39 @@ export default function OssUploadField({
wide,
compact,
label,
wechatReady,
onWechatReadyChange,
}: OssUploadFieldProps) {
const inputId = useId();
const inputRef = useRef<HTMLInputElement>(null);
const [uploading, setUploading] = useState(false);
const [authorizing, setAuthorizing] = useState(false);
const [error, setError] = useState('');
const [profile, setProfile] = useState<PartnerProfile | null>(null);
const resolvedAccept =
accept ?? (mediaType === 'VIDEO' ? 'video/*' : mediaType === 'FILE' ? 'image/*,.pdf' : 'image/*');
const useWechatPicker = isWechatEnv() && mediaType !== 'VIDEO';
const needsAuth = useWechatPicker && needsWechatAuth(profile) && wechatReady !== true;
useEffect(() => {
if (!useWechatPicker) return;
void weixinSdk.init().catch(() => {
/* 点击上传时会再次初始化并提示 */
void fetchPartnerProfile()
.then((me) => {
setProfile(me);
onWechatReadyChange?.(!!me.hasWechat);
})
.catch(() => {
/* 未登录等场景由上传接口报错 */
});
}, [useWechatPicker]);
}, [useWechatPicker, onWechatReadyChange]);
useEffect(() => {
if (!useWechatPicker || needsAuth) return;
void weixinSdk.init().catch(() => {
/* 点击上传时会再次初始化 */
});
}, [useWechatPicker, needsAuth]);
async function uploadSelectedFile(file: File) {
if (file.size > DEFAULT_MAX_MB * 1024 * 1024) {
@@ -59,9 +85,25 @@ export default function OssUploadField({
}
}
async function pickFile() {
if (uploading) return;
async function startWechatAuth() {
setAuthorizing(true);
setError('');
try {
await authorizePartnerWechat();
} catch (e) {
setError(e instanceof Error ? e.message : '微信授权失败');
setAuthorizing(false);
}
}
async function pickFile() {
if (uploading || authorizing) return;
setError('');
if (useWechatPicker && needsAuth) {
setError('请先完成微信授权后再上传照片');
return;
}
if (useWechatPicker) {
try {
@@ -90,22 +132,37 @@ export default function OssUploadField({
const isImage = mediaType === 'IMAGE' && value;
const isFile = mediaType === 'FILE' && value;
const busy = uploading || authorizing;
const triggerProps = {
type: 'button' as const,
disabled: uploading,
disabled: busy || needsAuth,
onClick: () => void pickFile(),
};
return (
<div className="partner-oss-upload">
{needsAuth && (
<div className="partner-wechat-auth-hint" role="status">
<p className="body-md">上传照片需先完成微信授权</p>
<button
type="button"
className="partner-btn-outline"
style={{ marginTop: 8, width: '100%' }}
disabled={authorizing}
onClick={() => void startWechatAuth()}
>
{authorizing ? '跳转授权中…' : '微信授权'}
</button>
</div>
)}
<input
id={inputId}
ref={inputRef}
type="file"
accept={resolvedAccept}
className="partner-oss-upload-input"
disabled={uploading}
disabled={busy}
onChange={(e) => {
const file = e.target.files?.[0];
if (file) void uploadSelectedFile(file);
@@ -115,7 +172,7 @@ export default function OssUploadField({
<button {...triggerProps} className={`partner-upload-preview${wide ? ' partner-upload-preview--wide' : ''}`}>
<img src={value} alt={label ?? '已上传'} />
<span className="partner-upload-preview-mask">
<span className="material-symbols-outlined">{uploading ? 'hourglass_top' : 'edit'}</span>
<span className="material-symbols-outlined">{busy ? 'hourglass_top' : 'edit'}</span>
<span>{uploading ? '上传中…' : '更换'}</span>
</span>
</button>
@@ -135,10 +192,10 @@ export default function OssUploadField({
className={`partner-upload-dashed${wide ? ' partner-upload-dashed--wide' : ''}${compact ? ' partner-upload-dashed--compact' : ''}`}
>
<span className="material-symbols-outlined text-primary" style={{ fontSize: compact ? 28 : 36 }}>
{uploading ? 'hourglass_top' : 'add_a_photo'}
{busy ? 'hourglass_top' : 'add_a_photo'}
</span>
<span className="text-primary" style={{ fontWeight: 500 }}>
{uploading ? '上传中…' : (label ?? (useWechatPicker ? '从相册选择' : '点击上传'))}
{uploading ? '上传中…' : needsAuth ? '请先微信授权' : (label ?? (useWechatPicker ? '从相册选择' : '点击上传'))}
</span>
</button>
)}
apps/h5-partner/src/lib/wechat-auth.ts
+38
View File
@@ -0,0 +1,38 @@
import type { WechatLoginResult } from '@dukang/shared-types';
import { isWechatEnv, weixinSdk } from './weixin';
import { request, saveAuth } from './api';
export type PartnerProfile = {
id: string;
name: string;
phone: string;
companyName: string;
hasWechat?: boolean;
};
export async function fetchPartnerProfile(): Promise<PartnerProfile> {
return request<PartnerProfile>('PARTNER_H5', '/partner/me');
}
/** 微信内上传照片前需完成公众号授权绑定 */
export function needsWechatAuth(profile: PartnerProfile | null): boolean {
return isWechatEnv() && !!profile && !profile.hasWechat;
}
export function savePartnerWechatAuth(result: WechatLoginResult): boolean {
if (!result.accessToken) return false;
saveAuth({ accessToken: result.accessToken });
return true;
}
export async function authorizePartnerWechat(): Promise<WechatLoginResult | void> {
if (!isWechatEnv()) {
throw new Error('请在微信内打开以完成授权');
}
return weixinSdk.login();
}
export async function handlePartnerWechatCallback(): Promise<WechatLoginResult | null> {
if (!isWechatEnv()) return null;
return weixinSdk.handleOAuthCallback();
}
apps/h5-partner/src/lib/weixin.ts
+1
View File
@@ -4,6 +4,7 @@ export const weixinSdk = createWeixinSdk({
apiBase: '/api/v1',
clientApp: 'PARTNER_H5',
getAccessToken: () => localStorage.getItem('accessToken'),
wechatLoginPath: '/partner/auth/login/wechat',
});
export { isWechatEnv };
apps/h5-partner/src/pages/StoreCreatePage.tsx
+26
View File
@@ -6,6 +6,11 @@ import OssUploadField from '../components/OssUploadField';
import { request } from '../lib/api';
import { resolveRegionBinding } from '../lib/china-region';
import { fetchPartnerCities, type OpenCityOption } from '../lib/upload';
import {
fetchPartnerProfile,
handlePartnerWechatCallback,
savePartnerWechatAuth,
} from '../lib/wechat-auth';
import { isWechatEnv, weixinSdk } from '../lib/weixin';
import {
clearStoreDraft,
@@ -28,6 +33,7 @@ export default function StoreCreatePage() {
const [submitting, setSubmitting] = useState(false);
const [cities, setCities] = useState<OpenCityOption[]>([]);
const [citiesError, setCitiesError] = useState('');
const [wechatReady, setWechatReady] = useState(false);
const stepFromUrl = Number(params.get('step') || 0);
const step = stepFromUrl >= 1 && stepFromUrl <= 3 ? stepFromUrl : (saved?.step ?? 1);
@@ -44,11 +50,25 @@ export default function StoreCreatePage() {
useEffect(() => {
if (step !== 2 || !isWechatEnv()) return;
void fetchPartnerProfile()
.then((me) => setWechatReady(!!me.hasWechat))
.catch(() => setWechatReady(false));
void weixinSdk.init().catch(() => {
/* OssUploadField 点击时会再次初始化 */
});
}, [step]);
useEffect(() => {
if (!isWechatEnv() || !params.get('code')) return;
void handlePartnerWechatCallback()
.then((result) => {
if (result && savePartnerWechatAuth(result)) {
setWechatReady(true);
}
})
.catch((e) => setError(e instanceof Error ? e.message : '微信授权失败'));
}, [params]);
useEffect(() => {
void fetchPartnerCities()
.then((items) => {
@@ -259,6 +279,8 @@ export default function StoreCreatePage() {
bizType="STORE_TITLE"
mediaType="IMAGE"
value={form.coverUrl}
wechatReady={wechatReady}
onWechatReadyChange={setWechatReady}
onChange={(coverUrl) => patchForm({ coverUrl })}
label="点击或拖拽上传"
/>
@@ -275,6 +297,8 @@ export default function StoreCreatePage() {
bizType="STORE_ENV"
mediaType="IMAGE"
value={url}
wechatReady={wechatReady}
onWechatReadyChange={setWechatReady}
label="添加照片"
onChange={(nextUrl) => {
const envPhotoUrls = [...form.envPhotoUrls];
@@ -294,6 +318,8 @@ export default function StoreCreatePage() {
mediaType="FILE"
accept="image/*,.pdf"
value={form.contractUrl}
wechatReady={wechatReady}
onWechatReadyChange={setWechatReady}
onChange={(contractUrl) => patchForm({ contractUrl })}
label="上传合同副本"
/>
apps/h5-partner/src/styles.css
+8
View File
@@ -932,6 +932,14 @@ html, body, #root {
aspect-ratio: 1;
}
.partner-wechat-auth-hint {
margin-bottom: 12px;
padding: 12px 14px;
border-radius: 12px;
background: rgba(166, 29, 36, 0.08);
border: 1px solid rgba(166, 29, 36, 0.15);
}
.partner-oss-upload-input {
position: absolute;
width: 1px;
packages/weixin-sdk/src/auth.ts
+2 -1
View File
@@ -71,7 +71,8 @@ export async function loginWithWechatCode(
platform?: WechatLoginPlatform,
): Promise<WechatLoginResult> {
const resolvedPlatform = platform ?? (getRuntimePlatform() === 'mini' ? 'mini' : 'h5');
return apiRequest<WechatLoginResult>(config, '/auth/login/wechat', {
const loginPath = config.wechatLoginPath ?? '/auth/login/wechat';
return apiRequest<WechatLoginResult>(config, loginPath, {
method: 'POST',
body: JSON.stringify({ code, platform: resolvedPlatform }),
});
packages/weixin-sdk/src/types.ts
+2
View File
@@ -7,6 +7,8 @@ export type WeixinSdkConfig = {
clientApp: string;
/** 获取 access token（可选，登录后自动带） */
getAccessToken?: () => string | null;
/** 微信 code 登录接口，默认 /auth/login/wechat */
wechatLoginPath?: string;
};
export type WxInvokeResult<T> = {
server/dukang-api/src/modules/iam/auth.controller.ts
+11 -1
View File
@@ -114,7 +114,17 @@ export class PartnerAuthController {
}
@Post('login/wechat')
wechatLogin(@Body() dto: LoginWechatDto) {
@UseGuards(OptionalJwtAuthGuard)
wechatLogin(@Req() req: Request, @Body() dto: LoginWechatDto) {
const user = (req as Request & { user?: AuthUser }).user;
if (user?.actorType === 'PARTNER') {
return this.authService.bindPartnerWechat(
user.actorId,
dto.code,
ClientApp.PARTNER_H5,
dto.platform ?? 'h5',
);
}
return this.authService.loginPartnerWechat(dto.code, ClientApp.PARTNER_H5, dto.platform ?? 'h5');
}
}
server/dukang-api/src/modules/iam/auth.service.ts
+45
View File
@@ -498,6 +498,51 @@ export class AuthService {
});
}
async bindPartnerWechat(
partnerAccountId: bigint,
code: string,
clientApp: ClientApp,
platform: 'h5' | 'mini' = 'h5',
) {
this.assertWechatEnabled();
const session =
platform === 'mini'
? await this.wechatProvider.code2Session(code)
: await this.wechatProvider.oauth2AccessToken(code);
const account = await this.prisma.partnerAccount.findUnique({
where: { id: partnerAccountId },
include: { partner: true },
});
if (!account) throw new BadRequestException('合伙人账号不存在');
const conflict = await this.prisma.partnerAccount.findFirst({
where: { wxOpenId: session.openId, id: { not: partnerAccountId } },
});
if (conflict) {
throw new BadRequestException('该微信已绑定其他合伙人账号');
}
const updated = await this.prisma.partnerAccount.update({
where: { id: partnerAccountId },
data: {
wxOpenId: session.openId,
wxUnionId: session.unionId ?? account.wxUnionId,
lastLoginAt: new Date(),
},
include: { partner: true },
});
return this.issueToken('PARTNER', updated.id, clientApp, false, undefined, undefined, {
id: updated.id.toString(),
partnerId: updated.partnerId.toString(),
name: updated.name,
phone: updated.phone,
isPrimary: updated.isPrimary === 1,
companyName: updated.partner.companyName,
});
}
async loginPartnerWechat(code: string, clientApp: ClientApp, platform: 'h5' | 'mini' = 'h5') {
this.assertWechatEnabled();
const session =
server/dukang-api/src/modules/settlement/settlement.controller.ts
+1
View File
@@ -32,6 +32,7 @@ export class PartnerMeController {
phone: account.phone,
isPrimary: account.isPrimary === 1,
companyName: account.partner.companyName,
hasWechat: !!account.wxOpenId,
};
}
}