Merge pull request #1696 from ActiveLearningStudio/feature/msteams-integration-staging

Merge pull request #1695 from ActiveLearningStudio/feature/msteams-in…

Author: CptTony

src/containers/LMS/MsTeams/MsTeamsActivityContainer/index.js

@@ -121,7 +121,7 @@ function MsTeamsActivityContainer({ match, history }) {
     const params = new URLSearchParams();
     params.append('client_id', config.teamsClientId);
     params.append('response_type', 'code');
-    params.append('scope', 'offline_access user.read mail.read');
+    params.append('scope', 'offline_access user.read');
     params.append('redirect_uri', `https://${window.location.hostname}/msteams/callback`);
     params.append('state', window.location.href);
     url.search = params.toString();

src/containers/MsTeams/callback.js

@@ -13,11 +13,12 @@ const MsTeamsCallBack = () => {
   const params = new URLSearchParams(useLocation().search);
   const code = params.get('code');
   const state = params.get('state');
+  const tenantId = state.split('msteam/')[1].split('/launch')[0];
   const [error, setError] = useState(null);
 
   // Get app context and auth token
   useEffect(() => {
-    MsTeamsService.msTeamsToken(code)
+    MsTeamsService.msTeamsToken(code, tenantId)
       .then((response) => {
         localStorage.setItem('msteams_token', response.access_token);
         localStorage.setItem('msteams_refresh_token', response.refresh_token);

src/services/msTeams.service.js

@@ -3,11 +3,12 @@ import config from 'config';
 import httpService from './http.service';
 const { apiVersion } = config;
 
-const msTeamsToken = (code) => httpService
+const msTeamsToken = (code, tenantId) => httpService
   .get(`/microsoft-team/get-access-token-via-code`,
   {},
   {
     code: code,
+    tenantId: tenantId,
   })
   .then(({ data }) => data)
   .catch((err) => Promise.reject(err.response.data));