From f3178a8171aaab2f4697531ac401fa9f180fc6a5 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 12 Sep 2018 10:59:48 +0800
Subject: [PATCH] Fix JSON parse error in authority

close #2243
close #2276
close #2185
close #2226
close #2218
close #2241
ref #2170
---
 src/components/SiderMenu/SiderMenu.js |  1 -
 src/utils/authority.js                | 17 +++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js
index e457f2f5..d0ca78ef 100644
--- a/src/components/SiderMenu/SiderMenu.js
+++ b/src/components/SiderMenu/SiderMenu.js
@@ -98,7 +98,6 @@ export default class SiderMenu extends PureComponent {
 
     return (
       <Sider
-        trigger={null}
         collapsible
         collapsed={collapsed}
         breakpoint="lg"
diff --git a/src/utils/authority.js b/src/utils/authority.js
index 76bd0f7c..d595df32 100644
--- a/src/utils/authority.js
+++ b/src/utils/authority.js
@@ -1,17 +1,14 @@
 // use localStorage to store the authority info, which might be sent from server in actual project.
 export function getAuthority() {
   // return localStorage.getItem('antd-pro-authority') || ['admin', 'user'];
-  let authority = localStorage.getItem('antd-pro-authority');
-  if (authority) {
-    if (authority.includes('[')) {
-      authority = JSON.parse(authority);
-    } else {
-      authority = [JSON.parse(authority)];
-    }
-  } else {
-    authority = ['admin'];
+  const authorityString = localStorage.getItem('antd-pro-authority');
+  let authority;
+  try {
+    authority = JSON.parse(authorityString);
+  } catch (e) {
+    authority = [authorityString];
   }
-  return authority;
+  return authority || ['admin'];
 }
 
 export function setAuthority(authority) {
-- 
GitLab