style: rename url to frontend_url
This commit is contained in:
parent
556337aa4e
commit
3c5f3fd654
6 changed files with 12 additions and 10 deletions
|
@ -18,7 +18,8 @@ RUN useradd --create-home --home-dir /gorb gorb
|
|||
|
||||
USER gorb
|
||||
|
||||
ENV WEB_URL=https://gorb.app/web/ \
|
||||
ENV WEB_FRONTEND_URL=https://gorb.app/web/ \
|
||||
WEB_BASE_PATH=/api \
|
||||
DATABASE_USERNAME=gorb \
|
||||
DATABASE_PASSWORD=gorb \
|
||||
DATABASE=gorb \
|
||||
|
|
|
@ -18,7 +18,7 @@ services:
|
|||
- gorb-backend:/gorb
|
||||
environment:
|
||||
#- RUST_LOG=debug
|
||||
- WEB_URL=https://gorb.app/web/
|
||||
- WEB_FRONTEND_URL=https://gorb.app/web/
|
||||
- DATABASE_USERNAME=gorb
|
||||
- DATABASE_PASSWORD=gorb
|
||||
- DATABASE=gorb
|
||||
|
|
|
@ -16,7 +16,7 @@ services:
|
|||
- gorb-backend:/gorb
|
||||
environment:
|
||||
#- RUST_LOG=debug
|
||||
- WEB_URL=https://gorb.app/web/
|
||||
- WEB_FRONTEND_URL=https://gorb.app/web/
|
||||
- DATABASE_USERNAME=gorb
|
||||
- DATABASE_PASSWORD=gorb
|
||||
- DATABASE=gorb
|
||||
|
|
|
@ -11,7 +11,8 @@ fi
|
|||
if [ ! -f "/gorb/config/config.toml" ]; then
|
||||
cat > /gorb/config/config.toml <<EOF
|
||||
[web]
|
||||
url = "${WEB_URL}"
|
||||
frontend_url = "${WEB_FRONTEND_URL}"
|
||||
base_path = "${WEB_BASE_PATH}"
|
||||
|
||||
[database]
|
||||
username = "${DATABASE_USERNAME}"
|
||||
|
|
|
@ -38,7 +38,7 @@ pub struct CacheDatabase {
|
|||
struct WebBuilder {
|
||||
ip: Option<String>,
|
||||
port: Option<u16>,
|
||||
url: Url,
|
||||
frontend_url: Url,
|
||||
_ssl: Option<bool>,
|
||||
}
|
||||
|
||||
|
@ -85,7 +85,7 @@ impl ConfigBuilder {
|
|||
let web = Web {
|
||||
ip: self.web.ip.unwrap_or(String::from("0.0.0.0")),
|
||||
port: self.web.port.unwrap_or(8080),
|
||||
url: self.web.url,
|
||||
frontend_url: self.web.frontend_url,
|
||||
};
|
||||
|
||||
let endpoint = match &*self.bunny.endpoint {
|
||||
|
@ -146,7 +146,7 @@ pub struct Config {
|
|||
pub struct Web {
|
||||
pub ip: String,
|
||||
pub port: u16,
|
||||
pub url: Url,
|
||||
pub frontend_url: Url,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
|
|
|
@ -1014,7 +1014,7 @@ impl EmailToken {
|
|||
.execute(&mut conn)
|
||||
.await?;
|
||||
|
||||
let mut verify_endpoint = data.config.web.url.join("verify-email")?;
|
||||
let mut verify_endpoint = data.config.web.frontend_url.join("verify-email")?;
|
||||
|
||||
verify_endpoint.set_query(Some(&format!("token={}", token)));
|
||||
|
||||
|
@ -1104,7 +1104,7 @@ impl PasswordResetToken {
|
|||
.execute(&mut conn)
|
||||
.await?;
|
||||
|
||||
let mut reset_endpoint = data.config.web.url.join("reset-password")?;
|
||||
let mut reset_endpoint = data.config.web.frontend_url.join("reset-password")?;
|
||||
|
||||
reset_endpoint.set_query(Some(&format!("token={}", token)));
|
||||
|
||||
|
@ -1153,7 +1153,7 @@ impl PasswordResetToken {
|
|||
.get_result(&mut conn)
|
||||
.await?;
|
||||
|
||||
let login_page = data.config.web.url.join("login")?;
|
||||
let login_page = data.config.web.frontend_url.join("login")?;
|
||||
|
||||
let email = data
|
||||
.mail_client
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue