diff --git a/packages/server/src/controllers/ConfigController/index.js b/packages/server/src/controllers/ConfigController/index.js index 7599d9f5..6b0209dd 100644 --- a/packages/server/src/controllers/ConfigController/index.js +++ b/packages/server/src/controllers/ConfigController/index.js @@ -1,6 +1,6 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" -export default class ConfigController extends ComplexController { +export default class ConfigController extends Controller { static refName = "ConfigController" static useMiddlewares = ["withAuthentication", "onlyAdmin"] diff --git a/packages/server/src/controllers/FilesController/index.js b/packages/server/src/controllers/FilesController/index.js index 515d7df2..b0d1c322 100644 --- a/packages/server/src/controllers/FilesController/index.js +++ b/packages/server/src/controllers/FilesController/index.js @@ -1,4 +1,4 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" import path from "path" import fs from "fs" import stream from "stream" @@ -7,7 +7,7 @@ function resolveToUrl(filepath) { return `${global.globalPublicURI}/uploads/${filepath}` } -export default class FilesController extends ComplexController { +export default class FilesController extends Controller { static disabled = true get = { diff --git a/packages/server/src/controllers/PostsController/index.js b/packages/server/src/controllers/PostsController/index.js index a8743fbe..5336e577 100644 --- a/packages/server/src/controllers/PostsController/index.js +++ b/packages/server/src/controllers/PostsController/index.js @@ -1,8 +1,8 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" import { Schematized } from "../../lib" import { Post, User } from "../../models" -export default class PostsController extends ComplexController { +export default class PostsController extends Controller { static refName = "PostsController" static useMiddlewares = ["withAuthentication"] diff --git a/packages/server/src/controllers/PublicController/index.js b/packages/server/src/controllers/PublicController/index.js index 664e431c..b8c532dc 100644 --- a/packages/server/src/controllers/PublicController/index.js +++ b/packages/server/src/controllers/PublicController/index.js @@ -1,6 +1,6 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" -export default class PublicController extends ComplexController { +export default class PublicController extends Controller { static refName = "PublicController" post = { diff --git a/packages/server/src/controllers/RolesController/index.js b/packages/server/src/controllers/RolesController/index.js index 2bb35f79..52a24c32 100644 --- a/packages/server/src/controllers/RolesController/index.js +++ b/packages/server/src/controllers/RolesController/index.js @@ -1,8 +1,8 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" import { Role, User } from "../../models" import { Schematized } from "../../lib" -export default class RolesController extends ComplexController { +export default class RolesController extends Controller { static refName = "RolesController" static useMiddlewares = ["roles"] diff --git a/packages/server/src/controllers/SessionController/index.js b/packages/server/src/controllers/SessionController/index.js index 46560671..cba56050 100644 --- a/packages/server/src/controllers/SessionController/index.js +++ b/packages/server/src/controllers/SessionController/index.js @@ -1,8 +1,8 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" import { Session } from "../../models" import jwt from "jsonwebtoken" -export default class SessionController extends ComplexController { +export default class SessionController extends Controller { static refName = "SessionController" get = { diff --git a/packages/server/src/controllers/UserController/index.js b/packages/server/src/controllers/UserController/index.js index cd42cbaf..2d48ab44 100644 --- a/packages/server/src/controllers/UserController/index.js +++ b/packages/server/src/controllers/UserController/index.js @@ -1,6 +1,5 @@ -import { ComplexController } from "linebridge/dist/classes" +import { Controller } from "linebridge/dist/server" import passport from "passport" - import { User, UserFollow } from "../../models" import { Token, Schematized, createUser } from "../../lib" import SessionController from "../SessionController" @@ -13,7 +12,7 @@ const AllowedPublicUpdateFields = [ "description", ] -export default class UserController extends ComplexController { +export default class UserController extends Controller { static refName = "UserController" methods = { @@ -325,6 +324,7 @@ export default class UserController extends ComplexController { post = { "/login": async (req, res) => { passport.authenticate("local", { session: false }, async (error, user, options) => { + console.log(error, user, options) if (error) { return res.status(500).json(`Error validating user > ${error.message}`) } diff --git a/packages/server/src/index.js b/packages/server/src/index.js index b0a9982b..4185bf6e 100644 --- a/packages/server/src/index.js +++ b/packages/server/src/index.js @@ -19,7 +19,7 @@ Array.prototype.updateFromObjectKeys = function (obj) { } import path from "path" -import LinebridgeServer from "linebridge/dist/server" +import { Server as LinebridgeServer } from "linebridge/dist/server" import bcrypt from "bcrypt" import mongoose from "mongoose" import passport from "passport"