shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed token in user params to jwt since token was way too vague

Browse Source
This commit is contained in:
shockrah 2020-12-28 23:05:31 -08:00
parent b351f63db5
commit b7209c000c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server-api/src/auth.rs
View File

@ -99,7 +99,7 @@ pub fn encrypt_secret(raw: &str) -> BcryptResult<String> {
fn jwt_from_serde(params: &serde_json::Value) -> Option<&str> { fn jwt_from_serde(params: &serde_json::Value) -> Option<&str> {
// gets the `token` from the parameters // gets the `token` from the parameters
// option<value> -> some(value) -> string // option<value> -> some(value) -> string
return params.get("token")?.as_str(); return params.get("jwt")?.as_str();
} }
async fn valid_jwt(p: &Pool, token: &str) -> AuthReason { async fn valid_jwt(p: &Pool, token: &str) -> AuthReason {
@ -201,7 +201,7 @@ pub async fn login_get_jwt(p: &Pool, response: &mut hyper::Response<hyper::Body>
&EncodingKey::from_base64_secret(HMAC_SECRET.as_ref()).expect("Couldn't encode from secret")) &EncodingKey::from_base64_secret(HMAC_SECRET.as_ref()).expect("Couldn't encode from secret"))
.expect("Could not encode JWT"); .expect("Could not encode JWT");
match db::auth::add_jwt(p, encoded.as_ref()).await { match db::auth::add_jwt(p, id, encoded.as_ref()).await {
Ok(_) => { Ok(_) => {
response.headers_mut().insert("Content-Type", response.headers_mut().insert("Content-Type",
HeaderValue::from_static("application/json")); HeaderValue::from_static("application/json"));