@cloudbase/oauth 2.5.25-beta.0 → 2.5.27-beta.0

package/src/oauth2client/oauth2client.ts

@@ -1,4 +1,5 @@
 import { ErrorType } from './consts'
+import { ApiUrls, ApiUrlsV2 } from '../auth/consts'
 
 import { AuthClient, SimpleStorage } from './interface'
 
@@ -291,7 +292,7 @@ export class OAuth2Client implements AuthClient {
   private storage: SimpleStorage
   private deviceID?: string
   private tokenInURL?: boolean
-  private refreshTokenFunc: (refreshToken?: string) => Promise<Credentials>
+  private refreshTokenFunc: (refreshToken?: string, credentials?: Credentials) => Promise<Credentials>
   private headers?: { [key: string]: string }
   private singlePromise: SinglePromise = new SinglePromise()
   private anonymousSignInFunc: (Credentials) => Promise<Credentials | void>
@@ -469,6 +470,30 @@ export class OAuth2Client implements AuthClient {
     return credentials.groups
   }
 
+  /**
+   * Refresh expired token.
+   * @param {Credentials} credentials
+   * @return {Promise<Credentials>}
+   */
+  public async refreshToken(credentials: Credentials): Promise<Credentials> {
+    return this.singlePromise.run('_refreshToken', async () => {
+      if (!credentials || !credentials.refresh_token) {
+        return this.unAuthenticatedError('no refresh token found in credentials')
+      }
+      try {
+        const newCredentials: Credentials = await this.refreshTokenFunc(credentials.refresh_token, credentials)
+        await this.localCredentials.setCredentials(newCredentials)
+        return newCredentials
+      } catch (error) {
+        if (error.error === ErrorType.INVALID_GRANT) {
+          await this.localCredentials.setCredentials(null)
+          return this.unAuthenticatedError(error.error_description)
+        }
+        return Promise.reject(error)
+      }
+    })
+  }
+
   /**
    * Check retry value.
    * @param {number} retry
@@ -518,30 +543,6 @@ export class OAuth2Client implements AuthClient {
     })
   }
 
-  /**
-   * Refresh expired token.
-   * @param {Credentials} credentials
-   * @return {Promise<Credentials>}
-   */
-  private async refreshToken(credentials: Credentials): Promise<Credentials> {
-    return this.singlePromise.run('_refreshToken', async () => {
-      if (!credentials || !credentials.refresh_token) {
-        return this.unAuthenticatedError('no refresh token found in credentials')
-      }
-      try {
-        const newCredentials: Credentials = await this.refreshTokenFunc(credentials.refresh_token,)
-        await this.localCredentials.setCredentials(newCredentials)
-        return newCredentials
-      } catch (error) {
-        if (error.error === ErrorType.INVALID_GRANT) {
-          await this.localCredentials.setCredentials(null)
-          return this.unAuthenticatedError(error.error_description)
-        }
-        return Promise.reject(error)
-      }
-    })
-  }
-
   /**
    * anonymous signIn
    * @param {Credentials} credentials
@@ -577,11 +578,18 @@ export class OAuth2Client implements AuthClient {
    * @param {string} refreshToken
    * @return {Promise<Credentials>}
    */
-  private defaultRefreshTokenFunc(refreshToken?: string,): Promise<Credentials> {
+  private async defaultRefreshTokenFunc(refreshToken?: string, credentials?: Credentials): Promise<Credentials> {
     if (refreshToken === undefined || refreshToken === '') {
       return this.unAuthenticatedError('refresh token not found')
     }
-    return this.request('/auth/v1/token', {
+
+    let url: string = ApiUrls.AUTH_TOKEN_URL
+
+    if (credentials?.version === 'v2') {
+      url = ApiUrlsV2.AUTH_TOKEN_URL
+    }
+
+    const newCredentials: Credentials = await this.request(url, {
       method: 'POST',
       body: {
         client_id: this.clientId,
@@ -590,6 +598,8 @@ export class OAuth2Client implements AuthClient {
         refresh_token: refreshToken,
       },
     })
+
+    return { ...newCredentials, version: credentials?.version || 'v1' }
   }
 
   /**

package/src/utils/index.ts

@@ -0,0 +1,61 @@
+/**
+ * 深拷贝
+ * @param {*} value 需要拷贝的值
+ * @returns {*} 深拷贝后的值
+ * @example
+ * const obj = { a: 1, b: { c: 2 } };
+ * const newObj = deepClone(obj);
+ */
+export const deepClone = (value: any) => {
+  const clone = (copiedValue: any) => {
+    for (const key in value) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (value.hasOwnProperty(key)) {
+        copiedValue[key] = deepClone(value[key])
+      }
+    }
+    return copiedValue
+  }
+
+  const type = value === null || value === undefined
+    ? 'NullOrUndefined'
+    : Object.prototype.toString.call(value).slice(8, -1)
+
+  if (
+    [
+      'Int8Array',
+      'Uint8Array',
+      'Uint8ClampedArray',
+      'Int16Array',
+      'Uint16Array',
+      'Int32Array',
+      'Uint32Array',
+      'Float32Array',
+      'Float64Array',
+      'BigInt64Array',
+      'BigUint64Array',
+    ].includes(type)
+  ) {
+    return value.slice()
+  }
+
+  switch (type) {
+    case 'Object':
+      return clone(Object.create(Object.getPrototypeOf(value)))
+    case 'Array':
+      return clone([])
+    case 'Date':
+      return new Date(value.valueOf())
+    case 'RegExp':
+      return new RegExp(
+        value.source,
+        (value.global ? 'g' : '')
+          + (value.ignoreCase ? 'i' : '')
+          + (value.multiline ? 'm' : '')
+          + (value.sticky ? 'y' : '')
+          + (value.unicode ? 'u' : ''),
+      )
+    default:
+      return value
+  }
+}