@cloudbase/oauth 2.5.38-beta.0 → 2.5.40-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/oauth",
-  "version": "2.5.38-beta.0",
+  "version": "2.5.40-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": "4ed39f8929f3b129f4a25cefdbe9dfcbf4bd523f"
+  "gitHead": "fdd47542ba93aa05a9a917b2b3cee8e6d5d04c66"
 }

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'
@@ -758,4 +759,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/utils/encrypt.ts

@@ -1,6 +1,6 @@
-import JSEncrypt from 'encryptlong'
-import HmacSHA256 from 'crypto-js/hmac-sha256'
-import WordArray from 'crypto-js/lib-typedarrays'
+import JSEncrypt from './encryptlong'
+// import HmacSHA256 from 'crypto-js/hmac-sha256'
+// import WordArray from 'crypto-js/lib-typedarrays'
 import { deepClone } from '.'
 
 /**
@@ -19,17 +19,17 @@ export const getEncryptInfo = ({ publicKey = '', payload = {} } = {}) => {
     // 设置公钥
     rsaInstance.setPublicKey(publicKey)
     // 生成时间戳
-    params.timestamp = +new Date()
+    // params.timestamp = +new Date()
     // 确定签名算法
-    const signMethod = 'HmacSHA256'
+    // const signMethod = 'HmacSHA256'
     // 生成随机数
-    const nonce = WordArray.random(16).toString()
+    // const nonce = WordArray.random(16).toString()
     // 生成签名：基本参数、时间戳 + 随机数
-    const signature = HmacSHA256(JSON.stringify(params), nonce).toString()
+    // const signature = HmacSHA256(JSON.stringify(params), nonce).toString()
     // 将签名放入参数中
-    params.signature = signature
-    params.nonce = nonce
-    params.signMethod = signMethod
+    // params.signature = signature
+    // params.nonce = nonce
+    // params.signMethod = signMethod
     // rsa公钥加密
     const encrypted = rsaInstance.encryptLong(JSON.stringify(params))