add Cors supports

Author: wenewzhang

Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 actix-web = "2.0.0"
 actix-rt = "1.0.0"
 actix-service = "1.0.1"
+actix-cors = "0.2.0"
 log = "0.4.8"
 log4rs = "0.9.0"
 diesel_migrations = "1.4.0"

README.md

@@ -105,7 +105,7 @@ curl -X POST -H 'Content-Type: application/json' -i 'http://127.0.0.1:8000/api/a
 
 ### `POST /api/auth/login`: Logout
     ```bash
-    curl -X POST -H 'Content-Type: application/json' -H 'Authorization: bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzcyNTc4NzksImV4cCI6MTU3Nzg2MjY3OSwidXNlciI6ImMiLCJsb2dpbl9zZXNzaW9uIjoiYzUxNWE3NTg3NGYzNGVjNGFmNDJmNWE2M2QxMDVjMGYifQ.B9w6FxFdypb5GCRMKXZ9CZWFxQLFjvmPSusMCtcE-Ac' -i 'http://127.0.0.1:8000/api/auth/logout' 
+    curl -X POST -H 'Content-Type: application/json' -H 'Authorization: bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzcyNTc4NzksImV4cCI6MTU3Nzg2MjY3OSwidXNlciI6ImMiLCJsb2dpbl9zZXNzaW9uIjoiYzUxNWE3NTg3NGYzNGVjNGFmNDJmNWE2M2QxMDVjMGYifQ.B9w6FxFdypb5GCRMKXZ9CZWFxQLFjvmPSusMCtcE-Ac' -i 'http://127.0.0.1:8000/api/auth/logout'
     ```
 
 ### `GET /api/address-book`: Get all people information
@@ -294,3 +294,15 @@ curl -X POST -H 'Content-Type: application/json' -H 'Authorization: bearer eyJ0e
       "data": ""
     }
     ```
+### brower OPTIONS curl request example
+```
+curl -X OPTIONS -i 'http://127.0.0.1:8000/api/login' -H "Origin: http://example.com" -H "Access-Control-Request-Method: POST"
+```
+  - Response  
+  HTTP/1.1 200 OK
+  content-length: 0
+  access-control-max-age: 3600
+  access-control-allow-methods: POST,DELETE,GET,PUT
+  access-control-allow-origin: *
+  access-control-allow-headers: authorization,content-type,accept
+  date: Tue, 07 Jan 2020 15:17:48 GMT

src/api/account_controller.rs

@@ -26,12 +26,7 @@ pub async fn login(login_dto: web::Json<LoginDTO>, pool: web::Data<Pool>) -> Res
 }
 
 // POST api/auth/logout
-<<<<<<< HEAD
-pub fn logout(req: HttpRequest, pool: web::Data<Pool>) -> impl Future<Item = HttpResponse, Error = Error> {
-    debug!("{:?}",req);
-=======
 pub async fn logout(req: HttpRequest, pool: web::Data<Pool>) -> Result<HttpResponse> {
->>>>>>> bbc4914b638c3950e229f029fdcb3eb0f9a8e7f6
     if let Some(authen_header) = req.headers().get(constants::AUTHORIZATION) {
         account_service::logout(authen_header, &pool);
         Ok(HttpResponse::Ok().json(ResponseBody::new(constants::MESSAGE_LOGOUT_SUCCESS, constants::EMPTY)))

src/main.rs

@@ -13,6 +13,7 @@ extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 extern crate actix_rt;
+extern crate actix_cors;
 // extern crate env_logger;
 extern crate log4rs;
 extern crate serde;
@@ -35,11 +36,12 @@ mod schema;
 mod services;
 mod utils;
 
-use actix_web::{HttpServer, App};
+use actix_web::{http, HttpServer, App};
 use actix_service::Service;
 use futures::FutureExt;
 use std::{io, env};
 use std::default::Default;
+use actix_cors::Cors;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -57,6 +59,14 @@ async fn main() -> io::Result<()> {
 
     HttpServer::new(move || {
         App::new()
+            .wrap(Cors::new() //   run order: **2**
+                // .allowed_origin("http://127.0.0.1:8080")
+                .send_wildcard()
+                .allowed_methods(vec!["GET", "POST", "PUT", "DELETE"])
+                .allowed_headers(vec![http::header::AUTHORIZATION, http::header::ACCEPT])
+                .allowed_header(http::header::CONTENT_TYPE)
+                .max_age(3600)
+                .finish())
             .data(pool.clone())
             .wrap(actix_web::middleware::Logger::default())
             .wrap(crate::middleware::authen_middleware::Authentication)

src/middleware/authen_middleware.rs

@@ -1,6 +1,7 @@
 use crate::{config::db::Pool, constants, models::response::ResponseBody, utils::token_utils};
 use actix_service::{Service, Transform};
 use actix_web::{
+    http::{Method},
     dev::{ServiceRequest, ServiceResponse},
     Error, HttpResponse,
 };
@@ -64,36 +65,38 @@ where
         // debug!("{:?}",pl);
         // let req2 = ServiceRequest::from_parts(r, pl);
         // assert!(ServiceRequest::from_parts(r, pl).is_ok());
-        for ignore_route in constants::IGNORE_ROUTES.iter() {
-            debug!("route:{}",ignore_route);
-            if req.path().starts_with(ignore_route) {
-                authenticate_pass = true;
+        if Method::OPTIONS == *req.method() {
+            authenticate_pass = true;
+        } else {
+            for ignore_route in constants::IGNORE_ROUTES.iter() {
+                debug!("route:{}",ignore_route);
+                if req.path().starts_with(ignore_route) {
+                    authenticate_pass = true;
+                }
             }
-        }
 
-        if let Some(pool) = req.app_data::<Pool>() {
-            info!("Connecting to database...");
-            if let Some(authen_header) = req.headers_mut().get(constants::AUTHORIZATION) {
-                info!("Parsing authorization header...");
-                if let Ok(authen_str) = authen_header.to_str() {
-                    if authen_str.starts_with("bearer") || authen_str.starts_with("Bearer") {
-                        info!("Parsing token...");
-                        let token = authen_str[6..authen_str.len()].trim();
-                        if let Ok(token_data) = token_utils::decode_token(token.to_string()) {
-                            info!("Decoding token...");
-                            if token_utils::verify_token(&token_data, &pool).is_ok() {
-                                info!("Valid token");
-                                authenticate_pass = true;
-                            } else {
-                                error!("Invalid token");
+            if let Some(pool) = req.app_data::<Pool>() {
+                info!("Connecting to database...");
+                if let Some(authen_header) = req.headers_mut().get(constants::AUTHORIZATION) {
+                    info!("Parsing authorization header...");
+                    if let Ok(authen_str) = authen_header.to_str() {
+                        if authen_str.starts_with("bearer") || authen_str.starts_with("Bearer") {
+                            info!("Parsing token...");
+                            let token = authen_str[6..authen_str.len()].trim();
+                            if let Ok(token_data) = token_utils::decode_token(token.to_string()) {
+                                info!("Decoding token...");
+                                if token_utils::verify_token(&token_data, &pool).is_ok() {
+                                    info!("Valid token");
+                                    authenticate_pass = true;
+                                } else {
+                                    error!("Invalid token");
+                                }
                             }
                         }
                     }
                 }
             }
         }
-
-        error!("{}", constants::MESSAGE_PROCESS_TOKEN_ERROR);
         if authenticate_pass {
             let fut = self.service.call(req);
             Box::pin(async move {