Browse Source

remove basic-auth-connect

Yuki Takei 6 years ago
parent
commit
c8551e60d9

+ 0 - 1
package.json

@@ -68,7 +68,6 @@
     "async": "^3.0.1",
     "async": "^3.0.1",
     "aws-sdk": "^2.88.0",
     "aws-sdk": "^2.88.0",
     "axios": "^0.19.0",
     "axios": "^0.19.0",
-    "basic-auth-connect": "~1.0.0",
     "body-parser": "^1.18.2",
     "body-parser": "^1.18.2",
     "bunyan": "^1.8.12",
     "bunyan": "^1.8.12",
     "bunyan-format": "^0.2.1",
     "bunyan-format": "^0.2.1",

+ 1 - 4
src/server/routes/login.js

@@ -99,10 +99,7 @@ module.exports = function(crowi, app) {
   };
   };
 
 
   actions.register = function(req, res) {
   actions.register = function(req, res) {
-    // redirect to '/' if both of these are true:
-    //  1. user has logged in
-    //  2. req.user is not username/email string (which is set by basic-auth-connect)
-    if (req.user != null && req.user instanceof Object) {
+    if (req.user != null) {
       return res.redirect('/');
       return res.redirect('/');
     }
     }
 
 

+ 1 - 4
src/server/util/i18nUserSettingDetector.js

@@ -2,10 +2,7 @@ module.exports = {
   name: 'userSettingDetector',
   name: 'userSettingDetector',
 
 
   lookup(req, res, options) {
   lookup(req, res, options) {
-    // return null if
-    //  1. user doesn't logged in
-    //  2. req.user is username/email string to login which is set by basic-auth-connect
-    if (req.user == null || !(req.user instanceof Object)) {
+    if (req.user == null) {
       return null;
       return null;
     }
     }
     return req.user.lang || null;
     return req.user.lang || null;

+ 0 - 3
src/server/util/middlewares.js

@@ -170,8 +170,6 @@ module.exports = (crowi, app) => {
   };
   };
 
 
   middlewares.adminRequired = function(req, res, next) {
   middlewares.adminRequired = function(req, res, next) {
-    // check the user logged in
-    //  make sure that req.user isn't username/email string to login which is set by basic-auth-connect
     if (req.user != null && (req.user instanceof Object) && '_id' in req.user) {
     if (req.user != null && (req.user instanceof Object) && '_id' in req.user) {
       if (req.user.admin) {
       if (req.user.admin) {
         next();
         next();
@@ -202,7 +200,6 @@ module.exports = (crowi, app) => {
       const User = crowi.model('User');
       const User = crowi.model('User');
 
 
       // check the user logged in
       // check the user logged in
-      //  make sure that req.user isn't username/email string to login which is set by basic-auth-connect
       if (req.user != null && (req.user instanceof Object) && '_id' in req.user) {
       if (req.user != null && (req.user instanceof Object) && '_id' in req.user) {
         if (req.user.status === User.STATUS_ACTIVE) {
         if (req.user.status === User.STATUS_ACTIVE) {
           // Active の人だけ先に進める
           // Active の人だけ先に進める

+ 0 - 4
yarn.lock

@@ -1826,10 +1826,6 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
     pascalcase "^0.1.1"
 
 
-basic-auth-connect@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz#fdb0b43962ca7b40456a7c2bb48fe173da2d2122"
-
 basic-auth@~2.0.0:
 basic-auth@~2.0.0:
   version "2.0.0"
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"