refactors answers codes to parse user data from jwt token. Moves pars…

CODE_OF_CONDUCT.md

@@ -0,0 +1,45 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team on [Slack](https://join.slack.com/t/hackingcovid19/shared_invite/zt-cs0oy49c-bwn5uoilSme1iqFDDK7~zg "Hacking Covid19"). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

api/routes/common.js

@@ -0,0 +1,12 @@
+const jose = require('jose');
+
+export const parseToken = (jwtToken) => {
+      const item = jose.JWT.decode(jwtToken);
+      const user = new User();
+      user.profilestatus = "level 0";
+      user.fullname = item.given_name + " " + item.family_name;
+      user.b2cid = item.sub;
+      user.lastsignintime = item.auth_time;
+      user.email = item.emails[0];
+      return user;  
+};

api/routes/questionList.js

@@ -3,6 +3,10 @@ const getUrls = require('get-urls');
 
 const QuestionDao = require('../models/questionDao')
 
+
+import { parseToken } from './common';
+import { answerContainerId } from '../config';
+
 /**
  * @swagger
  * definitions:
@@ -314,6 +318,12 @@ class PostList {
     let sources = [];
     let youtubeLinks = [];
     let answer = req.body;
+    let userData = parseToken(answer.jwt);
+
+    const userDetails = {
+      id: userData.id,
+      name: userData.anonymous ? userData.fullname : null
+    }
 
     const urls = getUrls(answer.text);
 
@@ -332,22 +342,19 @@ class PostList {
 
     return {
       ...answer,
+      userDetails,
+      country: userData.country,
       sources,
       youtubeLinks
     };
   }
 
   async addAnswer (req, res) {
     const answer = this.parseAnswer(req)
-    var firstAnsweredBy = {}, lastAnsweredBy = {};
-    firstAnsweredBy.name = "Nth Opinion"
-    firstAnsweredBy.loginId = "e060f24a-bd81-4d65-877f-857f31f2cf31"
-    lastAnsweredBy.name = "Nth Opinion"
-    lastAnsweredBy.loginId = "e060f24a-bd81-4d65-877f-857f31f2cf31"
-    answer["firstAnsweredBy"] = firstAnsweredBy;
-    answer["lastAnsweredBy"] = lastAnsweredBy;
-    var date = new Date();
-    var timestamp = Math.floor(date.getTime()/1000.0);
+    answer["firstAnsweredBy"] = answer.userDetails;
+    answer["lastAnsweredBy"] = answer.userDetails;
+    let date = new Date();
+    let timestamp = Math.floor(date.getTime()/1000.0);
     answer.firstAnsweredOn = timestamp;
     answer.lastAnsweredOn = timestamp;
     await this.questionDao.addAnswer(answer)
@@ -356,20 +363,12 @@ class PostList {
 
   async editAnswer (req, res) {
     const answer = this.parseAnswer(req)
-    if (answer.lastAnsweredBy === undefined)
-    {
-      var lastAnsweredBy = {};
-      lastAnsweredBy.name = "Nth Opinion"
-      lastAnsweredBy.loginId = "e060f24a-bd81-4d65-877f-857f31f2cf31"
-      answer["lastAnsweredBy"] = lastAnsweredBy;
-    }
-    else
+    if (answer.lastAnsweredBy === undefined || answer.lastAnsweredBy != answer.userDetails.name)
     {
-      answer.lastAnsweredBy.name = "Nth Opinion"
-      answer.lastAnsweredBy.loginId = "e060f24a-bd81-4d65-877f-857f31f2cf31"
+      answer.lastAnsweredBy = answer.userDetails;
     }
-    var date = new Date();
-    var timestamp = Math.floor(date.getTime()/1000.0);
+    let date = new Date();
+    let timestamp = Math.floor(date.getTime()/1000.0);
     answer.lastAnsweredOn = timestamp;
     await this.questionDao.editAnswer(answer)
     res.send('ok')

api/routes/userList.js

@@ -1,9 +1,10 @@
 const Pusher = require('pusher');
 const getUrls = require('get-urls');
-const jose = require('jose');
 
 const UserDao = require('../models/questionDao')
 
+import { parseToken } from './common';
+
 const config = require('../config')
 
 class User{
@@ -73,7 +74,7 @@ class UserList{
 
     async validateUser (req, res) {
       const jwtToken = req.body;
-      const user = this.parsetoken(jwtToken.jwt);
+      const user = parseToken(jwtToken.jwt);
       const verifiedUser = await this.userDao.getUser(user.email);
       user.profilestatus = "level 0";  //initializing the access
       if (verifiedUser !== undefined)
@@ -91,18 +92,6 @@ class UserList{
       res.send(user);
     }
 
-    parsetoken(jwtToken)
-    {
-      const item = jose.JWT.decode(jwtToken);
-      const user = new User();
-      user.profilestatus = "level 0";
-      user.fullname = item.given_name + " " + item.family_name;
-      user.b2cid = item.sub;
-      user.lastsignintime = item.auth_time;
-      user.email = item.emails[0];
-      return user;  
-    }
-
     async addUser (req, res) {
       // console.log('req' + JSON.stringify(req.body))
       const item = req.body;
@@ -137,4 +126,4 @@ class UserList{
     }
 
 }
-module.exports = UserList;
+module.exports = UserList;

client/public/locales/en/navLink.json

@@ -11,6 +11,6 @@
   "getInvolved": "GET INVOLVED",
   "partners": "PARTNERS",
   "contactUs": "DISCLAIMER",
-  "language": "LANGUAGE"
-  "televideo": "TELEVIDEO"
+  "language": "LANGUAGE",
+  "teleVideo": "TELEVIDEO"
 }

client/src/actions/question.js

@@ -17,7 +17,6 @@ import {
   NEW_QUESTION_ANSWERED,
   DELETE_ANSWERED_QUESTION_SUCCESS,
   DELETE_UNANSWERED_QUESTION_SUCCESS,
-  CHANGE_LANGUAGE,
 } from '../constants/ActionTypes';
 
 import config from '../config';
@@ -136,14 +135,14 @@ export const handleNewQuestionAnswered = (question) => (dispatch) => {
 };
 
 export const changeLanguage = (selectLanguage) => {
-  let lang = selectLanguage;
+  const lang = selectLanguage;
   return (dispatch) => {
-    return fetch(`${config.domainURL}/api/changeLanguage`,{
+    return fetch(`${config.domainURL}/api/changeLanguage`, {
       method: 'POST',
       headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
-        'language': lang,
+        language: lang,
       },
       body: JSON.stringify({ language: lang }),
     })
@@ -279,4 +278,3 @@ export const handleAnswerLike = (questionId, answerId) => {
       });
   };
 };
-

client/src/components/FlagButton.js

@@ -39,7 +39,7 @@ class FlagButton extends React.Component {
           ref={(e) => {
             this.itemToChangeColor = e;
           }}
-          className={this.state.selected ? 'flag-button-clicked' : ''}
+          className={this.state.selected ? 'flag-button-clicked' : 'button'}
           viewBox="0 0 15 13"
           width="15"
           xmlns="http://www.w3.org/2000/svg"

client/src/components/LikeButton.js

@@ -40,9 +40,7 @@ class LikeButton extends React.Component {
           ref={(e) => {
             this.itemToChangeColor = e;
           }}
-          className={
-            this.state.changeColor ? 'like-button-clicked' : 'like-button'
-          }
+          className={this.state.changeColor ? 'like-button-clicked' : 'button'}
           viewBox="0 0 15 13"
           width="15"
           xmlns="http://www.w3.org/2000/svg"
@@ -54,14 +52,13 @@ class LikeButton extends React.Component {
           </g>
         </svg>
         <div
-          className={
-            this.state.changeColor ? 'like-button-clicked' : 'like-button'
-          }
+          className={this.state.changeColor ? 'like-button-clicked' : 'button'}
           style={{ marginLeft: '0.5em' }}
           ref={(e) => {
             this.itemToChangeColor = e;
           }}
         >
+          {/* TODO animate the text when it changes */}
           {this.props.likes}
         </div>
       </div>

