gandc/lldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo,app,auth: Update dependencies, fix breaks

Browse Source
This commit is contained in:
Valentin Tolmer 2024-10-16 23:43:14 +02:00 committed by nitnelave
parent 11d766b2ba
commit abfe2f3a17
7 changed files with 1237 additions and 1057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/Dockerfile.dev vendored
View File

@ -1,5 +1,5 @@
# Keep tracking base image
FROM rust:1.76-slim-bookworm
FROM rust:1.81-slim-bookworm
# Set needed env path
ENV PATH="/opt/armv7l-linux-musleabihf-cross/:/opt/armv7l-linux-musleabihf-cross/bin/:/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH"

6
.github/workflows/docker-build-static.yml vendored
View File

@ -39,7 +39,7 @@ env:
# GitHub actions randomly timeout when downloading musl-gcc, using custom dev image #
# Look into .github/workflows/Dockerfile.dev for development image details #
# Using lldap dev image based on https://hub.docker.com/_/rust and musl-gcc bundled #
# lldap/rust-dev:latest #
# lldap/rust-dev #
#######################################################################################
# Cargo build
### armv7, aarch64 and amd64 is musl based
@ -84,7 +84,7 @@ jobs:
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.event_name == 'release' }}
container:
image: lldap/rust-dev:latest
image: lldap/rust-dev:v81
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.1
@ -125,7 +125,7 @@ jobs:
matrix:
target: [armv7-unknown-linux-musleabihf, aarch64-unknown-linux-musl, x86_64-unknown-linux-musl]
container:
image: lldap/rust-dev:latest
image: lldap/rust-dev:v81
env:
CARGO_TERM_COLOR: always
RUSTFLAGS: -Ctarget-feature=+crt-static

2262
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
app/Cargo.toml
View File

@ -22,8 +22,8 @@ rand = "0.8"
serde = "1"
serde_json = "1"
url-escape = "0.1.1"
validator = "=0.14"
validator_derive = "*"
validator = "0.14"
validator_derive = "0.14"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "*"
yew = "0.19.3"

2
app/src/components/form/date_input.rs
View File

@ -40,7 +40,7 @@ pub fn date_time_input(props: &DateTimeInputProps) -> Html {
value.set(
NaiveDateTime::from_str(&string_val)
.ok()
.map(|x| DateTime::from_utc(x, Utc))
.map(|x| DateTime::from_naive_utc_and_offset(x, Utc))
)
}} />
<span class="input-group-text">{"UTC"}</span>

16
app/src/infra/api.rs
View File

@ -1,6 +1,6 @@
use super::cookies::set_cookie;
use anyhow::{anyhow, Context, Result};
use gloo_net::http::{Method, Request};
use gloo_net::http::{Method, RequestBuilder};
use graphql_client::GraphQLQuery;
use lldap_auth::{login, registration, JWTClaims};
@ -32,14 +32,16 @@ async fn call_server<Body: Serialize>(
body: RequestType<Body>,
error_message: &'static str,
) -> Result<String> {
let mut request = Request::new(url)
let request_builder = RequestBuilder::new(url)
.header("Content-Type", "application/json")
.credentials(RequestCredentials::SameOrigin);
if let RequestType::Post(b) = body {
request = request
.body(serde_json::to_string(&b)?)
.method(Method::POST);
}
let request = if let RequestType::Post(b) = body {
request_builder
.method(Method::POST)
.body(serde_json::to_string(&b)?)?
} else {
request_builder.build()?
};
let response = request.send().await?;
if response.ok() {
Ok(response.text().await?)

2
auth/src/lib.rs
View File

@ -108,7 +108,7 @@ pub mod types {
use serde::{Deserialize, Serialize};
#[cfg(feature = "sea_orm")]
use sea_orm::{DbErr, DeriveValueType, QueryResult, TryFromU64, Value};
use sea_orm::{DbErr, DeriveValueType, TryFromU64, Value};
#[derive(
PartialEq, Eq, PartialOrd, Ord, Clone, Debug, Default, Hash, Serialize, Deserialize,