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(
3232 . await
3333 . map_internal_server_err ( ) ?;
3434 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" ) ;
3936 let redirect_url = format ! ( "{}#{}" , REDIRECT_URL , redirect_fragment) ;
4037 let response = HttpResponse :: Found ( )
4138 . insert_header ( ( LOCATION , redirect_url) )
Original file line number Diff line number Diff line change @@ -139,8 +139,8 @@ where
139139 let client = Rc :: clone ( & self . client ) ;
140140 async move {
141141 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 {
144144 req. extensions_mut ( ) . insert ( token) ;
145145 }
146146 }
Original file line number Diff line number Diff line change @@ -23,20 +23,22 @@ pub(crate) async fn get_user_info(
2323 pool : web:: Data < PgPool > ,
2424 query : web:: Query < Query > ,
2525) -> 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 ) ;
2830 let accepted_count_rank = pool
2931 . get_accepted_count_rank ( accepted_count)
3032 . await
3133 . 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 ) ;
3335 let rated_point_sum_rank = pool
3436 . get_rated_point_sum_rank ( rated_point_sum)
3537 . await
3638 . map_err ( error:: ErrorInternalServerError ) ?;
3739
3840 let user_info = UserInfo {
39- user_id : user_id . clone ( ) ,
41+ user_id,
4042 accepted_count,
4143 accepted_count_rank,
4244 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 {
2222
2323pub fn start_mock_github_server ( access_token : & str ) -> MockServer {
2424 let server = MockServer :: start ( ) ;
25- let token = access_token. to_string ( ) ;
2625 server. mock ( |when, then| {
2726 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 } ) ) ;
3129 } ) ;
3230 server
3331}
You can’t perform that action at this time.
0 commit comments