Demo
/
hapi-demo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update

theme
npmrun 2 years ago
parent
49136ec3d1
commit
efccb8b2c6
10 changed files with 267 additions and 471 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      package.json
  2. 0
      patches/hapi-sequelizejs@4.6.1.patch
  3. 606
      pnpm-lock.yaml
  4. 6
      source/auth/index.ts
  5. BIN
      source/db/data.db
  6. 4
      source/models/user.ts
  7. 3
      source/models/user_info.ts
  8. 4
      source/run.ts
  9. 2
      template/ui/header.pug

85
package.json
View File

@ -1,6 +1,7 @@
{
"name": "hapi-demo",
"version": "1.0.0",
"type": "commonjs",
"description": "",
"private": true,
"main": "index.js",
@ -18,56 +19,56 @@
"author": "",
"license": "ISC",
"dependencies": {
"@hapi/cookie": "^11.0.2",
"@hapi/crumb": "^8.0.1",
"@hapi/hapi": "^20.1.2",
"@hapi/hoek": "^10.0.0",
"@hapi/inert": "^6.0.3",
"@hapi/yar": "^10.1.1",
"@types/hapi__hapi": "^20.0.10",
"@types/hapi__vision": "^5.5.3",
"@types/hapi__yar": "^10.1.1",
"@hapi/cookie": "^12.0.1",
"@hapi/crumb": "^9.0.1",
"@hapi/hapi": "^21.3.2",
"@hapi/hoek": "^11.0.2",
"@hapi/inert": "^7.1.0",
"@hapi/yar": "^11.0.1",
"@types/hapi__hapi": "^20.0.13",
"@types/hapi__vision": "^5.5.4",
"@types/hapi__yar": "^10.1.2",
"archiver": "^5.3.1",
"bcrypt": "^5.0.1",
"fs-extra": "^10.1.0",
"hapi-auth-jwt2": "^10.2.0",
"hapi-pino": "^11.0.1",
"hapi-sequelizejs": "4.5.0",
"hapi-swagger": "^14.2.0",
"joi": "^17.4.0",
"json-merge-patch": "^1.0.1",
"jsonwebtoken": "^8.5.1",
"bcrypt": "^5.1.0",
"fs-extra": "^11.1.1",
"hapi-auth-jwt2": "^10.4.0",
"hapi-pino": "^12.1.0",
"hapi-sequelizejs": "4.6.1",
"hapi-swagger": "^16.0.1",
"joi": "^17.9.2",
"json-merge-patch": "^1.0.2",
"jsonwebtoken": "^9.0.0",
"jstransformer-markdown-it": "^3.0.0",
"markdown-it": "^13.0.1",
"multiparty": "^4.2.2",
"nodemon": "^2.0.7",
"pino": "^8.11.0",
"pino-pretty": "^9.1.1",
"multiparty": "^4.2.3",
"nodemon": "^2.0.22",
"pino": "^8.14.1",
"pino-pretty": "^10.0.0",
"pug": "^3.0.2",
"pug-alias": "^2.0.1",
"sequelize": "^6.6.2",
"sqlite3": "^5.0.2"
"sequelize": "^6.31.1",
"sqlite3": "^5.1.6"
},
"devDependencies": {
"@hapi/code": "^9.0.1",
"@hapi/lab": "^25.0.1",
"@hapi/vision": "^6.1.0",
"@types/fs-extra": "^9.0.13",
"@types/hapi__cookie": "^10.1.4",
"@types/hapi__crumb": "^7.3.3",
"@types/node": "^17.0.45",
"@hapi/code": "^9.0.3",
"@hapi/lab": "^25.1.2",
"@hapi/vision": "^7.0.1",
"@types/fs-extra": "^11.0.1",
"@types/hapi__cookie": "^12.0.2",
"@types/hapi__crumb": "^7.3.4",
"@types/node": "^20.1.4",
"cross-env": "^7.0.3",
"dotenv": "^10.0.0",
"ejs": "^3.1.6",
"fast-glob": "^3.2.11",
"file-type": "^16.5.0",
"log4js": "^6.4.1",
"ts-node": "^10.0.0",
"ts-node-dev": "^1.1.6",
"tsc-alias": "^1.7.0",
"tsconfig-paths": "^3.9.0",
"dotenv": "^16.0.3",
"ejs": "^3.1.9",
"fast-glob": "^3.2.12",
"file-type": "^18.4.0",
"log4js": "^6.9.1",
"ts-node": "^10.9.1",
"ts-node-dev": "^2.0.0",
"tsc-alias": "^1.8.6",
"tsconfig-paths": "^4.2.0",
"tsx": "^3.12.7",
"typescript": "^4.3.2"
"typescript": "^5.0.4"
},
"pnpm": {
"peerDependencyRules": {
@ -76,7 +77,7 @@
]
},
"patchedDependencies": {
"hapi-sequelizejs@4.5.0": "patches/hapi-sequelizejs@4.5.0.patch"
"hapi-sequelizejs@4.6.1": "patches/hapi-sequelizejs@4.6.1.patch"
}
}
}

