Compare commits
25 commits
master
...
deploy-for
| Author | SHA1 | Date | |
|---|---|---|---|
2b87ad09a7
|
|||
|
86d56734cf
|
|||
|
c62466515f
|
|||
|
a11e7a75ea
|
|||
|
c2c139575d
|
|||
|
efc8ce5a27
|
|||
|
0e08a294fc
|
|||
|
ff9864f5ad
|
|||
|
8a42978379
|
|||
|
2029d3a4e1
|
|||
|
c44ecdc53f
|
|||
|
cd185c0d95
|
|||
|
7eb622c29a
|
|||
|
a421a6bbb4
|
|||
|
7579bbfc86
|
|||
|
cafa729234
|
|||
|
a515c9e5b7
|
|||
|
998060777f
|
|||
|
ce5b28292e
|
|||
|
764de46015
|
|||
|
4272ea103a
|
|||
|
2b9fcd2729
|
|||
|
e819cf850a
|
|||
|
088088c91e
|
|||
|
fe76a648a4
|
32 changed files with 1717 additions and 1336 deletions
|
|
@ -1,24 +1,4 @@
|
|||
steps:
|
||||
librepages-conductor:
|
||||
image: realaravinth/librepages-conductor
|
||||
detach: true
|
||||
environment:
|
||||
- LPCONDUCTOR__SOURCE_CODE=https://git.batsense.net/LibrePages/conductor
|
||||
- LPCONDUCTOR_SERVER__PROXY_HAS_TLS=false
|
||||
- LPCONDUCTOR_DEBUG=false
|
||||
- LPCONDUCTOR_CONDUCTOR=dummy
|
||||
- LPCONDUCTOR_SERVER_DOMAIN=librepages.test
|
||||
- LPCONDUCTOR_SERVER_IP=0.0.0.0
|
||||
- LPCONDUCTOR_SERVER_PROXY_HAS_TLS=false
|
||||
- LPCONDUCTOR_SERVER_PORT=7000
|
||||
- LPCONDUCTOR_SOURCE_CODE=https://example.org
|
||||
- LPCONDUCTOR_CREDS_USERNAME=librepages_api
|
||||
- LPCONDUCTOR_CREDS_TOKEN=longrandomlygeneratedpassword
|
||||
- PORT=5000
|
||||
- LPCONDUCTOR_CREDS_PASSWORD=longrandomlygeneratedpassword
|
||||
commands:
|
||||
- conductor serve
|
||||
|
||||
pipeline:
|
||||
backend:
|
||||
image: rust
|
||||
environment:
|
||||
|
|
@ -30,6 +10,7 @@ steps:
|
|||
- rustup component add clippy
|
||||
# rewrite conducotr configuration
|
||||
- sed -i 's%url = "http:\/\/localhost:5000"%url = "http:\/\/librepages-conductor:5000"%' config/default.toml
|
||||
- sed -i 's%url = "http:\/\/localhost:6000"%url = "http:\/\/librepages-forms:6000"%' config/default.toml
|
||||
- make dev-env
|
||||
- make migrate
|
||||
- make lint
|
||||
|
|
@ -49,7 +30,6 @@ steps:
|
|||
image: plugins/docker
|
||||
when:
|
||||
event: [push, tag, deployment]
|
||||
branch: master
|
||||
settings:
|
||||
username: realaravinth
|
||||
password:
|
||||
|
|
@ -73,7 +53,6 @@ steps:
|
|||
image: rust
|
||||
when:
|
||||
event: [push, tag, deployment]
|
||||
branch: master
|
||||
commands:
|
||||
- apt update
|
||||
- apt-get -y --no-install-recommends install gpg tar curl wget
|
||||
|
|
@ -86,3 +65,40 @@ services:
|
|||
image: postgres
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=password
|
||||
|
||||
forms-postgres:
|
||||
image: postgres
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=password
|
||||
|
||||
librepages-forms:
|
||||
image: realaravinth/librepages-forms
|
||||
command: forms serve
|
||||
environment:
|
||||
- LPFORMS_SOURCE_CODE=https://git.batsense.net/LibrePages/forms
|
||||
- LPFORMS_SERVER__PROXY_HAS_TLS=false
|
||||
- LPFORMS_DEBUG=false
|
||||
- LPFORMS_SERVER_URL_PREFIX=""
|
||||
- LPFORMS_SERVER_DOMAIN=forms.librepages.test
|
||||
- LPFORMS_SERVER_IP=0.0.0.0
|
||||
- LPFORMS_SERVER_PROXY_HAS_TLS=false
|
||||
- LPFORMS_DASH_API_KEY=longrandomlygeneratedpassword
|
||||
- LPFORMS_DATABASE_POOL=2
|
||||
- PORT=6000
|
||||
- DATABASE_URL=postgres://postgres:password@forms-postgres:5432/postgres
|
||||
|
||||
librepages-conductor:
|
||||
image: realaravinth/librepages-conductor
|
||||
command: conductor serve
|
||||
environment:
|
||||
- LPCONDUCTOR_SERVER__PROXY_HAS_TLS=false
|
||||
- LPCONDUCTOR_DEBUG=false
|
||||
- LPCONDUCTOR_CONDUCTOR=dummy
|
||||
- LPCONDUCTOR_SERVER_URL_PREFIX=""
|
||||
- LPCONDUCTOR_SERVER_DOMAIN=librepages.test
|
||||
- LPCONDUCTOR_SERVER_IP=0.0.0.0
|
||||
- LPCONDUCTOR_SERVER_PROXY_HAS_TLS=false
|
||||
- LPCONDUCTOR_SERVER_PORT=7000
|
||||
- LPCONDUCTOR_SOURCE_CODE=https://example.org
|
||||
- LPCONDUCTOR_CREDS_TOKEN=longrandomlygeneratedpassword
|
||||
- PORT=5000
|
||||
|
|
|
|||
1503
Cargo.lock
generated
1503
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
22
Cargo.toml
22
Cargo.toml
|
|
@ -20,17 +20,18 @@ actix-rt = "2"
|
|||
actix-web-codegen-const-routes = { version = "0.1.0", tag = "0.1.0", git = "https://github.com/realaravinth/actix-web-codegen-const-routes" }
|
||||
argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
|
||||
sqlx = { version = "0.6.2", features = ["runtime-actix-rustls", "postgres", "time", "offline", "json", "uuid"] }
|
||||
clap = { version = "4.0.0", features = ["derive"]}
|
||||
clap = { version = "3.2.20", features = ["derive"]}
|
||||
libconfig = { version = "0.1.0", git = "https://git.batsense.net/librepages/libconfig" }
|
||||
libconductor = { version = "0.1.0", git = "https://git.batsense.net/librepages/conductor/" }
|
||||
libforms = { version = "0.1.0", git = "https://git.batsense.net/librepages/forms/" }
|
||||
|
||||
config = "0.14"
|
||||
git2 = "0.19.0"
|
||||
config = "0.13"
|
||||
git2 = "0.14.2"
|
||||
|
||||
serde = { version = "1", features = ["derive", "rc"]}
|
||||
serde_json = "1"
|
||||
|
||||
pretty_env_logger = "0.5"
|
||||
pretty_env_logger = "0.4"
|
||||
|
||||
lazy_static = "1.4"
|
||||
url = { version = "2.2", features = ["serde"] }
|
||||
|
|
@ -41,21 +42,22 @@ derive_more = "0.99"
|
|||
num_cpus = "1.13"
|
||||
|
||||
tokio = { version = "1", features=["sync"]}
|
||||
num_enum = "0.7.0"
|
||||
num_enum = "0.5.7"
|
||||
|
||||
mime_guess = "2.0.4"
|
||||
mime = "0.3.16"
|
||||
rust-embed = "8.0.0"
|
||||
rust-embed = "6.3.0"
|
||||
rand = "0.8.5"
|
||||
tracing = { version = "0.1.37", features = ["log"]}
|
||||
tracing-actix-web = "0.7.0"
|
||||
toml = "0.8.0"
|
||||
tracing-actix-web = "0.6.2"
|
||||
toml = "0.5.9"
|
||||
serde_yaml = "0.9.14"
|
||||
uuid = { version = "1.2.2", features = ["serde"] }
|
||||
reqwest = { version = "0.12.0", features = ["json"] }
|
||||
reqwest = { version = "0.11.13", features = ["json"] }
|
||||
sha2 = "0.10.6"
|
||||
hmac = "0.12.1"
|
||||
hex= "0.4.3"
|
||||
time = { version = "0.3.17", features = ["formatting"] }
|
||||
|
||||
[dependencies.cache-buster]
|
||||
git = "https://github.com/realaravinth/cache-buster"
|
||||
|
|
@ -73,7 +75,7 @@ version = "0.2"
|
|||
|
||||
[dev-dependencies]
|
||||
futures = "0.3.24"
|
||||
mktemp = "0.5.0"
|
||||
mktemp = "0.4.1"
|
||||
|
||||
|
||||
[workspace]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM node:20.17.0 as frontend
|
||||
FROM node:16.9.1 as frontend
|
||||
COPY package.json package-lock.json /src/
|
||||
WORKDIR /src
|
||||
RUN npm install
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
**Auto-deploy static websites from git repositories**
|
||||
|
||||
</p>
|
||||
|
||||
[](https://ci.batsense.net/LibrePages/librepages)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ allow_registration = true
|
|||
source_code = "https://git.batsense.net/LibrePages/pages"
|
||||
support_email = "support@librepages.example.org"
|
||||
conductors = [
|
||||
{ username = "librepages_api", api_key = "longrandomlygeneratedpassword", url = "http://localhost:5000"}
|
||||
{ api_key = "longrandomlygeneratedpassword", url = "http://localhost:5000"}
|
||||
]
|
||||
|
||||
[server]
|
||||
|
|
@ -38,3 +38,7 @@ password = "password"
|
|||
name = "postgres"
|
||||
pool = 4
|
||||
database_type="postgres" # "postgres"
|
||||
|
||||
[form]
|
||||
api_key = "longrandomlygeneratedpassword"
|
||||
url = "http://localhost:6000"
|
||||
|
|
|
|||
24
contrib/librepages.service
Normal file
24
contrib/librepages.service
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
[Unit]
|
||||
Description=LibrePages: Easiest way to deploy websites
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=librepages
|
||||
ExecStart=/usr/bin/librepages serve
|
||||
Restart=on-failure
|
||||
RestartSec=1
|
||||
SuccessExitStatus=3 4
|
||||
RestartForceExitStatus=3 4
|
||||
SystemCallArchitectures=native
|
||||
MemoryDenyWriteExecute=true
|
||||
NoNewPrivileges=true
|
||||
Environment="RUST_LOG=info"
|
||||
|
||||
[Unit]
|
||||
Wants=network-online.target
|
||||
Wants=network-online.target
|
||||
Requires=postgresql.service
|
||||
After=syslog.target
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
341
package-lock.json
generated
341
package-lock.json
generated
|
|
@ -12,19 +12,103 @@
|
|||
"sass": "^1.54.9"
|
||||
}
|
||||
},
|
||||
"node_modules/chokidar": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz",
|
||||
"integrity": "sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==",
|
||||
"node_modules/anymatch": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
|
||||
"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"readdirp": "^4.0.1"
|
||||
"normalize-path": "^3.0.0",
|
||||
"picomatch": "^2.0.4"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 14.16.0"
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/binary-extensions": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
|
||||
"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/braces": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fill-range": "^7.0.1"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/chokidar": {
|
||||
"version": "3.5.3",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
|
||||
"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
}
|
||||
],
|
||||
"dependencies": {
|
||||
"anymatch": "~3.1.2",
|
||||
"braces": "~3.0.2",
|
||||
"glob-parent": "~5.1.2",
|
||||
"is-binary-path": "~2.1.0",
|
||||
"is-glob": "~4.0.1",
|
||||
"normalize-path": "~3.0.0",
|
||||
"readdirp": "~3.6.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 8.10.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "~2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/fill-range": {
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/glob-parent": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"is-glob": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/immutable": {
|
||||
|
|
@ -33,26 +117,88 @@
|
|||
"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/readdirp": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
|
||||
"integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
|
||||
"node_modules/is-binary-path": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
|
||||
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"binary-extensions": "^2.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/is-extglob": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">= 14.16.0"
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-glob": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"is-extglob": "^2.1.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-number": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.12.0"
|
||||
}
|
||||
},
|
||||
"node_modules/normalize-path": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
|
||||
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
},
|
||||
"funding": {
|
||||
"type": "individual",
|
||||
"url": "https://paulmillr.com/funding/"
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/readdirp": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
|
||||
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"picomatch": "^2.2.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/sass": {
|
||||
"version": "1.79.3",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
|
||||
"integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
|
||||
"version": "1.54.9",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
|
||||
"integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"chokidar": "^4.0.0",
|
||||
"chokidar": ">=3.0.0 <4.0.0",
|
||||
"immutable": "^4.0.0",
|
||||
"source-map-js": ">=0.6.2 <2.0.0"
|
||||
},
|
||||
|
|
@ -60,7 +206,7 @@
|
|||
"sass": "sass.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
"node": ">=12.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/source-map-js": {
|
||||
|
|
@ -71,16 +217,85 @@
|
|||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/to-regex-range": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"is-number": "^7.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"chokidar": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz",
|
||||
"integrity": "sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==",
|
||||
"anymatch": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
|
||||
"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"readdirp": "^4.0.1"
|
||||
"normalize-path": "^3.0.0",
|
||||
"picomatch": "^2.0.4"
|
||||
}
|
||||
},
|
||||
"binary-extensions": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
|
||||
"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
|
||||
"dev": true
|
||||
},
|
||||
"braces": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"fill-range": "^7.0.1"
|
||||
}
|
||||
},
|
||||
"chokidar": {
|
||||
"version": "3.5.3",
|
||||
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
|
||||
"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"anymatch": "~3.1.2",
|
||||
"braces": "~3.0.2",
|
||||
"fsevents": "~2.3.2",
|
||||
"glob-parent": "~5.1.2",
|
||||
"is-binary-path": "~2.1.0",
|
||||
"is-glob": "~4.0.1",
|
||||
"normalize-path": "~3.0.0",
|
||||
"readdirp": "~3.6.0"
|
||||
}
|
||||
},
|
||||
"fill-range": {
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"glob-parent": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
|
||||
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-glob": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"immutable": {
|
||||
|
|
@ -89,19 +304,64 @@
|
|||
"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
|
||||
"dev": true
|
||||
},
|
||||
"readdirp": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
|
||||
"integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
|
||||
"dev": true
|
||||
},
|
||||
"sass": {
|
||||
"version": "1.79.3",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
|
||||
"integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
|
||||
"is-binary-path": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
|
||||
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chokidar": "^4.0.0",
|
||||
"binary-extensions": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"is-extglob": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
||||
"dev": true
|
||||
},
|
||||
"is-glob": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-extglob": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"is-number": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
||||
"dev": true
|
||||
},
|
||||
"normalize-path": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
|
||||
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
|
||||
"dev": true
|
||||
},
|
||||
"picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"dev": true
|
||||
},
|
||||
"readdirp": {
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
|
||||
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"picomatch": "^2.2.1"
|
||||
}
|
||||
},
|
||||
"sass": {
|
||||
"version": "1.54.9",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
|
||||
"integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chokidar": ">=3.0.0 <4.0.0",
|
||||
"immutable": "^4.0.0",
|
||||
"source-map-js": ">=0.6.2 <2.0.0"
|
||||
}
|
||||
|
|
@ -111,6 +371,15 @@
|
|||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
|
||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
|
||||
"dev": true
|
||||
},
|
||||
"to-regex-range": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-number": "^7.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended",
|
||||
":dependencyDashboard"
|
||||
],
|
||||
"labels": [
|
||||
"renovate-bot"
|
||||
],
|
||||
"prHourlyLimit": 0,
|
||||
"timezone": "Asia/kolkata",
|
||||
"prCreation": "immediate",
|
||||
"vulnerabilityAlerts": {
|
||||
"enabled": true,
|
||||
"labels": [
|
||||
"renovate-bot",
|
||||
"renovate-security",
|
||||
"security"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ DUMBSERVE_USERNAME=librepages
|
|||
DUMBSERVE_PASSWORD=$4
|
||||
DUMBSERVE_HOST="https://$DUMBSERVE_USERNAME:$DUMBSERVE_PASSWORD@dl.librepages.org"
|
||||
|
||||
NAME=librebages
|
||||
NAME=librepages
|
||||
KEY=67880CA5F4BC99BF247330E2DA576B07BC323961
|
||||
|
||||
TMP_DIR=$(mktemp -d)
|
||||
|
|
@ -42,6 +42,9 @@ get_bin(){
|
|||
#docker cp $container_id:/usr/local/bin/pages $TARGET_DIR/
|
||||
#docker rm -v $container_id
|
||||
cp target/release/librepages $TARGET_DIR
|
||||
cp -r contrib/ $TARGET_DIR
|
||||
cp -r config/ $TARGET_DIR
|
||||
mv $TARGET_DIR/config/default.toml $TARGET_DIR/config/config.toml
|
||||
}
|
||||
|
||||
copy() {
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ docker create --name $NAME -p 5000:5000 \
|
|||
-e LPCONDUCTOR_SERVER_PROXY_HAS_TLS="false" \
|
||||
-e LPCONDUCTOR_SERVER_PORT=7000 \
|
||||
-e LPCONDUCTOR_SOURCE_CODE="https://example.org" \
|
||||
-e LPCONDUCTOR_CREDS_USERNAME=$LPCONDUCTOR_CREDS_USERNAME \
|
||||
-e LPCONDUCTOR_CREDS_PASSWORD=$LPCONDUCTOR_CREDS_PASSWORD \
|
||||
-e LPCONDUCTOR_CREDS_TOKEN=$LPCONDUCTOR_CREDS_PASSWORD \
|
||||
-e PORT="5000"\
|
||||
realaravinth/librepages-conductor conductor serve
|
||||
|
||||
|
|
|
|||
32
scripts/forms.sh
Executable file
32
scripts/forms.sh
Executable file
|
|
@ -0,0 +1,32 @@
|
|||
#!/bin/bash
|
||||
|
||||
readonly NAME=librepages-forms-develop
|
||||
readonly DB_NAME=librepages-forms-postgres-develop
|
||||
|
||||
docker rm -f $NAME
|
||||
docker rm -f $DB_NAME
|
||||
|
||||
|
||||
docker create --name $DB_NAME -p 5433:5432 \
|
||||
-e POSTGRES_PASSWORD=password \
|
||||
postgres
|
||||
|
||||
docker create --name $NAME -p 6000:6000 \
|
||||
--network=host \
|
||||
-e LPFORMS__SOURCE_CODE="https://git.batsense.net/LibrePages/forms" \
|
||||
-e LPFORMS_SERVER__PROXY_HAS_TLS=false \
|
||||
-e LPFORMS_DEBUG="false" \
|
||||
-e LPFORMS_SERVER_URL_PREFIX="" \
|
||||
-e LPFORMS_SERVER_DOMAIN="forms.librepages.test" \
|
||||
-e LPFORMS_SERVER_IP="0.0.0.0" \
|
||||
-e LPFORMS_SERVER_PROXY_HAS_TLS="false" \
|
||||
-e LPFORMS_SOURCE_CODE="https://example.org" \
|
||||
-e LPFORMS_DASH_API_KEY=$LPFORMS_DASH_API_KEY \
|
||||
-e LPFORMS_DATABASE_POOL=2 \
|
||||
-e PORT="6000"\
|
||||
-e DATABASE_URL=postgres://postgres:password@localhost:5433/postgres \
|
||||
realaravinth/librepages-forms forms serve
|
||||
|
||||
docker start $DB_NAME
|
||||
sleep 5
|
||||
docker start $NAME
|
||||
215
src/api/v1/forms.rs
Normal file
215
src/api/v1/forms.rs
Normal file
|
|
@ -0,0 +1,215 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use actix_identity::Identity;
|
||||
use actix_web::{web, HttpResponse, Responder};
|
||||
use libforms::Table;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::get_auth_middleware;
|
||||
use crate::{errors::*, AppCtx};
|
||||
|
||||
pub mod routes {
|
||||
|
||||
pub struct Forms {
|
||||
pub list_submissions: &'static str,
|
||||
pub delete_submission: &'static str,
|
||||
pub get_forms_for_host: &'static str,
|
||||
}
|
||||
|
||||
impl Forms {
|
||||
pub const fn new() -> Self {
|
||||
Self {
|
||||
list_submissions: "/api/v1/forms/submissions/list",
|
||||
delete_submission: "/api/v1/forms/delete/{id}",
|
||||
get_forms_for_host: "/api/v1/forms/list",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_list(&self, page: usize) -> String {
|
||||
format!("{}?page={}", self.list_submissions, page)
|
||||
}
|
||||
|
||||
pub fn get_forms_for_host_route(&self, host: &str) -> String {
|
||||
format!("{}?host={}", self.get_forms_for_host, host)
|
||||
}
|
||||
|
||||
pub fn get_delete(&self, id: usize, host: &str, path: &str) -> String {
|
||||
let del = self.delete_submission.replace("{id}", &id.to_string());
|
||||
format!("{}?host={}&path={}", del, host, path)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
pub struct Page {
|
||||
page: usize,
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::post(
|
||||
path = "crate::V1_API_ROUTES.forms.list_submissions",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "List form submission" skip(id, ctx, payload))]
|
||||
async fn list_submission(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
page: web::Query<Page>,
|
||||
payload: web::Json<Table>,
|
||||
) -> ServiceResult<impl Responder> {
|
||||
let owner = id.identity().unwrap();
|
||||
let resp = ctx
|
||||
.get_all_form_submission(&owner, page.page, &payload)
|
||||
.await?;
|
||||
Ok(HttpResponse::Ok().json(resp))
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::post(
|
||||
path = "crate::V1_API_ROUTES.forms.delete_submission",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "Delete form submission" skip(id, ctx))]
|
||||
async fn delete_form_submission(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
sub_id: web::Path<usize>,
|
||||
payload: web::Json<Table>,
|
||||
) -> ServiceResult<impl Responder> {
|
||||
let owner = id.identity().unwrap();
|
||||
ctx.delete_form_submission(&owner, *sub_id, &payload)
|
||||
.await?;
|
||||
Ok(HttpResponse::Ok())
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||
pub struct Host {
|
||||
pub host: String,
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "crate::V1_API_ROUTES.forms.get_forms_for_host",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "Get forms belonging to hostname", skip(ctx, id))]
|
||||
async fn list_all_forms(
|
||||
id: Identity,
|
||||
ctx: AppCtx,
|
||||
query: web::Query<Host>,
|
||||
) -> ServiceResult<impl Responder> {
|
||||
let owner = id.identity().unwrap();
|
||||
let forms = ctx.get_all_forms_for_host(&owner, &query.host).await?;
|
||||
Ok(HttpResponse::Ok().json(forms))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(list_submission);
|
||||
cfg.service(delete_form_submission);
|
||||
cfg.service(list_all_forms);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use actix_web::{http::StatusCode, test};
|
||||
|
||||
use crate::tests;
|
||||
use crate::*;
|
||||
|
||||
use libforms::*;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_api_forms() {
|
||||
const NAME: &str = "testapiformuser";
|
||||
const PASSWORD: &str = "longpasswordasdfa2";
|
||||
const EMAIL: &str = "testapiformuser@a.com";
|
||||
|
||||
let (_dir, ctx) = tests::get_ctx().await;
|
||||
let _ = ctx.delete_user(NAME, PASSWORD).await;
|
||||
let (_, signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
|
||||
let page = ctx.add_test_site(NAME.into()).await;
|
||||
let cookies = get_cookie!(signin_resp);
|
||||
let app = get_app!(ctx).await;
|
||||
|
||||
let site_info = Table {
|
||||
host: page.domain.clone(),
|
||||
path: format!("/foo/{NAME}"),
|
||||
};
|
||||
|
||||
if let Ok(subs) = ctx.get_all_form_submission(NAME, 0, &site_info).await {
|
||||
for s in subs.iter() {
|
||||
let _ = ctx.delete_form_submission(NAME, s.id, &site_info).await;
|
||||
}
|
||||
}
|
||||
ctx.add_form_submission(NAME, &site_info, &serde_json::to_value(&site_info).unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// get all forms for host
|
||||
let list_forms_resp = test::call_service(
|
||||
&app,
|
||||
test::TestRequest::get()
|
||||
.uri(&V1_API_ROUTES.forms.get_forms_for_host_route(&page.domain))
|
||||
.cookie(cookies.clone())
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(list_forms_resp.status(), StatusCode::OK);
|
||||
let forms: Vec<String> = test::read_body_json(list_forms_resp).await;
|
||||
assert_eq!(forms, vec![site_info.path.to_string()]);
|
||||
|
||||
// list subs using REST API
|
||||
let list_form_submissions = test::call_service(
|
||||
&app,
|
||||
post_request!(&site_info, &V1_API_ROUTES.forms.get_list(0))
|
||||
.cookie(cookies.clone())
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(list_form_submissions.status(), StatusCode::OK);
|
||||
let subs: Vec<FormSubmissionResp> = test::read_body_json(list_form_submissions).await;
|
||||
assert_eq!(subs.len(), 1);
|
||||
assert_eq!(
|
||||
subs[0].value,
|
||||
Some(serde_json::to_value(&site_info).unwrap())
|
||||
);
|
||||
|
||||
// delete form submission
|
||||
let delete_form_submission_resp = test::call_service(
|
||||
&app,
|
||||
post_request!(
|
||||
&site_info,
|
||||
&V1_API_ROUTES
|
||||
.forms
|
||||
.get_delete(subs[0].id, &site_info.host, &site_info.path)
|
||||
)
|
||||
.cookie(cookies.clone())
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(delete_form_submission_resp.status(), StatusCode::OK);
|
||||
|
||||
// list subs using REST API post deletion. Len = 0
|
||||
let list_form_submissions = test::call_service(
|
||||
&app,
|
||||
post_request!(&site_info, &V1_API_ROUTES.forms.get_list(0))
|
||||
.cookie(cookies.clone())
|
||||
.to_request(),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(list_form_submissions.status(), StatusCode::OK);
|
||||
let subs: Vec<FormSubmissionResp> = test::read_body_json(list_form_submissions).await;
|
||||
assert!(subs.is_empty());
|
||||
}
|
||||
}
|
||||
|
|
@ -21,6 +21,7 @@ use serde::Deserialize;
|
|||
pub mod account;
|
||||
pub mod auth;
|
||||
pub mod forgejo;
|
||||
pub mod forms;
|
||||
pub mod meta;
|
||||
pub mod pages;
|
||||
pub mod routes;
|
||||
|
|
@ -32,6 +33,7 @@ pub fn services(cfg: &mut ServiceConfig) {
|
|||
account::services(cfg);
|
||||
meta::services(cfg);
|
||||
forgejo::services(cfg);
|
||||
forms::services(cfg);
|
||||
pages::services(cfg);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ use actix_auth_middleware::GetLoginRoute;
|
|||
use crate::serve::routes::Serve;
|
||||
|
||||
use super::forgejo::routes::Forgejo;
|
||||
use super::forms::routes::Forms;
|
||||
use super::meta::routes::Meta;
|
||||
use super::pages::routes::Deploy;
|
||||
|
||||
|
|
@ -94,6 +95,7 @@ pub struct Routes {
|
|||
/// Meta routes
|
||||
pub meta: Meta,
|
||||
pub forgejo: Forgejo,
|
||||
pub forms: Forms,
|
||||
pub deploy: Deploy,
|
||||
pub serve: Serve,
|
||||
}
|
||||
|
|
@ -106,6 +108,7 @@ impl Routes {
|
|||
account: Account::new(),
|
||||
meta: Meta::new(),
|
||||
forgejo: Forgejo::new(),
|
||||
forms: Forms::new(),
|
||||
deploy: Deploy::new(),
|
||||
serve: Serve::new(),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,11 +45,10 @@ impl Conductor {
|
|||
event_url.set_path("/api/v1/events/new");
|
||||
self.client
|
||||
.post(event_url)
|
||||
.basic_auth(&c.username, Some(&c.api_key))
|
||||
.bearer_auth(&c.api_key)
|
||||
.json(e)
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
.await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
170
src/ctx/api/v1/forms.rs
Normal file
170
src/ctx/api/v1/forms.rs
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
//! Account management utility datastructures and methods
|
||||
use libforms::*;
|
||||
|
||||
pub use super::auth;
|
||||
use crate::ctx::Ctx;
|
||||
use crate::errors::*;
|
||||
|
||||
impl Ctx {
|
||||
/// Delete form submission
|
||||
pub async fn delete_form_submission(
|
||||
&self,
|
||||
owner: &str,
|
||||
sub_id: usize,
|
||||
payload: &Table,
|
||||
) -> ServiceResult<()> {
|
||||
let _site = self.db.get_site(owner, &payload.host).await?;
|
||||
let mut form_url = self.settings.form.url.clone();
|
||||
form_url.set_path(&format!("/api/v1/forms/delete/{sub_id}"));
|
||||
self.client
|
||||
.post(form_url)
|
||||
.bearer_auth(&self.settings.form.api_key)
|
||||
.json(payload)
|
||||
.send()
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Delete form submission
|
||||
pub async fn get_all_form_submission(
|
||||
&self,
|
||||
owner: &str,
|
||||
page: usize,
|
||||
payload: &Table,
|
||||
) -> ServiceResult<Vec<FormSubmissionResp>> {
|
||||
let _site = self.db.get_site(owner, &payload.host).await?;
|
||||
let mut form_url = self.settings.form.url.clone();
|
||||
form_url.set_path("/api/v1/forms/list");
|
||||
form_url.set_query(Some(&format!("page={}", page)));
|
||||
|
||||
let res = self
|
||||
.client
|
||||
.post(form_url)
|
||||
.bearer_auth(&self.settings.form.api_key)
|
||||
.json(payload)
|
||||
.send()
|
||||
.await?
|
||||
.json()
|
||||
.await?;
|
||||
Ok(res)
|
||||
}
|
||||
|
||||
/// List all forms associated with hostname
|
||||
pub async fn get_all_forms_for_host(
|
||||
&self,
|
||||
owner: &str,
|
||||
host: &str,
|
||||
) -> ServiceResult<Vec<String>> {
|
||||
let _site = self.db.get_site(owner, host).await?;
|
||||
let mut form_url = self.settings.form.url.clone();
|
||||
form_url.set_path("/api/v1/forms/host");
|
||||
form_url.set_query(Some(&format!("host={}", host)));
|
||||
|
||||
let res = self
|
||||
.client
|
||||
.get(form_url)
|
||||
.bearer_auth(&self.settings.form.api_key)
|
||||
.send()
|
||||
.await?
|
||||
.json()
|
||||
.await?;
|
||||
Ok(res)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::tests;
|
||||
|
||||
use super::*;
|
||||
|
||||
impl Ctx {
|
||||
/// Delete form submission
|
||||
pub async fn add_form_submission(
|
||||
&self,
|
||||
owner: &str,
|
||||
site_info: &Table,
|
||||
payload: &serde_json::Value,
|
||||
) -> ServiceResult<()> {
|
||||
let _site = self.db.get_site(owner, &site_info.host).await?;
|
||||
let mut form_url = self.settings.form.url.clone();
|
||||
form_url.set_path("/api/v1/forms/submit");
|
||||
form_url.set_query(Some(&format!(
|
||||
"host={}&path={}",
|
||||
site_info.host, site_info.path
|
||||
)));
|
||||
self.client
|
||||
.post(form_url)
|
||||
.json(payload)
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_ctx_forms_work() {
|
||||
const NAME: &str = "testctxformswork";
|
||||
const PASSWORD: &str = "longpasswordasdfa2";
|
||||
const EMAIL: &str = "testctxformswork@a.com";
|
||||
|
||||
let (_dir, ctx) = tests::get_ctx().await;
|
||||
let _ = ctx.delete_user(NAME, PASSWORD).await;
|
||||
let (_, _signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
|
||||
let page = ctx.add_test_site(NAME.into()).await;
|
||||
let site_info = Table {
|
||||
host: page.domain.clone(),
|
||||
path: format!("/foo/{NAME}"),
|
||||
};
|
||||
|
||||
if let Ok(subs) = ctx.get_all_form_submission(NAME, 0, &site_info).await {
|
||||
for s in subs.iter() {
|
||||
let _ = ctx.delete_form_submission(NAME, s.id, &site_info).await;
|
||||
}
|
||||
}
|
||||
ctx.add_form_submission(NAME, &site_info, &serde_json::to_value(&site_info).unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
let subs = ctx
|
||||
.get_all_form_submission(NAME, 0, &site_info)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(subs.len(), 1);
|
||||
assert_eq!(
|
||||
subs[0].value,
|
||||
Some(serde_json::to_value(&site_info).unwrap())
|
||||
);
|
||||
|
||||
let forms = ctx
|
||||
.get_all_forms_for_host(NAME, &page.domain)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(vec![site_info.path.clone()], forms);
|
||||
|
||||
ctx.delete_form_submission(NAME, subs[0].id, &site_info)
|
||||
.await
|
||||
.unwrap();
|
||||
let subs = ctx
|
||||
.get_all_form_submission(NAME, 0, &site_info)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(subs.is_empty());
|
||||
}
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
pub mod account;
|
||||
pub mod auth;
|
||||
pub mod forgejo;
|
||||
pub mod forms;
|
||||
pub mod pages;
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ impl ConnectionOptions {
|
|||
async fn connect(self) -> ServiceResult<Database> {
|
||||
let pool = match self {
|
||||
Self::Fresh(fresh) => {
|
||||
tracing::info!("DATABASE URL: {}", fresh.url);
|
||||
let mut connect_options =
|
||||
sqlx::postgres::PgConnectOptions::from_str(&fresh.url).unwrap();
|
||||
if fresh.disable_logging {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ use derive_more::{Display, Error};
|
|||
use git2::Error as GitError;
|
||||
use hmac::digest::InvalidLength;
|
||||
use hmac::digest::MacError;
|
||||
use reqwest::Error as ReqwestError;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tracing::error;
|
||||
use url::ParseError;
|
||||
|
||||
use crate::page::Page;
|
||||
|
|
@ -186,6 +188,14 @@ pub enum ServiceError {
|
|||
WebhookNotFound,
|
||||
}
|
||||
|
||||
impl From<ReqwestError> for ServiceError {
|
||||
#[cfg(not(tarpaulin_include))]
|
||||
fn from(e: ReqwestError) -> ServiceError {
|
||||
error!("{}", e);
|
||||
ServiceError::InternalServerError
|
||||
}
|
||||
}
|
||||
|
||||
impl From<InvalidLength> for ServiceError {
|
||||
#[cfg(not(tarpaulin_include))]
|
||||
fn from(_: InvalidLength) -> ServiceError {
|
||||
|
|
|
|||
109
src/pages/dash/sites/forms/list.rs
Normal file
109
src/pages/dash/sites/forms/list.rs
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use std::cell::RefCell;
|
||||
|
||||
use actix_identity::Identity;
|
||||
use actix_web::http::header::ContentType;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use tera::Context;
|
||||
|
||||
use super::get_auth_middleware;
|
||||
use crate::api::v1::forms::Host;
|
||||
use crate::errors::ServiceResult;
|
||||
use crate::pages::errors::*;
|
||||
use crate::settings::Settings;
|
||||
use crate::AppCtx;
|
||||
|
||||
pub use super::*;
|
||||
|
||||
pub const DASH_SITE_FORM_HOST_LIST: TemplateFile = TemplateFile::new(
|
||||
"dash_site_form_host_list",
|
||||
"pages/dash/sites/forms/host-list.html",
|
||||
);
|
||||
|
||||
pub struct List {
|
||||
ctx: RefCell<Context>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Eq, PartialEq, Debug)]
|
||||
pub struct Form {
|
||||
pub path: String,
|
||||
pub view: String,
|
||||
}
|
||||
|
||||
impl Form {
|
||||
pub fn new(path: String, host: &str) -> Self {
|
||||
let view = PAGES.dash.site.forms.get_view(0, host, &path);
|
||||
Self { path, view }
|
||||
}
|
||||
}
|
||||
|
||||
impl CtxError for List {
|
||||
fn with_error(&self, e: &ReadableError) -> String {
|
||||
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||
self.render()
|
||||
}
|
||||
}
|
||||
|
||||
impl List {
|
||||
pub fn new(settings: &Settings, forms: Option<&[Form]>) -> Self {
|
||||
let ctx = RefCell::new(context(settings));
|
||||
if let Some(forms) = forms {
|
||||
ctx.borrow_mut().insert(PAYLOAD_KEY, forms);
|
||||
}
|
||||
Self { ctx }
|
||||
}
|
||||
|
||||
pub fn render(&self) -> String {
|
||||
TEMPLATES
|
||||
.render(DASH_SITE_FORM_HOST_LIST.name, &self.ctx.borrow())
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_forms(ctx: &AppCtx, id: &Identity, host: &str) -> ServiceResult<Vec<Form>> {
|
||||
let owner = id.identity().unwrap();
|
||||
let mut db_forms = ctx.get_all_forms_for_host(&owner, host).await?;
|
||||
let mut forms = Vec::with_capacity(db_forms.len());
|
||||
for form in db_forms.drain(0..) {
|
||||
forms.push(Form::new(form, host));
|
||||
}
|
||||
Ok(forms)
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "PAGES.dash.site.forms.list_forms",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "List all forms belonging to host" skip(ctx, id))]
|
||||
pub async fn list_forms(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
query: web::Query<Host>,
|
||||
) -> PageResult<impl Responder, List> {
|
||||
let sites = get_forms(&ctx, &id, &query.host)
|
||||
.await
|
||||
.map_err(|e| PageError::new(List::new(&ctx.settings, None), e))?;
|
||||
let home = List::new(&ctx.settings, Some(&sites)).render();
|
||||
let html = ContentType::html();
|
||||
Ok(HttpResponse::Ok().content_type(html).body(home))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(list_forms);
|
||||
}
|
||||
42
src/pages/dash/sites/forms/mod.rs
Normal file
42
src/pages/dash/sites/forms/mod.rs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use actix_web::*;
|
||||
|
||||
use super::get_auth_middleware;
|
||||
pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
|
||||
|
||||
//pub mod delete;
|
||||
pub mod list;
|
||||
pub mod view;
|
||||
|
||||
pub fn register_templates(t: &mut tera::Tera) {
|
||||
list::DASH_SITE_FORM_HOST_LIST
|
||||
.register(t)
|
||||
.expect(list::DASH_SITE_FORM_HOST_LIST.name);
|
||||
view::DASH_SITE_FORM_VIEW
|
||||
.register(t)
|
||||
.expect(view::DASH_SITE_FORM_VIEW.name);
|
||||
// delete::DASH_SITE_DELETE
|
||||
// .register(t)
|
||||
// .expect(delete::DASH_SITE_DELETE.name);
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
list::services(cfg);
|
||||
view::services(cfg);
|
||||
//delete::services(cfg);
|
||||
}
|
||||
283
src/pages/dash/sites/forms/view.rs
Normal file
283
src/pages/dash/sites/forms/view.rs
Normal file
|
|
@ -0,0 +1,283 @@
|
|||
/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
use std::cell::RefCell;
|
||||
|
||||
use actix_identity::Identity;
|
||||
use actix_web::http::header::ContentType;
|
||||
use libforms::{FormSubmissionResp, Table};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
use tera::Context;
|
||||
use time::{format_description, OffsetDateTime};
|
||||
|
||||
use super::get_auth_middleware;
|
||||
|
||||
use crate::pages::errors::*;
|
||||
use crate::settings::Settings;
|
||||
use crate::AppCtx;
|
||||
|
||||
pub use super::*;
|
||||
|
||||
pub const DASH_SITE_FORM_VIEW: TemplateFile =
|
||||
TemplateFile::new("dash_site_form_view", "pages/dash/sites/forms/view.html");
|
||||
|
||||
pub struct View {
|
||||
ctx: RefCell<Context>,
|
||||
}
|
||||
|
||||
impl CtxError for View {
|
||||
fn with_error(&self, e: &ReadableError) -> String {
|
||||
self.ctx.borrow_mut().insert(ERROR_KEY, e);
|
||||
self.render()
|
||||
}
|
||||
}
|
||||
|
||||
impl View {
|
||||
pub fn new(settings: &Settings, payload: Option<TemplateForms>) -> Self {
|
||||
let ctx = RefCell::new(context(settings));
|
||||
if let Some(payload) = payload {
|
||||
ctx.borrow_mut().insert(PAYLOAD_KEY, &payload);
|
||||
}
|
||||
|
||||
Self { ctx }
|
||||
}
|
||||
|
||||
pub fn render(&self) -> String {
|
||||
TEMPLATES
|
||||
.render(DASH_SITE_FORM_VIEW.name, &self.ctx.borrow())
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
|
||||
pub struct TemplateForms {
|
||||
pub submissions: Vec<TemplateSubmission>,
|
||||
pub next_page: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq)]
|
||||
pub struct TemplateSubmission {
|
||||
pub value: TemplateFormData,
|
||||
pub delete: String,
|
||||
pub time: String,
|
||||
pub id: usize,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq)]
|
||||
pub struct TemplateFormData {
|
||||
pub titles: Vec<String>,
|
||||
pub rows: Vec<Vec<String>>,
|
||||
}
|
||||
|
||||
impl From<Value> for TemplateFormData {
|
||||
fn from(json: Value) -> Self {
|
||||
let mut titles = Vec::default();
|
||||
let mut rows: Vec<Vec<String>> = Vec::default();
|
||||
match json {
|
||||
Value::Object(m) => {
|
||||
let mut row: Vec<String> = Vec::default();
|
||||
for (k, v) in m.iter() {
|
||||
titles.push(k.clone());
|
||||
let value = match v {
|
||||
Value::String(s) => s.clone(),
|
||||
Value::Null => "-".into(),
|
||||
Value::Bool(b) => b.to_string(),
|
||||
Value::Number(n) => n.to_string(),
|
||||
Value::Array(a) => format!("{:?}", a),
|
||||
Value::Object(_) => unimplemented!(),
|
||||
};
|
||||
row.push(value);
|
||||
}
|
||||
|
||||
rows.push(row);
|
||||
}
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
|
||||
Self { titles, rows }
|
||||
}
|
||||
}
|
||||
|
||||
impl TemplateSubmission {
|
||||
fn from_form_submission_resp(f: FormSubmissionResp, host: &str, path: &str) -> Self {
|
||||
let format = format_description::parse(
|
||||
"[year]-[month]-[day] [hour]:[minute]:[second] [offset_hour \
|
||||
sign:mandatory]:[offset_minute]:[offset_second]",
|
||||
)
|
||||
.unwrap();
|
||||
let time = OffsetDateTime::from_unix_timestamp(f.time)
|
||||
.unwrap()
|
||||
.format(&format)
|
||||
.unwrap();
|
||||
Self {
|
||||
value: f.value.unwrap().into(),
|
||||
id: f.id,
|
||||
time,
|
||||
delete: PAGES.dash.site.forms.get_delete(f.id, host, path),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TemplateForms {
|
||||
pub fn new(
|
||||
current_page: usize,
|
||||
mut form_submissions: Vec<FormSubmissionResp>,
|
||||
host: &str,
|
||||
path: &str,
|
||||
) -> Self {
|
||||
let mut submissions = Vec::with_capacity(form_submissions.len());
|
||||
for sub in form_submissions.drain(0..) {
|
||||
let sub = TemplateSubmission::from_form_submission_resp(sub, host, path);
|
||||
submissions.push(sub);
|
||||
}
|
||||
let next_page = PAGES.dash.site.forms.get_view(current_page + 1, host, path);
|
||||
Self {
|
||||
next_page,
|
||||
submissions,
|
||||
}
|
||||
}
|
||||
}
|
||||
#[derive(Serialize, Deserialize, Clone, Debug, Default)]
|
||||
pub struct FormPage {
|
||||
page: usize,
|
||||
host: String,
|
||||
path: String,
|
||||
}
|
||||
|
||||
impl FormPage {
|
||||
pub fn to_table(self) -> (Table, usize) {
|
||||
(
|
||||
Table {
|
||||
host: self.host,
|
||||
path: self.path,
|
||||
},
|
||||
self.page,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[actix_web_codegen_const_routes::get(
|
||||
path = "PAGES.dash.site.forms.view",
|
||||
wrap = "get_auth_middleware()"
|
||||
)]
|
||||
#[tracing::instrument(name = "Dashboard view site form submissions webpage", skip(ctx, id))]
|
||||
pub async fn get_form_submissions(
|
||||
ctx: AppCtx,
|
||||
id: Identity,
|
||||
payload: web::Query<FormPage>,
|
||||
) -> PageResult<impl Responder, View> {
|
||||
let owner = id.identity().unwrap();
|
||||
let payload = payload.into_inner();
|
||||
let (table, page) = payload.to_table();
|
||||
let resp = ctx
|
||||
.get_all_form_submission(&owner, page, &table)
|
||||
.await
|
||||
.unwrap();
|
||||
// .map_err(|e| PageError::new(View::new(&ctx.settings, None), e))?;
|
||||
let payload = TemplateForms::new(page, resp, &table.host, &table.path);
|
||||
|
||||
let page = View::new(&ctx.settings, Some(payload));
|
||||
let body = page.render();
|
||||
let html = ContentType::html();
|
||||
Ok(HttpResponse::Ok().content_type(html).body(body))
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
cfg.service(get_form_submissions);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use actix_web::http::StatusCode;
|
||||
use actix_web::test;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::ctx::api::v1::auth::Password;
|
||||
use crate::ctx::ArcCtx;
|
||||
use crate::errors::ServiceError;
|
||||
use crate::pages::dash::sites::add::TemplateAddSite;
|
||||
use crate::tests;
|
||||
use crate::*;
|
||||
|
||||
use super::Table;
|
||||
use super::PAGES;
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn postgres_dashboard_form_works() {
|
||||
let (_, ctx) = tests::get_ctx().await;
|
||||
dashboard_site_form_works(ctx.clone()).await;
|
||||
}
|
||||
|
||||
async fn dashboard_site_form_works(ctx: ArcCtx) {
|
||||
const NAME: &str = "testdashsiteformuser";
|
||||
const EMAIL: &str = "testdashsiteformuser@foo.com";
|
||||
const PASSWORD: &str = "longpassword";
|
||||
|
||||
let _ = ctx.delete_user(NAME, PASSWORD).await;
|
||||
let (_, signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
|
||||
let cookies = get_cookie!(signin_resp);
|
||||
let app = get_app!(ctx.clone()).await;
|
||||
let page = ctx.add_test_site(NAME.into()).await;
|
||||
|
||||
let site_info = Table {
|
||||
host: page.domain.clone(),
|
||||
path: format!("/foo/{NAME}"),
|
||||
};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Foo {
|
||||
foo: String,
|
||||
}
|
||||
|
||||
if let Ok(subs) = ctx.get_all_form_submission(NAME, 0, &site_info).await {
|
||||
for s in subs.iter() {
|
||||
let _ = ctx.delete_form_submission(NAME, s.id, &site_info).await;
|
||||
}
|
||||
}
|
||||
let foo = Foo {
|
||||
foo: "barvalue".into(),
|
||||
};
|
||||
ctx.add_form_submission(NAME, &site_info, &serde_json::to_value(&foo).unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// list forms for host
|
||||
let resp = get_request!(
|
||||
&app,
|
||||
&PAGES.dash.site.forms.get_list_host(&site_info.host),
|
||||
cookies.clone()
|
||||
);
|
||||
assert_eq!(resp.status(), StatusCode::OK);
|
||||
let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
|
||||
assert!(res.contains(&site_info.path));
|
||||
|
||||
// view form submission
|
||||
let resp = get_request!(
|
||||
&app,
|
||||
&PAGES
|
||||
.dash
|
||||
.site
|
||||
.forms
|
||||
.get_view(0, &site_info.host, &site_info.path),
|
||||
cookies.clone()
|
||||
);
|
||||
assert_eq!(resp.status(), StatusCode::OK);
|
||||
let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
|
||||
assert!(res.contains("foo"));
|
||||
assert!(res.contains("barvalue"));
|
||||
}
|
||||
}
|
||||
|
|
@ -22,6 +22,7 @@ pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
|
|||
|
||||
pub mod add;
|
||||
pub mod delete;
|
||||
pub mod forms;
|
||||
pub mod view;
|
||||
|
||||
pub fn register_templates(t: &mut tera::Tera) {
|
||||
|
|
@ -34,10 +35,12 @@ pub fn register_templates(t: &mut tera::Tera) {
|
|||
delete::DASH_SITE_DELETE
|
||||
.register(t)
|
||||
.expect(delete::DASH_SITE_DELETE.name);
|
||||
forms::register_templates(t);
|
||||
}
|
||||
|
||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||
add::services(cfg);
|
||||
view::services(cfg);
|
||||
delete::services(cfg);
|
||||
forms::services(cfg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ impl View {
|
|||
pub struct TemplateSiteWithEvents {
|
||||
pub site: Site,
|
||||
pub view: String,
|
||||
pub forms: String,
|
||||
pub delete: String,
|
||||
pub last_update: Option<TemplateSiteEvent>,
|
||||
pub events: Vec<TemplateSiteEvent>,
|
||||
|
|
@ -86,10 +87,12 @@ impl TemplateSiteWithEvents {
|
|||
) -> Self {
|
||||
let view = PAGES.dash.site.get_view(site.pub_id);
|
||||
let delete = PAGES.dash.site.get_delete(site.pub_id);
|
||||
let forms = PAGES.dash.site.forms.get_list_host(&site.hostname);
|
||||
Self {
|
||||
site,
|
||||
last_update,
|
||||
view,
|
||||
forms,
|
||||
delete,
|
||||
events,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,6 +114,44 @@ impl ForgejoWebhook {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
/// Dashboard Site routes
|
||||
pub struct DashSiteForms {
|
||||
/// view form submission route
|
||||
pub view: &'static str,
|
||||
/// delete form submission route
|
||||
pub delete: &'static str,
|
||||
|
||||
/// list forms belonging to hostname
|
||||
pub list_forms: &'static str,
|
||||
}
|
||||
|
||||
impl DashSiteForms {
|
||||
/// create new instance of DashSiteForms route
|
||||
pub const fn new() -> DashSiteForms {
|
||||
let view = "/dash/site/forms/submission/view";
|
||||
let delete = "/dash/site/forms/submission/delete";
|
||||
let list_forms = "/dash/site/forms/list";
|
||||
DashSiteForms {
|
||||
view,
|
||||
delete,
|
||||
list_forms,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_list_host(&self, host: &str) -> String {
|
||||
format!("{}?host={}", self.list_forms, host)
|
||||
}
|
||||
|
||||
pub fn get_view(&self, page: usize, host: &str, path: &str) -> String {
|
||||
format!("{}?host={}&path={}&page={}", self.view, host, path, page)
|
||||
}
|
||||
|
||||
pub fn get_delete(&self, id: usize, host: &str, path: &str) -> String {
|
||||
format!("{}?host={}&path={}&id={}", self.view, host, path, id)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
/// Dashboard Site routes
|
||||
pub struct DashSite {
|
||||
|
|
@ -123,6 +161,9 @@ pub struct DashSite {
|
|||
pub view: &'static str,
|
||||
/// delete site route
|
||||
pub delete: &'static str,
|
||||
|
||||
/// forms routes
|
||||
pub forms: DashSiteForms,
|
||||
}
|
||||
|
||||
impl DashSite {
|
||||
|
|
@ -131,7 +172,13 @@ impl DashSite {
|
|||
let add = "/dash/site/add";
|
||||
let view = "/dash/site/view/{deployment_pub_id}";
|
||||
let delete = "/dash/site/delete/{deployment_pub_id}";
|
||||
DashSite { add, view, delete }
|
||||
let forms = DashSiteForms::new();
|
||||
DashSite {
|
||||
add,
|
||||
view,
|
||||
delete,
|
||||
forms,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_view(&self, deployment_pub_id: Uuid) -> String {
|
||||
|
|
|
|||
|
|
@ -83,11 +83,17 @@ pub struct Settings {
|
|||
pub database: Database,
|
||||
pub page: PageConfig,
|
||||
pub conductors: Vec<Conductor>,
|
||||
pub form: Forms,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Conductor {
|
||||
pub username: String,
|
||||
pub api_key: String,
|
||||
pub url: Url,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Forms {
|
||||
pub api_key: String,
|
||||
pub url: Url,
|
||||
}
|
||||
|
|
@ -104,7 +110,7 @@ impl Settings {
|
|||
let mut s = Config::builder();
|
||||
|
||||
const CURRENT_DIR: &str = "./config/default.toml";
|
||||
const ETC: &str = "/etc/static-pages/config.toml";
|
||||
const ETC: &str = "/etc/liberapages/librepages/config.toml";
|
||||
|
||||
let mut read_file = false;
|
||||
|
||||
|
|
|
|||
14
src/tests.rs
14
src/tests.rs
|
|
@ -24,7 +24,6 @@ use actix_web::{
|
|||
};
|
||||
use mktemp::Temp;
|
||||
use serde::Serialize;
|
||||
use url::Url;
|
||||
|
||||
use crate::ctx::api::v1::auth::{Login, Register};
|
||||
use crate::ctx::api::v1::pages::AddSite;
|
||||
|
|
@ -41,15 +40,6 @@ pub async fn get_ctx() -> (Temp, Arc<Ctx>) {
|
|||
// mktemp::Temp is returned because the temp directory created
|
||||
// is removed once the variable goes out of scope
|
||||
let mut settings = Settings::new().unwrap();
|
||||
let mut db_url = Url::parse(&settings.database.url).unwrap();
|
||||
db_url.set_path(&crate::utils::get_random(8));
|
||||
settings.database.url = db_url.to_string();
|
||||
|
||||
use sqlx::migrate::MigrateDatabase;
|
||||
// sqlx::Postgres::create_database(&settings.database.url).await.unwrap();
|
||||
sqlx::postgres::Postgres::create_database(&settings.database.url)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let tmp_dir = Temp::new_dir().unwrap();
|
||||
println!("[log] Test temp directory: {}", tmp_dir.to_str().unwrap());
|
||||
|
|
@ -58,10 +48,8 @@ pub async fn get_ctx() -> (Temp, Arc<Ctx>) {
|
|||
settings.init();
|
||||
println!("[log] Initialzing settings again with test config");
|
||||
settings.init();
|
||||
let ctx = Ctx::new(settings).await;
|
||||
ctx.db.migrate().await.unwrap();
|
||||
|
||||
(tmp_dir, ctx)
|
||||
(tmp_dir, Ctx::new(settings).await)
|
||||
}
|
||||
|
||||
#[allow(dead_code, clippy::upper_case_acronyms)]
|
||||
|
|
|
|||
16
templates/pages/dash/sites/forms/host-list.html
Normal file
16
templates/pages/dash/sites/forms/host-list.html
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{% extends 'base' %}{% block title %} List Forms {% endblock title %} {% block nav
|
||||
%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
|
||||
|
||||
<main class="sites__main">
|
||||
<div class="sites__collection">
|
||||
{% if payload|length > 0 %}
|
||||
{% for form in payload %}
|
||||
<a href="{{ form.view }}" class="site__container">{{ form.path }}</a>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<p class="sites__banner">Form is empty</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</main>
|
||||
|
||||
{% endblock main %}
|
||||
34
templates/pages/dash/sites/forms/view.html
Normal file
34
templates/pages/dash/sites/forms/view.html
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{% extends 'base' %}{% block title %} View Data {% endblock title %} {% block nav
|
||||
%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
|
||||
|
||||
<main class="sites__main">
|
||||
<div class="add-site__container">
|
||||
<section>
|
||||
{% for submission in payload.submissions %}
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
{% for title in submission.value.titles %}
|
||||
<th>{{ title }}</th>
|
||||
{% endfor %}
|
||||
<th>Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% for row in submission.value.rows %}
|
||||
<tbody>
|
||||
<tr>
|
||||
{% for value in row %}
|
||||
<th>{{ value }}</th>
|
||||
{% endfor %}
|
||||
<th>{{ submission.time }}</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
{% endfor %}
|
||||
</table>
|
||||
{% endfor %}
|
||||
</section>
|
||||
<a href="{{payload.next_page}}">Next ></a>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
{% endblock main %}
|
||||
|
|
@ -28,6 +28,11 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>Forms</th>
|
||||
<td><a href="{{ payload.forms }}" >See forms</a></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<td>{{ payload.site.branch }}</td>
|
||||
|
|
|
|||
56
utils/cache-bust/Cargo.lock
generated
56
utils/cache-bust/Cargo.lock
generated
|
|
@ -72,7 +72,7 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim",
|
||||
"syn 1.0.94",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -83,7 +83,7 @@ checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
|
|||
dependencies = [
|
||||
"darling_core",
|
||||
"quote",
|
||||
"syn 1.0.94",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -110,7 +110,7 @@ dependencies = [
|
|||
"darling",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.94",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -120,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
|
||||
dependencies = [
|
||||
"derive_builder_core",
|
||||
"syn 1.0.94",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -176,12 +176,6 @@ dependencies = [
|
|||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.16"
|
||||
|
|
@ -200,18 +194,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.85"
|
||||
version = "1.0.38"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
|
||||
checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.36"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
|
@ -233,32 +227,31 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.210"
|
||||
version = "1.0.137"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
|
||||
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.210"
|
||||
version = "1.0.137"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
|
||||
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.66",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.128"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
|
||||
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
|
@ -291,17 +284,6 @@ dependencies = [
|
|||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.15.0"
|
||||
|
|
@ -317,12 +299,6 @@ dependencies = [
|
|||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.3"
|
||||
|
|
|
|||
Loading…
Reference in a new issue