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

package/src/oauth2client/models.ts

@@ -42,6 +42,7 @@ export interface AuthClientRequestOptions extends RequestOptions {
   } | null;
   withCredentials?: boolean;
   retry?: number;
+  useWxCloud?: boolean;
 
   [key: string]: any;
 }
@@ -50,6 +51,7 @@ export interface OAuth2ClientOptions {
   devMode?: boolean;
   apiOrigin: string;
   clientId: string;
+  env: string;
   // default value is 1,min value is 0, max value is 5
   retry?: number;
   baseRequest?: <T>(url: string, options?: RequestOptions) => Promise<T>;
@@ -62,4 +64,5 @@ export interface OAuth2ClientOptions {
   headers?: { [key: string]: string };
   // hook
   anonymousSignInFunc?: (Credentials) => Promise<Credentials | void>
+  wxCloud?: any;
 }

package/src/oauth2client/oauth2client.ts

@@ -1,5 +1,6 @@
 import { ErrorType } from './consts'
 import { ApiUrls, ApiUrlsV2 } from '../auth/consts'
+import adapterForWxMp from 'cloudbase-adapter-wx_mp'
 
 import { AuthClient, SimpleStorage } from './interface'
 
@@ -13,6 +14,7 @@ import {
 } from './models'
 
 import { uuidv4 } from '../utils/uuid'
+import { getPathName } from '../utils/index'
 
 import { SinglePromise } from '../utils/function/single-promise'
 
@@ -20,18 +22,16 @@ const RequestIdHeaderName = 'x-request-id'
 const DeviceIdHeaderName = 'x-device-id'
 const DeviceIdSectionName = 'device_id'
 
+declare const wx: any
+
 export interface ToResponseErrorOptions {
-  error?: ErrorType;
-  error_description?: string | null;
-  error_uri?: string | null;
-  details?: any | null;
+  error?: ErrorType
+  error_description?: string | null
+  error_uri?: string | null
+  details?: any | null
 }
 
-
-export const defaultRequest: RequestFunction = async function <T>(
-  url: string,
-  options?: RequestOptions
-): Promise<T> {
+export const defaultRequest: RequestFunction = async function <T>(url: string, options?: RequestOptions): Promise<T> {
   let result: T | null = null
   let responseError: ResponseError | null = null
   try {
@@ -65,10 +65,7 @@ export const defaultRequest: RequestFunction = async function <T>(
   }
 }
 
-export const toResponseError = (
-  error: ResponseError | Error,
-  options?: ToResponseErrorOptions,
-): ResponseError => {
+export const toResponseError = (error: ResponseError | Error, options?: ToResponseErrorOptions): ResponseError => {
   let responseError: ResponseError
   const formatOptions: ToResponseErrorOptions = options || {}
   if (error instanceof Error) {
@@ -82,8 +79,7 @@ export const toResponseError = (
     const formatError: ToResponseErrorOptions = error || {}
     responseError = {
       error: formatOptions.error || formatError.error || ErrorType.LOCAL,
-      error_description:
-        formatOptions.error_description || formatError.error_description,
+      error_description: formatOptions.error_description || formatError.error_description,
       error_uri: formatOptions.error_uri || formatError.error_uri,
       details: formatOptions.details || formatError.details,
     }
@@ -99,57 +95,56 @@ export function generateRequestId(): string {
   return uuidv4()
 }
 
-
 /**
  * Default Storage.
  */
 class DefaultStorage implements SimpleStorage {
   /**
-     * Get item.
-     * @param {string} key
-     */
+   * Get item.
+   * @param {string} key
+   */
   async getItem(key: string): Promise<string | null> {
     return window.localStorage.getItem(key)
   }
 
   /**
-     * Remove item.
-     * @param {string} key
-     */
+   * Remove item.
+   * @param {string} key
+   */
   async removeItem(key: string): Promise<void> {
     window.localStorage.removeItem(key)
   }
 
   /**
-     * Set item.
-     * @param {string} key
-     * @param {string} value
-     */
+   * Set item.
+   * @param {string} key
+   * @param {string} value
+   */
   async setItem(key: string, value: string): Promise<void> {
     window.localStorage.setItem(key, value)
   }
 
   /**
-     * Get item sync.
-     * @param {string} key
-     */
+   * Get item sync.
+   * @param {string} key
+   */
   getItemSync(key: string): string | null {
     return window.localStorage.getItem(key)
   }
 
   /**
-     * Remove item sync.
-     * @param {string} key
-     */
+   * Remove item sync.
+   * @param {string} key
+   */
   removeItemSync(key: string): void {
     window.localStorage.removeItem(key)
   }
 
   /**
-     * Set item sync.
-     * @param {string} key
-     * @param {string} value
-     */
+   * Set item sync.
+   * @param {string} key
+   * @param {string} value
+   */
   setItemSync(key: string, value: string): void {
     window.localStorage.setItem(key, value)
   }
@@ -158,8 +153,8 @@ class DefaultStorage implements SimpleStorage {
 export const defaultStorage = new DefaultStorage()
 
 interface LocalCredentialsOptions {
-  tokenSectionName: string;
-  storage: SimpleStorage;
+  tokenSectionName: string
+  storage: SimpleStorage
 }
 
 /**
@@ -200,7 +195,7 @@ class LocalCredentials {
 
   public getStorageCredentialsSync(): Credentials | null {
     let credentials: Credentials = null
-    const tokenStr: string = this.storage.getItemSync(this.tokenSectionName,)
+    const tokenStr: string = this.storage.getItemSync(this.tokenSectionName)
     if (tokenStr !== undefined && tokenStr !== null) {
       try {
         credentials = JSON.parse(tokenStr)
@@ -221,7 +216,7 @@ class LocalCredentials {
    */
   public async setCredentials(credentials?: Credentials): Promise<void> {
     if (credentials?.expires_in) {
-      credentials.expires_at = new Date(Date.now() + (credentials.expires_in - 30) * 1000,)
+      credentials.expires_at = new Date(Date.now() + (credentials.expires_in - 30) * 1000)
       if (this.storage) {
         const tokenStr: string = JSON.stringify(credentials)
         await this.storage.setItem(this.tokenSectionName, tokenStr)
@@ -254,7 +249,7 @@ class LocalCredentials {
   private async getStorageCredentials(): Promise<Credentials | null> {
     return this.singlePromise.run('_getStorageCredentials', async () => {
       let credentials: Credentials = null
-      const tokenStr: string = await this.storage.getItem(this.tokenSectionName,)
+      const tokenStr: string = await this.storage.getItem(this.tokenSectionName)
       if (tokenStr !== undefined && tokenStr !== null) {
         try {
           credentials = JSON.parse(tokenStr)
@@ -284,10 +279,7 @@ export class OAuth2Client implements AuthClient {
   private clientId: string
   private retry: number
   private clientSecret?: string
-  private baseRequest: <T>(
-    url: string,
-    options?: RequestOptions,
-  ) => Promise<T>
+  private baseRequest: <T>(url: string, options?: RequestOptions) => Promise<T>
   private localCredentials: LocalCredentials
   private storage: SimpleStorage
   private deviceID?: string
@@ -296,6 +288,7 @@ export class OAuth2Client implements AuthClient {
   private headers?: { [key: string]: string }
   private singlePromise: SinglePromise = new SinglePromise()
   private anonymousSignInFunc: (Credentials) => Promise<Credentials | void>
+  private wxCloud: any
 
   /**
    * constructor
@@ -319,6 +312,15 @@ export class OAuth2Client implements AuthClient {
       storage: this.storage,
     })
     this.clientSecret = options.clientSecret
+    this.wxCloud = options.wxCloud
+    try {
+      if (adapterForWxMp.isMatch() && this.wxCloud === undefined && options.env) {
+        wx.cloud.init({ env: options.env })
+        this.wxCloud = wx.cloud
+      }
+    } catch (error) {
+      //
+    }
     this.refreshTokenFunc = options.refreshTokenFunc || this.defaultRefreshTokenFunc
     this.anonymousSignInFunc = options.anonymousSignInFunc
   }
@@ -349,10 +351,7 @@ export class OAuth2Client implements AuthClient {
    * @param {string} url
    * @param {AuthClientRequestOptions} options
    */
-  public async request<T>(
-    url: string,
-    options?: AuthClientRequestOptions,
-  ): Promise<T> {
+  public async request<T>(url: string, options?: AuthClientRequestOptions): Promise<T> {
     if (!options) {
       options = {}
     }
@@ -394,13 +393,13 @@ export class OAuth2Client implements AuthClient {
     }
     let response: T | null = null
     const maxRequestTimes: number = retry + 1
-    for (
-      let requestTime = 0;
-      requestTime < maxRequestTimes;
-      requestTime++
-    ) {
+    for (let requestTime = 0; requestTime < maxRequestTimes; requestTime++) {
       try {
-        response = await this.baseRequest<T>(url, options)
+        if (options.useWxCloud) {
+          response = await this.wxCloudCallFunction<T>(url, options)
+        } else {
+          response = await this.baseRequest<T>(url, options)
+        }
         break
       } catch (responseError) {
         if (options.withCredentials && responseError && responseError.error === ErrorType.UNAUTHENTICATED) {
@@ -408,11 +407,7 @@ export class OAuth2Client implements AuthClient {
           return Promise.reject(responseError)
         }
 
-        if (
-          requestTime === retry
-          || !responseError
-          || responseError.error !== 'unreachable'
-        ) {
+        if (requestTime === retry || !responseError || responseError.error !== 'unreachable') {
           return Promise.reject(responseError)
         }
       }
@@ -421,6 +416,46 @@ export class OAuth2Client implements AuthClient {
     return response
   }
 
+  public async wxCloudCallFunction<T>(
+    url: string,
+    options?: RequestOptions,
+  ): Promise<T> {
+    let result: T | null = null
+    let responseError: ResponseError | null = null
+    try {
+      const { result: responseResult } = await this.wxCloud.callFunction({
+        name: 'httpOverCallFunction',
+        data: {
+          url,
+          method: options.method,
+          headers: {
+            origin: 'https://servicewechat.com',
+            ...options.headers,
+          },
+          body: options.body,
+        },
+      })
+
+      if (responseResult?.body?.error_code) {
+        responseError = responseResult?.body as ResponseError
+        responseError.error_uri = getPathName(url)
+      } else {
+        result = responseResult?.body as T
+      }
+    } catch (error) {
+      responseError = {
+        error: ErrorType.UNREACHABLE,
+        error_description: error.message,
+        error_uri: getPathName(url),
+      }
+    }
+
+    if (responseError) {
+      throw responseError
+    } else {
+      return result
+    }
+  }
 
   /**
    * Get credentials.
@@ -431,7 +466,7 @@ export class OAuth2Client implements AuthClient {
       if (credentials && credentials.scope === 'anonymous') {
         if (this.anonymousSignInFunc) {
           const c = await this.anonymousSignInFunc(credentials)
-          credentials = c || await this.localCredentials.getCredentials()
+          credentials = c || (await this.localCredentials.getCredentials())
         } else {
           credentials = await this.anonymousSignIn(credentials)
         }
@@ -501,11 +536,7 @@ export class OAuth2Client implements AuthClient {
    */
   private checkRetry(retry: number): number {
     let responseError: ResponseError | null = null
-    if (
-      typeof retry !== 'number'
-      || retry < OAuth2Client.minRetry
-      || retry > OAuth2Client.maxRetry
-    ) {
+    if (typeof retry !== 'number' || retry < OAuth2Client.minRetry || retry > OAuth2Client.maxRetry) {
       responseError = {
         error: ErrorType.UNREACHABLE,
         error_description: 'wrong options param: retry',
@@ -609,10 +640,8 @@ export class OAuth2Client implements AuthClient {
     if (this.deviceID) {
       return this.deviceID
     }
-    let deviceId: string = await this.storage.getItem(DeviceIdSectionName,)
-    if (!(typeof deviceId === 'string'
-      && deviceId.length >= 16
-      && deviceId.length <= 48)) {
+    let deviceId: string = await this.storage.getItem(DeviceIdSectionName)
+    if (!(typeof deviceId === 'string' && deviceId.length >= 16 && deviceId.length <= 48)) {
       deviceId = uuidv4()
       await this.storage.setItem(DeviceIdSectionName, deviceId)
     }

package/src/utils/index.ts

@@ -17,9 +17,7 @@ export const deepClone = (value: any) => {
     return copiedValue
   }
 
-  const type = value === null || value === undefined
-    ? 'NullOrUndefined'
-    : Object.prototype.toString.call(value).slice(8, -1)
+  const type =    value === null || value === undefined ? 'NullOrUndefined' : Object.prototype.toString.call(value).slice(8, -1)
 
   if (
     [
@@ -59,3 +57,15 @@ export const deepClone = (value: any) => {
       return value
   }
 }
+
+export const getPathName = (url: string) => {
+  // eslint-disable-next-line no-useless-escape
+  const regex = /^(?:http(s)?:\/\/[^\/]+)?(\/[^\?#]*)/
+  const match = url.match(regex)
+
+  if (match) {
+    return match[2] || ''
+  }
+
+  return ''
+}