80fix
This commit is contained in:
parent
c24fee0011
commit
12dd58c566
|
@ -15,5 +15,5 @@ reqwest = { version = "0.11", features = ["json"] }
|
|||
futures = "0.3.28"
|
||||
|
||||
[[bin]]
|
||||
name = "presense"
|
||||
path = "./src/main.rs"
|
||||
name = "presence"
|
||||
path = "./src/main.rs"
|
||||
|
|
10
Dockerfile
10
Dockerfile
|
@ -5,8 +5,8 @@ RUN apt-get update -y && \
|
|||
apt-get install -y git pkg-config make g++ libssl-dev wget && \
|
||||
rustup target add x86_64-unknown-linux-gnu
|
||||
|
||||
RUN USER=root cargo new --bin presense
|
||||
WORKDIR /presense
|
||||
RUN USER=root cargo new --bin presence
|
||||
WORKDIR /presence
|
||||
|
||||
COPY ./Cargo.lock ./Cargo.lock
|
||||
COPY ./Cargo.toml ./Cargo.toml
|
||||
|
@ -20,7 +20,7 @@ RUN rm src/*.rs
|
|||
COPY ./src ./src
|
||||
|
||||
# build for release
|
||||
RUN rm ./target/release/deps/presense*
|
||||
RUN rm ./target/release/deps/presence*
|
||||
RUN cargo build --release
|
||||
|
||||
FROM rustlang/rust:nightly-slim
|
||||
|
@ -28,5 +28,5 @@ FROM rustlang/rust:nightly-slim
|
|||
ENV RUST_BACKTRACE=full
|
||||
RUN apt-get update && apt install -y openssl libssl-dev
|
||||
|
||||
COPY --from=build /presense/target/release/presense .
|
||||
CMD ["./presense"]
|
||||
COPY --from=build /presence/target/release/presence .
|
||||
CMD ["./presence"]
|
||||
|
|
|
@ -5,14 +5,14 @@ use std::error::Error;
|
|||
use std::env;
|
||||
|
||||
pub async fn get_auth_id(token: &str) -> Result<i32, Box<dyn Error>> {
|
||||
let api_base = env::var("API_BASE")?;
|
||||
let gql = match api_base.contains("v2") {
|
||||
let auth_api_base = env::var("AUTH_URL")?;
|
||||
let gql = match auth_api_base.contains("v2") {
|
||||
true => r#"mutation { getSession { user { id } } }"#, // v2
|
||||
_ => r#"query { sessiom { user { id } } }"# // authorizer
|
||||
};
|
||||
let client = HTTPClient::new();
|
||||
let response = client
|
||||
.post(api_base)
|
||||
.post(auth_api_base)
|
||||
.bearer_auth(token) // NOTE: auth token is here
|
||||
.body(gql)
|
||||
.send()
|
||||
|
|
|
@ -77,7 +77,8 @@ async fn main() -> std::io::Result<()> {
|
|||
.route("/connect", web::get().to(sse_handler))
|
||||
.route("/disconnect", web::get().to(sse_handler))
|
||||
})
|
||||
.bind("127.0.0.1:8080")?
|
||||
.bind("127.0.0.1:80")?
|
||||
.run()
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user