门店端微信号自动登录

apps/h5-shop/src/lib/wechat-auth.ts

@@ -1,7 +1,8 @@
 import type { ClientRuntimeConfig, WechatLoginResult } from '@dukang/shared-types';
 import { isWxAuthorizeEnabled } from '@dukang/shared-types';
+import { WECHAT_INAPP_REQUIRED_MSG } from '@dukang/weixin-sdk';
 import { isWechatEnv, weixinSdk } from './weixin';
-import { request, saveAuth, type ShopSessionPayload } from './api';
+import { request, saveWechatSession, type ShopSessionPayload } from './api';
 
 export type ShopAccountProfile = {
   id: string;
@@ -51,20 +52,17 @@ export function sessionFromWechatLogin(result: WechatLoginResult): ShopSessionPa
   };
 }
 
-export function saveShopWechatAuth(result: WechatLoginResult): boolean {
+/** 处理微信登录/绑定结果，写入 7 天免登录 session */
+export function handleShopWechatLoginResult(result: WechatLoginResult): ShopSessionPayload | null {
   const session = sessionFromWechatLogin(result);
-  if (!session) return false;
-  saveAuth(session);
-  return true;
+  if (!session) return null;
+  saveWechatSession(session);
+  return session;
 }
 
-export async function authorizeShopWechat(): Promise<WechatLoginResult | void> {
-  const config = await fetchClientConfig();
-  if (!isWxAuthorizeEnabled(config)) return;
-  if (!isWechatEnv()) {
-    throw new Error('请在微信内打开以完成授权');
-  }
-  return weixinSdk.login();
+/** @deprecated 使用 handleShopWechatLoginResult */
+export function saveShopWechatAuth(result: WechatLoginResult): boolean {
+  return !!handleShopWechatLoginResult(result);
 }
 
 export async function handleShopWechatCallback(): Promise<WechatLoginResult | null> {
@@ -73,3 +71,34 @@ export async function handleShopWechatCallback(): Promise<WechatLoginResult | nu
   if (!isWxAuthorizeEnabled(config)) return null;
   return weixinSdk.handleOAuthCallback();
 }
+
+/**
+ * 微信一键登录（已绑定微信的门店账号免验证码）。
+ * 返回 session = 已登录；void = 已跳转授权页等待回调。
+ */
+export async function loginShopWithWechat(): Promise<ShopSessionPayload | null | void> {
+  const config = await fetchClientConfig();
+  if (!isWxAuthorizeEnabled(config)) return null;
+  if (!isWechatEnv()) {
+    throw new Error(WECHAT_INAPP_REQUIRED_MSG);
+  }
+  const result = await weixinSdk.login();
+  if (result) return handleShopWechatLoginResult(result);
+}
+
+/** 短信登录成功后于微信内自动发起 OAuth，绑定 openId 便于后续免登 */
+export async function bindShopWechatAfterSmsLogin(): Promise<void> {
+  const config = await fetchClientConfig();
+  if (!isWxAuthorizeEnabled(config)) return;
+  if (!isWechatEnv()) return;
+  await weixinSdk.login();
+}
+
+export async function authorizeShopWechat(): Promise<WechatLoginResult | void> {
+  const config = await fetchClientConfig();
+  if (!isWxAuthorizeEnabled(config)) return;
+  if (!isWechatEnv()) {
+    throw new Error(WECHAT_INAPP_REQUIRED_MSG);
+  }
+  return weixinSdk.login();
+}