refactor test remove bypass request block out

Author: SukitOwl

Cpp/odin-views/app.google.cpp

@@ -80,20 +80,7 @@ namespace {
             auto const access_token =
                     fostlib::coerce<fostlib::string>(body["access_token"]);
 
-            fostlib::json user_detail;
-            if (config.has_key("google-mock")) {
-                if (fostlib::coerce<fostlib::string>(config["google-mock"])
-                    == "OK") {
-                    // Use access token as google ID
-                    fostlib::insert(user_detail, "sub", access_token);
-                    fostlib::insert(user_detail, "name", "Test User");
-                    fostlib::insert(
-                            user_detail, "email",
-                            access_token + "@example.com");
-                }
-            } else {
-                user_detail = odin::google::get_user_detail(access_token);
-            }
+            fostlib::json user_detail = odin::google::get_user_detail(access_token);
             logger("user_detail", user_detail);
             if (user_detail.isnull())
                 throw fostlib::exceptions::not_implemented(

Cpp/odin-views/google.cpp

@@ -57,20 +57,7 @@ namespace {
                         "odin.google.login", "Must pass access_token field");
             const auto access_token =
                     fostlib::coerce<fostlib::string>(body["access_token"]);
-            fostlib::json user_detail;
-            if (config.has_key("google-mock")) {
-                if (fostlib::coerce<fostlib::string>(config["google-mock"])
-                    == "OK") {
-                    // Use access token as google ID
-                    fostlib::insert(user_detail, "sub", access_token);
-                    fostlib::insert(user_detail, "name", "Test User");
-                    fostlib::insert(
-                            user_detail, "email",
-                            access_token + "@example.com");
-                }
-            } else {
-                user_detail = odin::google::get_user_detail(access_token);
-            }
+            fostlib::json user_detail = odin::google::get_user_detail(access_token);
             if (user_detail.isnull())
                 throw fostlib::exceptions::not_implemented(
                         "odin.google.login", "User not authenticated");

Cpp/odin/facebook.cpp

@@ -1,5 +1,5 @@
 /**
-    Copyright 2018-2019 Red Anchor Trading Co. Ltd.
+    Copyright 2018-2020 Red Anchor Trading Co. Ltd.
 
     Distributed under the Boost Software License, Version 1.0.
     See <http://www.boost.org/LICENSE_1_0.txt>
@@ -9,38 +9,12 @@
 #include <odin/fg/native.hpp>
 #include <odin/odin.hpp>
 
-#include <fost/http>
-#include <fost/log>
 #include <fostgres/sql.hpp>
-
+#include <fost/http>
 #include <fost/insert>
+#include <fost/log>
+#include <fost/ua/exceptions.hpp>
 
-namespace {
-
-
-    std::unique_ptr<fostlib::http::user_agent::response> get_or_mock(
-            fostlib::http::user_agent &ua,
-            fostlib::url url,
-            fostlib::json config = {}) {
-        if (config.isnull()) { return ua.get(url); }
-        /// Create mock response based on config
-        int status{200};
-        if (config.has_key("status")) {
-            status = fostlib::coerce<int>(config["status"]);
-        }
-        fostlib::json body{};
-        if (config.has_key("body")) { body = config["body"]; }
-        auto const bodydata = fostlib::json::unparse(body, false);
-        // TODO: Can set headers
-        fostlib::mime::mime_headers headers;
-        // fostlib::json headers{};
-        return std::make_unique<fostlib::http::user_agent::response>(
-                "GET", url, 200,
-                std::make_unique<fostlib::binary_body>(
-                        bodydata.memory().begin(), bodydata.memory().end(),
-                        headers));
-    }
-}
 
 fostlib::json odin::facebook::get_user_detail(
         fostlib::pg::connection &cnx,
@@ -55,31 +29,15 @@ fostlib::json odin::facebook::get_user_detail(
     fostlib::url::query_string ids_for_biz_qs{};
     ids_for_biz_qs.append("access_token", user_token);
     ids_for_biz_url.query(ids_for_biz_qs);
-    fostlib::json ids_for_biz_conf{};
-    if (config.has_key(fostlib::jcursor{"facebook-mock", "ids_for_business"})) {
-        ids_for_biz_conf =
-                config[fostlib::jcursor{"facebook-mock", "ids_for_business"}];
-    }
 
     fostlib::json ids_for_biz;
-    if (ids_for_biz_conf.isnull()) {
-        fostlib::mime::mime_headers headers;
-        ids_for_biz = fostlib::ua::get_json(ids_for_biz_url, headers);
-    }
-    else {
-        auto const ids_for_biz_resp =
-                get_or_mock(ua, ids_for_biz_url, ids_for_biz_conf);
-        ids_for_biz =
-                fostlib::json::parse(fostlib::coerce<fostlib::string>(
-                        fostlib::coerce<fostlib::utf8_string>(
-                                ids_for_biz_resp->body()->data())));
-    }
-
-    if (!ids_for_biz.has_key("data")) {
+    try {
+        ids_for_biz = fostlib::ua::get_json(
+                ids_for_biz_url, fostlib::mime::mime_headers{});
+    } catch (fostlib::ua::http_error &e) {
         fostlib::log::error(c_odin)("Error", "ids_for_business")(
-                "URL", ids_for_biz_url)("status", 200)(
+                "URL", ids_for_biz_url)("status", e.data()["status-code"])(
                 "body", ids_for_biz);
-        // TODO: Should return 422
         throw fostlib::exceptions::not_implemented(
                 __PRETTY_FUNCTION__,
                 "Cannot retrieve /me/ids_for_business from Facebook");
@@ -131,31 +89,21 @@ fostlib::json odin::facebook::get_user_detail(
     user_detail_qs.append("access_token", user_token);
     user_detail_qs.append("fields", "name,email");
     user_detail_url.query(user_detail_qs);
-    fostlib::json me_conf{};
-    if (config.has_key(fostlib::jcursor{"facebook-mock", "me"})) {
-        me_conf = config[fostlib::jcursor{"facebook-mock", "me"}];
-    }
 
     fostlib::json user_detail;
-    if (me_conf.isnull()) {
-        fostlib::mime::mime_headers headers;
-        user_detail = fostlib::ua::get_json(user_detail_url, headers);
-    } else {
-        auto const user_detail_resp = get_or_mock(ua, user_detail_url, me_conf);
-        user_detail = fostlib::json::parse(fostlib::coerce<fostlib::string>(
-                fostlib::coerce<fostlib::utf8_string>(
-                        user_detail_resp->body()->data())));
-    }
-    fostlib::log::error(c_odin)("Response", user_detail);
-    if (user_detail.has_key("error")) {
-        fostlib::log::error(c_odin)("Error", "get-user-detail")(
-                "URL", user_detail_url)("status", 200)(
+    try {
+        user_detail = fostlib::ua::get_json(
+                user_detail_url, fostlib::mime::mime_headers{});
+    } catch (fostlib::ua::http_error &e) {
+        fostlib::log::error(c_odin)("Error", "ids_for_business")(
+                "URL", user_detail_url)("status", e.data()["status-code"])(
                 "body", user_detail);
-        // TODO: Should return 422
         throw fostlib::exceptions::not_implemented(
                 __PRETTY_FUNCTION__,
                 "Cannot retrieve /me?field=name,email from Facebook");
     }
+
+    fostlib::log::error(c_odin)("Response", user_detail);
     if (user_detail.has_key("name")) {
         fostlib::insert(fb_user, "name", user_detail["name"]);
     }

Cpp/odin/google.cpp

@@ -1,5 +1,5 @@
 /**
-    Copyright 2018-2019 Red Anchor Trading Co. Ltd.
+    Copyright 2018-2020 Red Anchor Trading Co. Ltd.
 
     Distributed under the Boost Software License, Version 1.0.
     See <http://www.boost.org/LICENSE_1_0.txt>
@@ -9,11 +9,11 @@
 #include <odin/fg/native.hpp>
 #include <odin/odin.hpp>
 
-#include <fost/http>
-#include <fost/log>
 #include <fostgres/sql.hpp>
-
+#include <fost/http>
 #include <fost/insert>
+#include <fost/log>
+#include <fost/ua/exceptions.hpp>
 
 
 fostlib::json odin::google::get_user_detail(f5::u8view user_token) {
@@ -22,9 +22,17 @@ fostlib::json odin::google::get_user_detail(f5::u8view user_token) {
     fostlib::url::filepath_string api{"/oauth2/v3/tokeninfo"};
     fostlib::url gg_url(base_url, api);
     gg_url.query().append("id_token", user_token);
-    fostlib::http::user_agent ua(gg_url);
-    auto response = ua.get(gg_url);
-    fostlib::json body = fostlib::json::parse(response->body()->data());
+    fostlib::json body;
+    try {
+        body = fostlib::ua::get_json(gg_url, fostlib::mime::mime_headers{});
+        // Example body :
+        // https://developers.google.com/identity/sign-in/android/backend-auth
+    } catch (fostlib::ua::http_error &e) {
+        fostlib::log::error(c_odin)("Error", "get_user_detail")("URL", gg_url)(
+                "status", e.data()["status-code"])("body", body);
+        throw fostlib::exceptions::not_implemented(
+                __PRETTY_FUNCTION__, "Cannot retrieve user detail from google");
+    }
     auto aud = fostlib::coerce<fostlib::string>(body["aud"]);
     auto gg_aud = c_google_aud.value()["Client_ID"];
     for (const auto a : gg_aud) {

tests/CMakeLists.txt

@@ -316,7 +316,6 @@ if(TARGET stress OR TARGET pgtest)
                 ${CMAKE_CURRENT_SOURCE_DIR}/../Schema/bootstrap.sql
                 ${CMAKE_CURRENT_SOURCE_DIR}/../Configuration/odin-views.json
                 ${CMAKE_CURRENT_SOURCE_DIR}/login-google-test.json
-                ${CMAKE_CURRENT_SOURCE_DIR}/facebook-test.json
                 ${CMAKE_CURRENT_SOURCE_DIR}/registration-self.fg
             MAIN_DEPENDENCY registration-self.fg
             DEPENDS
@@ -351,7 +350,6 @@ if(TARGET stress OR TARGET pgtest)
                 ../Schema/opts/google/006-not-allow-merge-registered-to-guest.blue.sql
                 ../Configuration/odin-views.json
                 login-google-test.json
-                facebook-test.json
                 registration-self.fg
         )
 
@@ -505,7 +503,6 @@ if(TARGET stress OR TARGET pgtest)
                 ${CMAKE_CURRENT_SOURCE_DIR}/../Configuration/odin-views.json
                 ${CMAKE_CURRENT_SOURCE_DIR}/../Configuration/odin-webserver.json
                 ${CMAKE_CURRENT_SOURCE_DIR}/login-google-test.json
-                ${CMAKE_CURRENT_SOURCE_DIR}/facebook-test.json
                 ${CMAKE_CURRENT_SOURCE_DIR}/login-google.fg
             MAIN_DEPENDENCY login-google.fg
             DEPENDS
@@ -541,7 +538,6 @@ if(TARGET stress OR TARGET pgtest)
                 ../Schema/opts/installation-id/004-merge-account-function.blue.sql
                 ../Configuration/odin-views.json
                 login-google-test.json
-                facebook-test.json
                 login-google.fg
         )
 

tests/app-login-facebook.fg

@@ -48,6 +48,9 @@ setting odin "Facebook" {
     "main": "111111111111111",
     "allowed": ["111111111111111", "222222222222222"]
 }
+setting odin "Google" {
+    "Client_ID": ["111111111111111", "222222222222222"]
+}
 
 ## ## Register app
 sql.insert odin.identity {"id": "open-app"}
@@ -105,7 +108,7 @@ setting webserver views/odin/test/facebook/login {
 
 
 # case ids-for-biz-failed
-expect GET https://graph.facebook.com/me/ids_for_business?access_token=user_1 200 {
+expect GET https://graph.facebook.com/me/ids_for_business?access_token=user_1 400 {
     "error": {
         "message": "Malformed access token ACCESS_TOKEN",
         "type": "OAuthException",
@@ -165,7 +168,7 @@ expect GET https://graph.facebook.com/me/ids_for_business?access_token=user_1 20
         }
     ]
 }
-expect GET https://graph.facebook.com/me?access_token=user_1&fields=name,email 200 {
+expect GET https://graph.facebook.com/me?access_token=user_1&fields=name,email 400 {
     "error": {
         "message": "Malformed access token ACCESS_TOKEN",
         "type": "OAuthException",
@@ -486,14 +489,13 @@ expect GET https://graph.facebook.com/me?access_token=duplicate-email-with-googl
     "email": "[email protected]"
 }
 
-setting webserver views/odin/test/sec/google/login/ok {
+setting webserver views/odin/test/sec/google/login {
     "view": "odin.app.secure",
     "configuration": {
         "secure": {
             "view": "odin.app.google.login",
             "configuration": {
-                "expires": {"hours": 72},
-                "google-mock": "OK"
+                "expires": {"hours": 72}
             }
         },
         "unsecure": "fost.response.403"
@@ -502,7 +504,13 @@ setting webserver views/odin/test/sec/google/login/ok {
 
 set-path testserver.headers ["Authorization"] (cat "Bearer " (odin.jwt.mint {"sub": "app_user_open_app", "iss": "http://odin.felspar.com/app/open-app"} <JWT_SECRET>open-app))
 set-path testserver.headers ["Authorization"] (cat "Bearer " (POST test/sec/installation / {"installation_id": "g-duplicate-email-with-google"} 201))
-POST odin/test/sec/google/login/ok / {"access_token": "duplicate-email-with-google"} 200
+expect GET https://www.googleapis.com/oauth2/v3/tokeninfo?id_token=duplicate-email-with-google 200 {
+    "aud": "111111111111111",	
+    "sub": "duplicate-email-with-google",
+    "name": "Test User",
+    "email": "[email protected]"    
+}
+POST odin/test/sec/google/login / {"access_token": "duplicate-email-with-google"} 200
 
 GET odin/test/facebook/validate_login /count-users 200 {"count": 6}
 GET odin/test/facebook/validate_login /count-facebook-users 200 {"count": 4}