client/src/components/PhysicianView.js

@@ -46,7 +46,8 @@ class PhysicianView extends Component {
               <a
                 href="https://ai-passion.appspot.com/"
                 target="_blank"
-                class="active item"
+                rel="noopener noreferrer"
+                className="active item"
               >
                 Televideo
               </a>

client/src/containers/PatientBoard.js

@@ -92,7 +92,7 @@ class PatientBoard extends Component {
       this.props.searchQuestions(this.props.questions, this.props.searchTerm);
     }, 500);
 
-/*     // submit question
+    /*     // submit question
     if (this.props.results.length !== 0) return;
     // var self = this
     if (
@@ -106,13 +106,13 @@ class PatientBoard extends Component {
         this.handleSubmitNewQuestion();
       }, 1000);
     }
- */  
+ */
   };
 
   handleSubmitNewQuestion = () => {
     this.props.postQuestion(this.props.searchTerm);
 
-    this.setState({ prevSearchTerm: this.props.searchTerm });
+    // this.setState({ prevSearchTerm: this.props.searchTerm });
     // dispatch(resetSearchResult());
     // dispatch(searchQuestions(this.props.questions, this.props.searchTerm))
   };
@@ -192,9 +192,7 @@ class PatientBoard extends Component {
                   </div>
                   <div className="board-link">
                     <Link to="/bIiOOIIqgwEXwUU3SaD0F9">
-                    {this.props.t(
-                      'patientBoard:addQuestion.areyouphysician'
-                    )}
+                      {this.props.t('patientBoard:addQuestion.areyouphysician')}
                     </Link>
                   </div>
                 </div>