Merge branch 'feature/admin2'

@@ -122,7 +122,7 @@ class IWABaseView:
             'redirect_uri': redirect_uri,
             'redirect_uri': redirect_uri,
         }
         }
         # get_params_str = '&'.join(['{0}={1}'.format(k, v) for k, v in get_params_dict.items()])
         # get_params_str = '&'.join(['{0}={1}'.format(k, v) for k, v in get_params_dict.items()])
-        iwa_token_url = '{0}access_token'.format(iwa_url_base)
+        iwa_token_url = '{0}intranetb2x/access_token'.format(iwa_url_base)
         res = requests.post(url=iwa_token_url, headers=headers, data=get_params_dict)
         res = requests.post(url=iwa_token_url, headers=headers, data=get_params_dict)
 
 
         return res.json().get('access_token', '')
         return res.json().get('access_token', '')
@@ -132,7 +132,7 @@ class IWABaseView:
         headers = {
         headers = {
             'Authorization': 'Bearer {0}'.format(access_token)
             'Authorization': 'Bearer {0}'.format(access_token)
         }
         }
-        iwa_user_url = '{0}userinfo'.format(iwa_url_base)
+        iwa_user_url = '{0}intranetb2x/userinfo'.format(iwa_url_base)
         res = requests.get(iwa_user_url, headers=headers)
         res = requests.get(iwa_user_url, headers=headers)
 
 
         return res.json()
         return res.json()