fix: 优化parseRid方法

baaxl9vh · May 1, 2022 · 841b462 · 841b462
1 parent 85ec14b
commit 841b462
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -24,6 +24,13 @@ export function createNonceStr (length = 16): string {
  * @returns 
  */
 export function parseRid (errMsg: string): string {
+  if (typeof errMsg !== 'string') {
+    return '';
+  }
   const index = errMsg.indexOf('rid:');
-  return errMsg.substring(index + 5);
+  if (index >= 0) {
+    return errMsg.substring(index + 5);
+  } else {
+    return '';
+  }
 }
diff --git a/lib/utils/utils.spec.ts b/lib/utils/utils.spec.ts
@@ -7,6 +7,9 @@ describe('Test utils', () => {
     const errMsg = `invalid credential, access_token is invalid or not latest rid: ${rid}`;
     const result = parseRid(errMsg);
     expect(result).toStrictEqual(rid);
+
+    expect(parseRid({} as any)).toStrictEqual('');
+    expect(parseRid('no rid to parse')).toStrictEqual('');
   });
 
 });