Merge pull request #1194 from hackmdio/upgrade-dependency

Upgrade dependency to fix vulnerabilities issue

Author: a60814billy

lib/models/note.js

@@ -5,7 +5,7 @@ var path = require('path')
 var LZString = require('@hackmd/lz-string')
 var base64url = require('base64url')
 var md = require('markdown-it')()
-var metaMarked = require('meta-marked')
+var metaMarked = require('@hackmd/meta-marked')
 var cheerio = require('cheerio')
 var shortId = require('shortid')
 var Sequelize = require('sequelize')

lib/web/auth/mattermost/index.js

@@ -1,16 +1,17 @@
 'use strict'
-
+require('babel-polyfill')
+require('isomorphic-fetch');
 const Router = require('express').Router
 const passport = require('passport')
-const Mattermost = require('mattermost')
+const MattermostClient = require('mattermost-redux/client/client4').default
 const OAuthStrategy = require('passport-oauth2').Strategy
 const config = require('../../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 
-const mattermost = new Mattermost.Client()
-
 let mattermostAuth = module.exports = Router()
 
+const mattermostClient = new MattermostClient()
+
 let mattermostStrategy = new OAuthStrategy({
   authorizationURL: config.mattermost.baseURL + '/oauth/authorize',
   tokenURL: config.mattermost.baseURL + '/oauth/access_token',
@@ -20,17 +21,11 @@ let mattermostStrategy = new OAuthStrategy({
 }, passportGeneralCallback)
 
 mattermostStrategy.userProfile = (accessToken, done) => {
-  mattermost.setUrl(config.mattermost.baseURL)
-  mattermost.token = accessToken
-  mattermost.useHeaderToken()
-  mattermost.getMe(
-    (data) => {
-      done(null, data)
-    },
-    (err) => {
-      done(err)
-    }
-  )
+  mattermostClient.setUrl(config.mattermost.baseURL)
+  mattermostClient.setToken(accessToken)
+  mattermostClient.getMe()
+    .then((data) => done(null, data))
+    .catch((err) => done(err))
 }
 
 passport.use(mattermostStrategy)