File tree Expand file tree Collapse file tree 4 files changed +11
-14
lines changed Expand file tree Collapse file tree 4 files changed +11
-14
lines changed Original file line number Diff line number Diff line change @@ -32,10 +32,7 @@ pub async fn get_authorize(
32
32
. await
33
33
. map_internal_server_err ( ) ?;
34
34
let cookie = Cookie :: build ( "token" , token) . path ( "/" ) . finish ( ) ;
35
- let redirect_fragment = query
36
- . redirect_to
37
- . clone ( )
38
- . unwrap_or_else ( || "/login/user" . to_string ( ) ) ;
35
+ let redirect_fragment = query. redirect_to . as_deref ( ) . unwrap_or ( "/login/user" ) ;
39
36
let redirect_url = format ! ( "{}#{}" , REDIRECT_URL , redirect_fragment) ;
40
37
let response = HttpResponse :: Found ( )
41
38
. insert_header ( ( LOCATION , redirect_url) )
Original file line number Diff line number Diff line change @@ -139,8 +139,8 @@ where
139
139
let client = Rc :: clone ( & self . client ) ;
140
140
async move {
141
141
if let Some ( cookie) = req. cookie ( "token" ) {
142
- let token = cookie. value ( ) . to_string ( ) ;
143
- if let Ok ( token) = client. verify_user ( & token) . await {
142
+ let token = cookie. value ( ) ;
143
+ if let Ok ( token) = client. verify_user ( token) . await {
144
144
req. extensions_mut ( ) . insert ( token) ;
145
145
}
146
146
}
Original file line number Diff line number Diff line change @@ -23,20 +23,22 @@ pub(crate) async fn get_user_info(
23
23
pool : web:: Data < PgPool > ,
24
24
query : web:: Query < Query > ,
25
25
) -> Result < HttpResponse > {
26
- let user_id = & query. user ;
27
- let accepted_count = pool. get_users_accepted_count ( user_id) . await . unwrap_or ( 0 ) ;
26
+ let query = query. into_inner ( ) ;
27
+ let user_id = query. user ;
28
+
29
+ let accepted_count = pool. get_users_accepted_count ( & user_id) . await . unwrap_or ( 0 ) ;
28
30
let accepted_count_rank = pool
29
31
. get_accepted_count_rank ( accepted_count)
30
32
. await
31
33
. map_err ( error:: ErrorInternalServerError ) ?;
32
- let rated_point_sum = pool. get_users_rated_point_sum ( user_id) . await . unwrap_or ( 0 ) ;
34
+ let rated_point_sum = pool. get_users_rated_point_sum ( & user_id) . await . unwrap_or ( 0 ) ;
33
35
let rated_point_sum_rank = pool
34
36
. get_rated_point_sum_rank ( rated_point_sum)
35
37
. await
36
38
. map_err ( error:: ErrorInternalServerError ) ?;
37
39
38
40
let user_info = UserInfo {
39
- user_id : user_id . clone ( ) ,
41
+ user_id,
40
42
accepted_count,
41
43
accepted_count_rank,
42
44
rated_point_sum,
Original file line number Diff line number Diff line change @@ -22,12 +22,10 @@ pub async fn initialize_and_connect_to_test_sql() -> PgPool {
22
22
23
23
pub fn start_mock_github_server ( access_token : & str ) -> MockServer {
24
24
let server = MockServer :: start ( ) ;
25
- let token = access_token. to_string ( ) ;
26
25
server. mock ( |when, then| {
27
26
when. method ( "POST" ) . path ( "/login/oauth/access_token" ) ;
28
- then. status ( 200 ) . json_body ( json ! ( {
29
- "access_token" : token. clone( )
30
- } ) ) ;
27
+ then. status ( 200 )
28
+ . json_body ( json ! ( { "access_token" : access_token } ) ) ;
31
29
} ) ;
32
30
server
33
31
}
You can’t perform that action at this time.
0 commit comments