feat(jike-client): add loginWithPassword

Author: sxzz

src/client/client.ts

@@ -110,6 +110,32 @@ export class JikeClient {
     )!
   }
 
+  /**
+   * 密码登录
+   * @param areaCode 区号，如 `+86`
+   * @param mobile 手机号
+   * @param password 密码
+   * @throws {@link RequestFailureError} 请求失败错误
+   */
+  async loginWithPassword(
+    areaCode: string | number,
+    mobile: string,
+    password: string
+  ) {
+    const result = await this.#client.users.loginWithPhoneAndPassword(
+      resolveAreaCode(areaCode),
+      mobile,
+      password
+    )
+    if (!isSuccess(result)) throwRequestFailureError(result, '登录')
+    this.#refreshToken = result.headers.get(
+      `x-${this.#config.endpointId}-refresh-token`
+    )!
+    this.accessToken = result.headers.get(
+      `x-${this.#config.endpointId}-access-token`
+    )!
+  }
+
   /**
    * 获取用户
    * @param username 用户名

src/request.ts

@@ -16,6 +16,8 @@ export interface ApiConfigResolved {
   endpointUrl: string
   /** APP ID */
   bundleId: string
+  /** App 版本 */
+  appVersion: string
   /** 构建 ID */
   buildNo: string
   /** `access-token` */
@@ -32,7 +34,12 @@ export interface ApiConfigResolved {
 export type ApiConfig = Partial<ApiConfigResolved> &
   Pick<
     ApiConfigResolved,
-    'endpointId' | 'endpointUrl' | 'bundleId' | 'buildNo' | 'userAgent'
+    | 'endpointId'
+    | 'endpointUrl'
+    | 'bundleId'
+    | 'appVersion'
+    | 'buildNo'
+    | 'userAgent'
   >
 
 /**
@@ -100,6 +107,7 @@ export const resolveKyOptions = (): Options => {
             `x-${apiConfig.endpointId}-device-properties`,
             JSON.stringify({ idfv: apiConfig.idfv })
           )
+          req.headers.set(`App-Version`, apiConfig.appVersion)
           ;(req as any).highWaterMark = 1024 * 1024
         },
       ],

tests/jike-client/auth.ts tests/jike-client/auth.test.tstests/jike-client/auth.ts renamed to tests/jike-client/auth.test.ts

@@ -5,24 +5,26 @@ import { config, refreshToken } from '../config'
 describe('login should work', () => {
   const client = new JikeClient(config)
   const mobile = process.env.MOBILE
+  const code = process.env.CODE
 
   it('sendSmsCode should work', async () => {
-    if (!mobile) return
-    client.sendSmsCode(86, mobile)
+    if (!mobile || code) return
+    await client.sendSmsCode(86, mobile)
+  })
+
+  it('loginWithSmsCode should work', async () => {
+    if (!mobile || !code) return
+    await client.loginWithSmsCode(86, mobile, code)
   })
 
   it('loginWithSmsCode should throw an error', async () => {
     if (!mobile) return
-    try {
-      await client.loginWithSmsCode(86, mobile, '123123')
-    } catch (err: unknown) {
-      expect(err).instanceOf(RequestFailureError)
-      if (err instanceof RequestFailureError)
-        expect(err.message).oneOf([
-          '验证码已失效',
-          '错误登录次数过多，请稍后再试',
-        ])
-    }
+
+    const err: RequestFailureError = await client
+      .loginWithSmsCode(86, mobile, '123123')
+      .catch((err) => err)
+    expect(err).instanceOf(RequestFailureError)
+    expect(err.message).oneOf(['验证码已失效', '错误登录次数过多，请稍后再试'])
   })
 })