whyuzeim 1.1.153 → 1.1.154

package/cjs/index.js

@@ -8,16 +8,12 @@ var classNames = require('classnames');
 var axios = require('axios');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/esm/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
-var jsrsasign = require('jsrsasign');
-var _typeof = require('@babel/runtime-corejs3/helpers/esm/typeof');
-require('@babel/runtime-corejs3/core-js-stable/json/stringify');
-var CryptoJS = require('crypto-js');
-var JSEncrypt = require('jsencrypt');
 var _sliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/slice');
 var _Array$from = require('@babel/runtime-corejs3/core-js-stable/array/from');
 var _Symbol = require('@babel/runtime-corejs3/core-js-stable/symbol');
 var _getIteratorMethod = require('@babel/runtime-corejs3/core-js/get-iterator-method');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
+var _typeof = require('@babel/runtime-corejs3/helpers/esm/typeof');
 require('./IM/style/index.scss');
 var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
@@ -134943,34 +134939,6 @@ var Context = /*#__PURE__*/React.createContext({
   canSidebarExpand: true
 });
 
-new JSEncrypt();
-// 生成 AESKEY
-var aesKey = createAesKey();
-function createAesKey() {
-  var expect = 16;
-  var str = Math.random().toString(36).substr(2);
-  while (str.length < expect) {
-    str += Math.random().toString(36).substr(2);
-  }
-  str = str.substr(0, 16);
-  return str;
-}
-/**
- * AES 解密
- * @param word 待解密数据
- * @param keyStr 解密 key
- * @returns {string} 返回解密字符串
- */
-function aesDecrypt(word, keyStr) {
-  keyStr = keyStr || aesKey;
-  var key = CryptoJS.enc.Utf8.parse(keyStr);
-  var decrypt = CryptoJS.AES.decrypt(word, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return decrypt.toString(CryptoJS.enc.Utf8);
-}
-
 var useGetAgoraToken = function useGetAgoraToken(http, uid) {
   var _useState = React.useState(""),
     _useState2 = _slicedToArray(_useState, 2),
@@ -134978,7 +134946,7 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
     setAgoraToken = _useState2[1];
   var client = z_e();
   var handleGetToken = React.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var result1, publickey, publicPemKey, pub, enc, result2, token;
+    var result2;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -134990,29 +134958,14 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
         case 2:
           window.AGAIN_ENTER_IM_INIT = true;
           _context.next = 5;
-          return http.get("/capi/account/imuser/getkeypair", {
-            params: {
-              type: 2
-            }
+          return http.get("/api/imchannel/getUserToken", {
+            params: {}
           });
         case 5:
-          result1 = _context.sent;
-          publickey = result1.data.data.publickey; // const rsaStr = encryption.rsaEncrypt(this.aesKey, publickey)
-          publicPemKey = "-----BEGIN PUBLIC KEY-----\n" + publickey + "\n-----END PUBLIC KEY-----";
-          pub = jsrsasign.KEYUTIL.getKey(publicPemKey);
-          enc = jsrsasign.KJUR.crypto.Cipher.encrypt(aesKey, pub, "RSAOAEP");
-          _context.next = 12;
-          return http.get("/capi/account/imuser/getutoken", {
-            params: {
-              type: 2,
-              token: jsrsasign.hextob64(enc)
-            }
-          });
-        case 12:
           result2 = _context.sent;
-          token = aesDecrypt(result2.data.data.utoken, aesKey);
-          setAgoraToken(token);
-        case 15:
+          // const token = aesDecrypt(result2.data.data.token, aesKey);
+          setAgoraToken(result2.data.data.token);
+        case 7:
         case "end":
           return _context.stop();
       }

package/es/index.js

@@ -7,16 +7,12 @@ import classNames from 'classnames';
 import axios from 'axios';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/esm/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
-import jsrsasign from 'jsrsasign';
-import _typeof from '@babel/runtime-corejs3/helpers/esm/typeof';
-import '@babel/runtime-corejs3/core-js-stable/json/stringify';
-import CryptoJS from 'crypto-js';
-import JSEncrypt from 'jsencrypt';
 import _sliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/slice';
 import _Array$from from '@babel/runtime-corejs3/core-js-stable/array/from';
 import _Symbol from '@babel/runtime-corejs3/core-js-stable/symbol';
 import _getIteratorMethod from '@babel/runtime-corejs3/core-js/get-iterator-method';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
+import _typeof from '@babel/runtime-corejs3/helpers/esm/typeof';
 import './IM/style/index.scss';
 import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
@@ -134922,34 +134918,6 @@ var Context = /*#__PURE__*/React__default.createContext({
   canSidebarExpand: true
 });
 
-new JSEncrypt();
-// 生成 AESKEY
-var aesKey = createAesKey();
-function createAesKey() {
-  var expect = 16;
-  var str = Math.random().toString(36).substr(2);
-  while (str.length < expect) {
-    str += Math.random().toString(36).substr(2);
-  }
-  str = str.substr(0, 16);
-  return str;
-}
-/**
- * AES 解密
- * @param word 待解密数据
- * @param keyStr 解密 key
- * @returns {string} 返回解密字符串
- */
-function aesDecrypt(word, keyStr) {
-  keyStr = keyStr || aesKey;
-  var key = CryptoJS.enc.Utf8.parse(keyStr);
-  var decrypt = CryptoJS.AES.decrypt(word, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return decrypt.toString(CryptoJS.enc.Utf8);
-}
-
 var useGetAgoraToken = function useGetAgoraToken(http, uid) {
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
@@ -134957,7 +134925,7 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
     setAgoraToken = _useState2[1];
   var client = z_e();
   var handleGetToken = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var result1, publickey, publicPemKey, pub, enc, result2, token;
+    var result2;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -134969,29 +134937,14 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
         case 2:
           window.AGAIN_ENTER_IM_INIT = true;
           _context.next = 5;
-          return http.get("/capi/account/imuser/getkeypair", {
-            params: {
-              type: 2
-            }
+          return http.get("/api/imchannel/getUserToken", {
+            params: {}
           });
         case 5:
-          result1 = _context.sent;
-          publickey = result1.data.data.publickey; // const rsaStr = encryption.rsaEncrypt(this.aesKey, publickey)
-          publicPemKey = "-----BEGIN PUBLIC KEY-----\n" + publickey + "\n-----END PUBLIC KEY-----";
-          pub = jsrsasign.KEYUTIL.getKey(publicPemKey);
-          enc = jsrsasign.KJUR.crypto.Cipher.encrypt(aesKey, pub, "RSAOAEP");
-          _context.next = 12;
-          return http.get("/capi/account/imuser/getutoken", {
-            params: {
-              type: 2,
-              token: jsrsasign.hextob64(enc)
-            }
-          });
-        case 12:
           result2 = _context.sent;
-          token = aesDecrypt(result2.data.data.utoken, aesKey);
-          setAgoraToken(token);
-        case 15:
+          // const token = aesDecrypt(result2.data.data.token, aesKey);
+          setAgoraToken(result2.data.data.token);
+        case 7:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whyuzeim",
-  "version": "1.1.153",
+  "version": "1.1.154",
   "description": "im componenets",
   "main": "cjs/index.js",
   "module": "es/index.js",