summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2020-01-31 23:01:11 -0500
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2020-01-31 23:01:11 -0500
commitd3663c6e5a89687870194d3794daa27792b8cc2e (patch)
tree62d71dc25b836d6aa8151da4a57920498d2a44e1
parent263605f2b0404ffe04fedde644b0aaccc1e84b85 (diff)
cargo fmt
-rw-r--r--src/db.rs3
-rw-r--r--src/models.rs4
-rw-r--r--src/schema.rs6
-rw-r--r--src/server.rs23
-rw-r--r--src/strava.rs16
5 files changed, 25 insertions, 27 deletions
diff --git a/src/db.rs b/src/db.rs
index 55cef7b..8b39c49 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -22,8 +22,7 @@ pub fn create_config(conn: &PgConnection, config: &models::Config) -> Result<(),
})
}
-pub fn insert_strava_token(conn: &PgConnection, token: &models::StravaToken)
- -> Result<(), Error> {
+pub fn insert_strava_token(conn: &PgConnection, token: &models::StravaToken) -> Result<(), Error> {
use crate::schema::strava_tokens;
conn.transaction(|| {
diesel::delete(strava_tokens::table)
diff --git a/src/models.rs b/src/models.rs
index fd946b9..b3d653f 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -1,8 +1,8 @@
use crate::schema::config;
-use crate::schema::users;
use crate::schema::strava_tokens;
-use chrono::Utc;
+use crate::schema::users;
use chrono::DateTime;
+use chrono::Utc;
#[derive(Insertable, Queryable)]
#[table_name = "config"]
diff --git a/src/schema.rs b/src/schema.rs
index 326aac8..7cf2892 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -25,8 +25,4 @@ table! {
joinable!(strava_tokens -> users (username));
-allow_tables_to_appear_in_same_query!(
- config,
- strava_tokens,
- users,
-);
+allow_tables_to_appear_in_same_query!(config, strava_tokens, users,);
diff --git a/src/server.rs b/src/server.rs
index a2ed2b1..e2ac7dd 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -17,8 +17,8 @@ use std::collections::HashMap;
use crate::db;
use crate::error::Error;
-use crate::strava;
use crate::models;
+use crate::strava;
pub struct Params {
pub base_url: String,
@@ -112,14 +112,21 @@ fn link_strava_callback(
params: State<Params>,
code: String,
) -> Result<String, Error> {
- let token = strava::exchange_token(&params.strava_client_id, &params.strava_client_secret, &code)?;
+ let token = strava::exchange_token(
+ &params.strava_client_id,
+ &params.strava_client_secret,
+ &code,
+ )?;
let result = format!("{:#?}", token);
- db::insert_strava_token(&*conn, &models::StravaToken {
- username: user.username,
- refresh_token: token.refresh_token,
- access_token: token.access_token,
- expires_at: token.expires_at
- })?;
+ db::insert_strava_token(
+ &*conn,
+ &models::StravaToken {
+ username: user.username,
+ refresh_token: token.refresh_token,
+ access_token: token.access_token,
+ expires_at: token.expires_at,
+ },
+ )?;
Ok(result)
}
diff --git a/src/strava.rs b/src/strava.rs
index df7d2a4..7df728c 100644
--- a/src/strava.rs
+++ b/src/strava.rs
@@ -1,12 +1,12 @@
+use crate::error::Error;
+use chrono::serde::ts_seconds;
+use chrono::DateTime;
+use chrono::Utc;
use reqwest;
use serde::Deserialize;
use serde::Serialize;
-use chrono::Utc;
-use chrono::DateTime;
-use chrono::serde::ts_seconds;
-use serde_json::Value;
use serde_json::from_value;
-use crate::error::Error;
+use serde_json::Value;
#[derive(Serialize, Deserialize, Debug)]
pub struct AthleteSummary {
@@ -25,11 +25,7 @@ pub struct Token {
pub athlete: AthleteSummary,
}
-pub fn exchange_token(
- client_id: &str,
- client_secret: &str,
- code: &str,
-) -> Result<Token, Error> {
+pub fn exchange_token(client_id: &str, client_secret: &str, code: &str) -> Result<Token, Error> {
let client = reqwest::blocking::Client::new();
let params = [
("client_id", client_id),