whyuzeim 1.1.18 → 1.1.19

package/cjs/HighlyCustomChat/index.js

@@ -18,10 +18,12 @@ var _setInterval = require('@babel/runtime-corejs3/core-js-stable/set-interval')
 var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
 var React = require('react');
 var agoraChatUikit = require('agora-chat-uikit');
+var jsrsasign = require('jsrsasign');
 var context = require('../IM/context.js');
 var type = require('../type.js');
 var tools = require('../tools.js');
 var avatar_default = require('../Icon/avatar_default.svg.js');
+var encryption = require('../IM/encryption.js');
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), true)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -35,6 +37,7 @@ var HighlyCustomChat = function HighlyCustomChat(props) {
     onLoginSuccess = props.onLoginSuccess;
   var _useSDK = agoraChatUikit.useSDK(),
     MessageSDK = _useSDK.ChatSDK;
+  var manulLoginRef = React.useRef(false);
   var _useContext = React.useContext(context.Context),
     http = _useContext.http,
     userInfo = _useContext.userInfo;
@@ -308,6 +311,34 @@ var HighlyCustomChat = function HighlyCustomChat(props) {
     // 初始检查登录状态
     var currentLoginState = agoraChatUikit.rootStore.loginState;
     setLoading(!currentLoginState);
+    if (!agoraChatUikit.rootStore.loginState && !manulLoginRef.current && !window.AGAIN_ENTER_IM_INIT) {
+      manulLoginRef.current = true;
+      http.get("/capi/account/imuser/getkeypair", {
+        params: {
+          type: 2
+        }
+      }).then(function (result1) {
+        var publickey = result1.data.data.publickey;
+        // const rsaStr = encryption.rsaEncrypt(this.aesKey, publickey)
+        var publicPemKey = "-----BEGIN PUBLIC KEY-----\n" + publickey + "\n-----END PUBLIC KEY-----";
+        var pub = jsrsasign.KEYUTIL.getKey(publicPemKey);
+        var enc = jsrsasign.KJUR.crypto.Cipher.encrypt(encryption.aesKey, pub, "RSAOAEP");
+        http.get("/capi/account/imuser/getutoken", {
+          params: {
+            type: 2,
+            token: jsrsasign.hextob64(enc)
+          }
+        }).then(function (result2) {
+          var token = encryption.aesDecrypt(result2.data.data.utoken, encryption.aesKey);
+          client.open({
+            user: userInfo.uid,
+            accessToken: token
+          });
+        })["catch"](function (error) {
+          console.log(error, 'rewrew');
+        });
+      });
+    }
     if (currentLoginState && props.conversationId) {
       initConversation();
       getHeaderInfo();

package/cjs/IM/hooks/useGetAgoraToken.js

@@ -23,30 +23,31 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
           }
           return _context.abrupt("return");
         case 2:
-          _context.next = 4;
+          window.AGAIN_ENTER_IM_INIT = true;
+          _context.next = 5;
           return http.get("/capi/account/imuser/getkeypair", {
             params: {
               type: 2
             }
           });
-        case 4:
+        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(encryption.aesKey, pub, "RSAOAEP");
-          _context.next = 11;
+          _context.next = 12;
           return http.get("/capi/account/imuser/getutoken", {
             params: {
               type: 2,
               token: jsrsasign.hextob64(enc)
             }
           });
-        case 11:
+        case 12:
           result2 = _context.sent;
           token = encryption.aesDecrypt(result2.data.data.utoken, encryption.aesKey);
           setAgoraToken(token);
-        case 14:
+        case 15:
         case "end":
           return _context.stop();
       }

package/cjs/IM/index.js

@@ -32,6 +32,7 @@ var IM = function IM(props) {
     onAdditionalConversationClick = props.onAdditionalConversationClick,
     onRenderConversationItem = props.onRenderConversationItem,
     canSidebarExpand = props.canSidebarExpand;
+  window.AGAIN_ENTER_IM_INIT = false;
   console.log("the useinfo is", userInfo);
   var agoraToken = useGetAgoraToken.useGetAgoraToken(http, userInfo.uid);
   var _useState = React.useState(),

package/es/HighlyCustomChat/index.js

@@ -14,12 +14,14 @@ import _findInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instanc
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/for-each';
 import _setInterval from '@babel/runtime-corejs3/core-js-stable/set-interval';
 import _trimInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/trim';
-import React, { useContext, useState, useCallback, useEffect } from 'react';
+import React, { useRef, useContext, useState, useCallback, useEffect } from 'react';
 import { useClient, useSDK, rootStore, MessageList, MessageInput, ImageMessage, FileMessage, VideoMessage, BaseMessage } from 'agora-chat-uikit';
+import jsrsasign from 'jsrsasign';
 import { Context } from '../IM/context.js';
 import { commonMessageInputConfig, commonMessageProps } from '../type.js';
 import { reportAgentInUse } from '../tools.js';
 import img from '../Icon/avatar_default.svg.js';
+import { aesKey, aesDecrypt } from '../IM/encryption.js';
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), true)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -33,6 +35,7 @@ var HighlyCustomChat = function HighlyCustomChat(props) {
     onLoginSuccess = props.onLoginSuccess;
   var _useSDK = useSDK(),
     MessageSDK = _useSDK.ChatSDK;
+  var manulLoginRef = useRef(false);
   var _useContext = useContext(Context),
     http = _useContext.http,
     userInfo = _useContext.userInfo;
@@ -306,6 +309,34 @@ var HighlyCustomChat = function HighlyCustomChat(props) {
     // 初始检查登录状态
     var currentLoginState = rootStore.loginState;
     setLoading(!currentLoginState);
+    if (!rootStore.loginState && !manulLoginRef.current && !window.AGAIN_ENTER_IM_INIT) {
+      manulLoginRef.current = true;
+      http.get("/capi/account/imuser/getkeypair", {
+        params: {
+          type: 2
+        }
+      }).then(function (result1) {
+        var publickey = result1.data.data.publickey;
+        // const rsaStr = encryption.rsaEncrypt(this.aesKey, publickey)
+        var publicPemKey = "-----BEGIN PUBLIC KEY-----\n" + publickey + "\n-----END PUBLIC KEY-----";
+        var pub = jsrsasign.KEYUTIL.getKey(publicPemKey);
+        var enc = jsrsasign.KJUR.crypto.Cipher.encrypt(aesKey, pub, "RSAOAEP");
+        http.get("/capi/account/imuser/getutoken", {
+          params: {
+            type: 2,
+            token: jsrsasign.hextob64(enc)
+          }
+        }).then(function (result2) {
+          var token = aesDecrypt(result2.data.data.utoken, aesKey);
+          client.open({
+            user: userInfo.uid,
+            accessToken: token
+          });
+        })["catch"](function (error) {
+          console.log(error, 'rewrew');
+        });
+      });
+    }
     if (currentLoginState && props.conversationId) {
       initConversation();
       getHeaderInfo();

package/es/IM/hooks/useGetAgoraToken.js

@@ -21,30 +21,31 @@ var useGetAgoraToken = function useGetAgoraToken(http, uid) {
           }
           return _context.abrupt("return");
         case 2:
-          _context.next = 4;
+          window.AGAIN_ENTER_IM_INIT = true;
+          _context.next = 5;
           return http.get("/capi/account/imuser/getkeypair", {
             params: {
               type: 2
             }
           });
-        case 4:
+        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 = 11;
+          _context.next = 12;
           return http.get("/capi/account/imuser/getutoken", {
             params: {
               type: 2,
               token: jsrsasign.hextob64(enc)
             }
           });
-        case 11:
+        case 12:
           result2 = _context.sent;
           token = aesDecrypt(result2.data.data.utoken, aesKey);
           setAgoraToken(token);
-        case 14:
+        case 15:
         case "end":
           return _context.stop();
       }

package/es/IM/index.js

@@ -30,6 +30,7 @@ var IM = function IM(props) {
     onAdditionalConversationClick = props.onAdditionalConversationClick,
     onRenderConversationItem = props.onRenderConversationItem,
     canSidebarExpand = props.canSidebarExpand;
+  window.AGAIN_ENTER_IM_INIT = false;
   console.log("the useinfo is", userInfo);
   var agoraToken = useGetAgoraToken(http, userInfo.uid);
   var _useState = useState(),

package/package.json

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