@cloudbase/oauth 2.5.39-beta.0 → 2.5.41-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/oauth",
-  "version": "2.5.39-beta.0",
+  "version": "2.5.41-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": "3b38f0f9222b02585f8918b150a82f5c230e9b49"
+  "gitHead": "e8513caf4d4c69629977296f3a977e831bddd314"
 }

package/src/auth/apis.ts

@@ -43,6 +43,7 @@ import {
   WithSudoRequest,
   PublicKey,
   EncryptParams,
+  ProviderSubType,
 } from './models'
 import { SimpleStorage, RequestFunction } from '../oauth2client/interface'
 import { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client'
@@ -56,6 +57,7 @@ export interface AuthOptions {
   clientId: string;
   credentialsClient?: OAuth2Client;
   request?: RequestFunction;
+  baseRequest?: RequestFunction;
   storage?: SimpleStorage;
   anonymousSignInFunc?: (Credentials) => Promise<Credentials | void>;
 }
@@ -758,4 +760,17 @@ export class Auth {
       public_key_thumbprint,
     }
   }
+
+  /**
+   * get provider sub type
+   * @returns
+   */
+  public async getProviderSubType(): Promise<ProviderSubType> {
+    return this.config.request<ProviderSubType>(ApiUrls.GET_PROVIDER_TYPE, {
+      method: 'POST',
+      body: {
+        provider_id: 'weda',
+      },
+    })
+  }
 }

package/src/auth/consts.ts

@@ -24,7 +24,8 @@ export enum ApiUrls {
   AUTH_RESET_PASSWORD = '/auth/v1/reset',
   AUTH_GET_DEVICE_CODE = '/auth/v1/device/code',
   CHECK_USERNAME = '/auth/v1/checkUsername',
-  CHECK_IF_USER_EXIST = '/auth/v1/checkIfUserExist'
+  CHECK_IF_USER_EXIST = '/auth/v1/checkIfUserExist',
+  GET_PROVIDER_TYPE = '/auth/v1/mgr/provider/providerSubType'
 }
 
 export enum ApiUrlsV2 {

package/src/auth/models.ts

@@ -464,3 +464,8 @@ export interface EncryptParams {
   public_key_thumbprint?: string; // 加密的公钥指纹
   params?: string; // 加密的数据
 }
+
+export interface ProviderSubType {
+  id: string;
+  provider_sub_type: 'NO_AUTH_LOGIN' | ''; // NO_AUTH_LOGIN-免密登录
+}

package/src/index.ts

@@ -33,12 +33,12 @@ export class CloudbaseOAuth {
   public authApi: Auth
 
   constructor(authOptions: AuthOptions) {
-    const { apiOrigin, clientId, storage, request, anonymousSignInFunc } = authOptions
+    const { apiOrigin, clientId, storage, request, baseRequest, anonymousSignInFunc } = authOptions
     this.oauth2client = new OAuth2Client({
       apiOrigin,
       clientId,
       storage,
-      baseRequest: request,
+      baseRequest: baseRequest || request,
       anonymousSignInFunc,
     })
 

package/src/utils/encrypt.ts

@@ -1,4 +1,4 @@
-import JSEncrypt from 'encryptlong'
+import JSEncrypt from './encryptlong'
 // import HmacSHA256 from 'crypto-js/hmac-sha256'
 // import WordArray from 'crypto-js/lib-typedarrays'
 import { deepClone } from '.'