diff --git a/build/flecks.yml b/build/flecks.yml index a664846..c6a8f91 100644 --- a/build/flecks.yml +++ b/build/flecks.yml @@ -50,6 +50,7 @@ show: false installExtensions: false '@flecks/governor': {} +'@flecks/passport-local-react': {} '@flecks/react': {} '@flecks/react/router': {} '@flecks/redis': {} @@ -63,9 +64,6 @@ - '--stack-trace-limit=30' - '--inspect' '@flecks/socket': {} -'@flecks/user': {} -'@flecks/user/local': {} -'@flecks/user/session': {} '@flecks/web': {} '@flecks/web/server': devDisableHostCheck: true diff --git a/package.json b/package.json index 3711421..f723ac7 100644 --- a/package.json +++ b/package.json @@ -46,13 +46,13 @@ "@flecks/dox": "^2.0.3", "@flecks/electron": "^2.0.3", "@flecks/governor": "^2.0.3", + "@flecks/passport-local-react": "^2.0.3", "@flecks/react": "^2.0.3", "@flecks/redis": "^2.0.3", "@flecks/redux": "^2.0.3", "@flecks/repl": "^2.0.3", "@flecks/server": "^2.0.3", "@flecks/socket": "^2.0.3", - "@flecks/user": "^2.0.3", "@flecks/web": "^2.0.3", "@humus/app": "^2.1.0", "@humus/bootstrap": "^3.0.0", diff --git a/packages/app/package.json b/packages/app/package.json index 15cd01a..97375f0 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -27,10 +27,11 @@ "@avocado/s13n": "^3.0.0", "@avocado/topdown": "^3.0.0", "@flecks/core": "^2.0.3", + "@flecks/passport-local-react": "^2.0.3", + "@flecks/passport-react": "^2.0.3", "@flecks/react": "^2.0.3", "@flecks/redux": "^2.0.3", "@flecks/socket": "^2.0.3", - "@flecks/user": "^2.0.3", "@flecks/web": "^2.0.3", "@humus/inventory": "^2.1.0", "fscreen": "^1.2.0", diff --git a/packages/app/src/components/app/index.jsx b/packages/app/src/components/app/index.jsx index 81fdc70..4c5de88 100644 --- a/packages/app/src/components/app/index.jsx +++ b/packages/app/src/components/app/index.jsx @@ -8,7 +8,7 @@ import { Routes, Route, } from '@flecks/react/router'; -import {UserRequired} from '@flecks/user/local'; +import {UserRequired} from '@flecks/passport-react'; import '@humus/app/scss/index.scss'; import Ui from './ui'; diff --git a/packages/app/src/components/app/login/index.jsx b/packages/app/src/components/app/login/index.jsx index f910bcc..591a98a 100644 --- a/packages/app/src/components/app/login/index.jsx +++ b/packages/app/src/components/app/login/index.jsx @@ -1,12 +1,12 @@ import {React} from '@flecks/react'; -import {UserLocalLogin} from '@flecks/user/local'; +import {Login as PassportLogin} from '@flecks/passport-local-react'; import styles from './index.module.scss'; function Login() { return (
- +
); } diff --git a/packages/bootstrap/src/server.js b/packages/bootstrap/src/server.js index 6f7552d..d97d27e 100644 --- a/packages/bootstrap/src/server.js +++ b/packages/bootstrap/src/server.js @@ -13,6 +13,6 @@ export const hooks = { await user.save(); } }, - {after: '@flecks/user/local/server'}, + {after: ['@flecks/passport/server']}, ), }; diff --git a/packages/core/package.json b/packages/core/package.json index 9f516fe..5ccff5f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -36,7 +36,6 @@ "@flecks/react": "^2.0.3", "@flecks/redux": "^2.0.3", "@flecks/socket": "^2.0.3", - "@flecks/user": "^2.0.3", "debug": "4.3.1", "is-electron": "^2.2.1" }, diff --git a/packages/core/src/electron/server.js b/packages/core/src/electron/server.js index 6d33468..681fbd8 100644 --- a/packages/core/src/electron/server.js +++ b/packages/core/src/electron/server.js @@ -28,6 +28,6 @@ export const hooks = { } next(); }, - {after: '@flecks/user/server'}, + {after: '@flecks/passport/server'}, ), };