@cloudbase/oauth 2.5.44-beta.0 → 2.5.46-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/oauth",
-  "version": "2.5.44-beta.0",
+  "version": "2.5.46-beta.0",
   "description": "cloudbase javascript sdk auth componets",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -21,5 +21,5 @@
     "encryptlong": "^3.1.4"
   },
   "license": "Apache-2.0",
-  "gitHead": "f3612f789fe731b7ac25f5fb0eaf6c5a07d011ba"
+  "gitHead": "b90d74de0cdcc63ba408acbafc7a7c386f582291"
 }

package/src/auth/apis.ts

@@ -44,6 +44,11 @@ import {
   PublicKey,
   EncryptParams,
   ProviderSubType,
+  GetMiniProgramQrCodeRequest,
+  GetMiniProgramQrCodeStatusRequest,
+  GetMiniProgramQrCodeResponse,
+  GetMiniProgramQrCodeStatusResponse,
+  ModifyUserBasicInfoRequest,
 } from './models'
 import { SimpleStorage, RequestFunction } from '../oauth2client/interface'
 import { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client'
@@ -308,6 +313,19 @@ export class Auth {
     return Promise.resolve(credentials)
   }
 
+  /**
+   * sign in with wechat idendify
+   * 需要结合 http overcallFunction 使用
+   */
+  public async signInWithWechat(params: any = {}): Promise<Credentials> {
+    const credentials: Credentials = await this.config.request<Credentials>(ApiUrls.AUTH_SIGN_IN_WITH_WECHAT_URL, {
+      method: 'POST',
+      body: params,
+    })
+    await this.config.credentialsClient.setCredentials(credentials)
+    return Promise.resolve(credentials)
+  }
+
   /**
    * Bind with provider
    * @param {BindWithProviderRequest} params A BindWithProviderRequest object.
@@ -570,6 +588,18 @@ export class Auth {
     })
   }
 
+  /**
+   * Update user basic info
+   * @return {Promise<void>}
+   */
+  public async updateUserBasicInfo(params: ModifyUserBasicInfoRequest): Promise<void> {
+    return this.config.request(ApiUrls.USER_BASIC_EDIT_URL, {
+      method: 'POST',
+      withCredentials: true,
+      body: params,
+    })
+  }
+
   /**
    * Patch the user profile.
    * @param {QueryUserProfileReq} appended_params A QueryUserProfileReq Object.
@@ -731,8 +761,8 @@ export class Auth {
    * get provider sub type
    * @returns
    */
-  public async varifyCaptchaData({ token, key }: { token: string; key: string }) {
-    return this.config.request<{ captcha_token: string; expires_in: number }>(ApiUrls.VARIFY_CAPTCHA_DATA_URL, {
+  public async verifyCaptchaData({ token, key }: { token: string; key: string }) {
+    return this.config.request<{ captcha_token: string; expires_in: number }>(ApiUrls.VERIFY_CAPTCHA_DATA_URL, {
       method: 'POST',
       body: { token, key },
       withCredentials: false,
@@ -746,4 +776,26 @@ export class Auth {
       withCredentials: false,
     })
   }
+
+  /**
+   * mini-program scan code
+   * @returns
+   */
+  public async getMiniProgramCode(params: GetMiniProgramQrCodeRequest): Promise<GetMiniProgramQrCodeResponse> {
+    return this.config.request<GetMiniProgramQrCodeResponse>(ApiUrls.GET_MINIPROGRAM_QRCODE, {
+      method: 'POST',
+      body: params,
+    })
+  }
+
+  /**
+   * mini-program scan code status
+   * @returns
+   */
+  public async checkMiniProgramCode(params: GetMiniProgramQrCodeStatusRequest,): Promise<GetMiniProgramQrCodeStatusResponse> {
+    return this.config.request<GetMiniProgramQrCodeStatusResponse>(ApiUrls.GET_MINIPROGRAM_QRCODE_STATUS, {
+      method: 'POST',
+      body: params,
+    })
+  }
 }

package/src/auth/consts.ts

@@ -2,6 +2,7 @@ export enum ApiUrls {
   AUTH_SIGN_IN_URL = '/auth/v1/signin',
   AUTH_SIGN_IN_ANONYMOUSLY_URL = '/auth/v1/signin/anonymously',
   AUTH_SIGN_IN_WITH_PROVIDER_URL = '/auth/v1/signin/with/provider',
+  AUTH_SIGN_IN_WITH_WECHAT_URL = '/auth/v1/signin/wechat/noauth',
   AUTH_SIGN_UP_URL = '/auth/v1/signup',
   AUTH_TOKEN_URL = '/auth/v1/token',
   AUTH_REVOKE_URL = '/auth/v1/revoke',
@@ -12,11 +13,12 @@ export enum ApiUrls {
   WEDA_USER_URL = '/auth/v1/plugin/weda/userinfo',
   USER_QUERY_URL = '/auth/v1/user/query',
   USER_PRIFILE_URL = '/auth/v1/user/profile',
+  USER_BASIC_EDIT_URL = '/auth/v1/user/basic/edit',
   USER_TRANS_BY_PROVIDER_URL = '/auth/v1/user/trans/by/provider',
   VERIFICATION_URL = '/auth/v1/verification',
   VERIFY_URL = '/auth/v1/verification/verify',
   CAPTCHA_DATA_URL = '/auth/v1/captcha/data',
-  VARIFY_CAPTCHA_DATA_URL = '/auth/v1/captcha/data/verify',
+  VERIFY_CAPTCHA_DATA_URL = '/auth/v1/captcha/data/verify',
   GET_CAPTCHA_URL = '/auth/v1/captcha/init',
 
   PROVIDER_LIST = '/auth/v1/user/provider',
@@ -30,6 +32,9 @@ export enum ApiUrls {
   CHECK_USERNAME = '/auth/v1/checkUsername',
   CHECK_IF_USER_EXIST = '/auth/v1/checkIfUserExist',
   GET_PROVIDER_TYPE = '/auth/v1/mgr/provider/providerSubType',
+
+  GET_MINIPROGRAM_QRCODE = '/auth/v1/qrcode/generate',
+  GET_MINIPROGRAM_QRCODE_STATUS = '/auth/v1/qrcode/get/status',
 }
 
 export enum ApiUrlsV2 {

package/src/auth/models.ts

@@ -469,3 +469,34 @@ export interface ProviderSubType {
   id: string;
   provider_sub_type: 'NO_AUTH_LOGIN' | ''; // NO_AUTH_LOGIN-免密登录
 }
+
+export interface GetMiniProgramQrCodeRequest {
+  envId: string;
+  wxAppId: string;
+}
+
+export interface GetMiniProgramQrCodeResponse {
+  qr_code: string;
+  qr_code_id: string;
+  expires_in: number;
+}
+
+export interface GetMiniProgramQrCodeStatusRequest {
+  qrCodeId: string;
+  envId: string;
+  wxAppId: string;
+}
+
+export interface GetMiniProgramQrCodeStatusResponse {
+  status: string;
+  provider_token: string;
+  expires_in: number;
+}
+
+export interface ModifyUserBasicInfoRequest {
+  user_id: string;
+  nickname: string;
+  username: string;
+  description: string;
+  avatar_url: string;
+}

package/src/utils/mp.ts

@@ -37,17 +37,22 @@ export function isMp() {
   return true
 }
 
-let IS_IN_MP_WEBVIEW =  !!navigator.userAgent.match(/miniprogram/i) || (window as any).__wxjs_environment === 'miniprogram'
+let IS_IN_MP_WEBVIEW = false
 function ready() {
   IS_IN_MP_WEBVIEW =    IS_IN_MP_WEBVIEW || (typeof window !== undefined && (window as any).__wxjs_environment === 'miniprogram')
 }
-if (!isMp()) {
-  if ((window as any)?.WeixinJSBridge?.invoke) {
-    ready()
-  } else if (typeof document !== 'undefined') {
-    document.addEventListener?.('WeixinJSBridgeReady', ready, false)
+try {
+  if (!isMp()) {
+    IS_IN_MP_WEBVIEW =      IS_IN_MP_WEBVIEW
+      || !!navigator.userAgent.match(/miniprogram/i)
+      || (window as any).__wxjs_environment === 'miniprogram'
+    if ((window as any) && (window as any).WeixinJSBridge && (window as any).WeixinJSBridge.invoke) {
+      ready()
+    } else if (typeof document !== 'undefined') {
+      document.addEventListener('WeixinJSBridgeReady', ready, false)
+    }
   }
-}
+} catch (e) {}
 export function isInMpWebView() {
   return IS_IN_MP_WEBVIEW
 }