From b051bfcc5bebdf022efeeb5cae0c850237f5496b Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Thu, 17 Mar 2016 03:45:47 +0000 Subject: [PATCH] Disable Facebook authentication for now. It got broken when moving to the authentication subdirectory. --- .travis.yml | 2 +- Cargo.lock | 3 --- Cargo.toml | 2 +- src/authentication/mod.rs | 9 +++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e5bb78..1db5214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: script: - cargo build - cargo build --features with-tremor - - cargo build --features facebook + #- cargo build --features facebook # Building without syntex only works on nightly - if [[ $(rustc --version) == *"nightly"* ]]; then cargo build --no-default-features; diff --git a/Cargo.lock b/Cargo.lock index d6b1851..0149b6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -102,8 +102,6 @@ name = "cookie" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -169,7 +167,6 @@ dependencies = [ "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index b499f32..e71127b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,6 @@ json_macros = { git = "https://github.com/plietar/json_macros" } discovery = ["dns-sd"] with-syntex = ["syntex", "protobuf_macros/with-syntex", "json_macros/with-syntex"] with-tremor = ["tremor"] -facebook = ["hyper/ssl", "openssl"] +#facebook = ["hyper/ssl", "openssl"] static-appkey = [] default = ["with-syntex"] diff --git a/src/authentication/mod.rs b/src/authentication/mod.rs index 575fd86..e4ace3f 100644 --- a/src/authentication/mod.rs +++ b/src/authentication/mod.rs @@ -172,10 +172,11 @@ pub fn discovery_login(device_name: &str, device_id: &str) -> Result Result { Err(())