Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8b61495
Reactivating sonar-scanner just on 1 branch (master-sonar-scanner)
Clm-Roig Nov 18, 2018
c272ef1
Fix sonar-scanner branch in travis.yml
Clm-Roig Nov 18, 2018
f6f62a5
Fix sonar-scanner branch in travis.yml
Clm-Roig Nov 18, 2018
a473072
Fix sonar-scanner branch in travis.yml
Clm-Roig Nov 18, 2018
f18e7ee
modify due date (front+back), need reducers
Cyp-Leg Nov 12, 2018
7582723
reducer OK
Cyp-Leg Nov 12, 2018
659075d
front & back tests
Cyp-Leg Nov 12, 2018
94d44fb
fix tests & validators
Cyp-Leg Nov 12, 2018
d06e2da
Fix import conflicts
Cyp-Leg Nov 12, 2018
72014c8
Update doc, validator & controller
Cyp-Leg Nov 13, 2018
d10ee16
Fix empty date and handle empty hour or day
Clm-Roig Nov 13, 2018
c3e2dd0
Dl all assets (bootstrap, jquery, font awesome, google fonts...)
Clm-Roig Nov 14, 2018
feecefc
Removing npm packages
Clm-Roig Nov 14, 2018
64600c1
Beginning
Clm-Roig Nov 13, 2018
3df8c45
Auth via socket ok, missing handle error + tests
Clm-Roig Nov 13, 2018
9717633
Trying to handle errors... doesn't work.
Clm-Roig Nov 13, 2018
e362f70
Handle Socket error
Clm-Roig Nov 14, 2018
7076326
add : slack controller and slack route
cle-loubiere Nov 7, 2018
a0813fc
change request for axios
cle-loubiere Nov 8, 2018
97339c4
Better response for Slack app
Clm-Roig Nov 8, 2018
c1a23be
add : listsInfo et cardsInfo routes
cle-loubiere Nov 8, 2018
106f753
Better formatting
Clm-Roig Nov 8, 2018
1922a70
add : begin parsing
cle-loubiere Nov 9, 2018
9dd26c4
better parser with multiple user or cards
cle-loubiere Nov 9, 2018
406c0da
more options
cle-loubiere Nov 12, 2018
543e675
add card
cle-loubiere Nov 12, 2018
5d680e3
WIP ajout de liste
cle-loubiere Nov 12, 2018
06512ef
add list creation if specified and better regex
cle-loubiere Nov 13, 2018
2129dd8
fix : change addCard
cle-loubiere Nov 15, 2018
f2e8306
add : archive card with slack
cle-loubiere Nov 15, 2018
2b6b0e0
fix : Uppercase and punctuation.
cle-loubiere Nov 15, 2018
b3934e6
change treatment of request from controller to router
cle-loubiere Nov 15, 2018
6c97ed2
add and remove label
cle-loubiere Nov 15, 2018
e914456
wip auth slack
cle-loubiere Nov 15, 2018
d504a4f
userId get by passport slack
cle-loubiere Nov 16, 2018
961fd0a
add : getInfo
cle-loubiere Nov 17, 2018
1618a24
add : middleware
cle-loubiere Nov 17, 2018
af71d3b
some cleaning
cle-loubiere Nov 17, 2018
6185992
remove non used file
cle-loubiere Nov 17, 2018
5703989
fix package lock
Clm-Roig Nov 18, 2018
9cf5f9a
comment sonar
Clm-Roig Nov 18, 2018
939f0d1
comment sonar
Clm-Roig Nov 18, 2018
6778f78
remove sonarQ from travis.yml
Clm-Roig Nov 18, 2018
ebee2ce
fix : problems with rebase
cle-loubiere Nov 18, 2018
63a5ef6
Remove useless library + remove duplicate reducer
Clm-Roig Nov 18, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"axios": "^0.18.0",
"connected-react-router": "4.5.0",
"dotenv": "^6.1.0",
"font-awesome": "^4.7.0",
"history": "^4.7.2",
"js-file-download": "^0.4.4",
"prop-types": "^15.6.2",
Expand Down
1 change: 0 additions & 1 deletion client/src/reducers/currentBoardReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ export default function currentBoardReducer(state = initialState, action) {
},
};


default:
return state;
}
Expand Down
15 changes: 15 additions & 0 deletions server/middlewares/slack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Check if the token of the req is valid
*/
const isTokenValid = (req, res, next) => {
try {
if (req.param('token') === process.env.SLACK_VERIFICATION_TOKEN) next();
return;
} catch (e) {
return res.status(500).send({ error: 'Internal server error' });
}
};

module.exports = {
isTokenValid
};
1 change: 1 addition & 0 deletions server/models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const userSchema = new mongoose.Schema({
type: mongoose.Schema.Types.ObjectId,
ref: 'Team'
}],
slack: [{ id: String }],
github: {
type: {
id: String,
Expand Down
35 changes: 35 additions & 0 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"nodemailer": "^4.6.8",
"passport": "^0.4.0",
"passport-github": "^1.1.0",
"passport-slack": "0.0.7",
"request": "^2.88.0",
"socket.io": "^2.1.1",
"swagger-jsdoc": "^3.2.3",
Expand Down
1 change: 1 addition & 0 deletions server/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const router = express.Router();
require('./boards')(router);
require('./cards')(router);
require('./lists')(router);
require('./slack')(router);
require('./users')(router);
require('./teams')(router);
require('./users')(router);
Expand Down
Loading