0
patches/hapi-sequelizejs@4.5.0.patch → patches/hapi-sequelizejs@4.6.1.patch
View File

606
pnpm-lock.yaml
View File

File diff suppressed because it is too large

6
source/auth/index.ts
View File

@ -20,12 +20,12 @@ export async function validateSession(request: Req, session) {
const result = await User.findOne({ where: { id: session.id } })
if (result == null) {
loggerSite.debug(`${"cooike中存储的用户不存在"}`)
return { valid: false }
return { isValid: false }
}
loggerSite.debug(`${"当前登录ID:" + session.id}`)
return { valid: true, credentials: result }
return { isValid: true, credentials: result }
} else {
loggerSite.debug(`${"用户未登录兵器cooike中不存在信息"}`)
return { valid: false }
return { isValid: false }
}
}

BIN
source/db/data.db
View File

Binary file not shown.

4
source/models/user.ts
View File

@ -10,8 +10,8 @@ interface UserAttributes {
deleted_at?: Date
}
export interface UserInput extends Optional<UserAttributes, "id"> {}
export interface UserOutput extends Required<UserAttributes> {}
export interface UserInput extends Optional<UserAttributes, "id"> { }
export interface UserOutput extends Required<UserAttributes> { }
export type TUserModel = ReturnType<typeof UserModel>
type DT = typeof DataTypes

3
source/models/user_info.ts
View File

@ -42,7 +42,6 @@ export default function UserInfoModel(sequelize: Sequelize, DataTypes: DT) {
user_id: {
type: DataTypes.INTEGER,
allowNull: false,
onDelete: "CASCADE",
references: {
model: "user",
key: 'id',
@ -79,7 +78,7 @@ export default function UserInfoModel(sequelize: Sequelize, DataTypes: DT) {
}
UserInfo.associate = function (models) {
// User删除时对应的UserInfo同步删除
models["user_info"].belongsTo(models["user"], { foreignKey: "user_id" })
models["user_info"].belongsTo(models["user"], { foreignKey: "user_id", onDelete: "CASCADE", hooks: true })
}
return UserInfo
}

4
source/run.ts
View File

@ -23,7 +23,7 @@ const run = async (): Promise<Server> => {
})
await server.register([
{
plugin: require("hapi-sequelizejs"),
plugin: require('hapi-sequelizejs'),
options: [
{
name: "data", // identifier
@ -63,7 +63,7 @@ const run = async (): Promise<Server> => {
return "/login"
},
appendNext: true,
validateFunc: validateSession,
validate: validateSession,
})
server.auth.default("session")
//===== session ===== End

2
template/ui/header.pug
View File

@ -34,7 +34,7 @@ nav.is-fixed-top.navbar(role='navigation', aria-label='main navigation', style="
else
.navbar-item.has-dropdown.is-hoverable
a.navbar-link
div #{user.nickname}
div #{user.username}
.navbar-dropdown.is-right
a.navbar-item(hx-get="/user?htmx" hx-push-url="/user" hx-trigger="click" hx-target="#single-page" hx-swap="innerHTML")
| 用户资料

Write Preview
Loading…
Cancel
Save