OMGeeky/yup-oauth2
1
0
Fork 0
mirror of https://github.com/OMGeeky/yup-oauth2.git synced 2026-01-04 18:30:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(helper): Parse app secrets into right type

Browse Source
This commit is contained in:
Lewin Bormann
2016-08-31 20:46:10 +02:00
parent c4231e9499
commit a4532f27b4
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/helper.rs
View File

@@ -11,7 +11,7 @@ use serde_json;
use std::io;
use std::fs;
use types::ApplicationSecret;
use types::{ConsoleApplicationSecret, ApplicationSecret};
pub fn read_application_secret(file: &String) -> io::Result<ApplicationSecret> {
use std::io::Read;
@@ -24,11 +24,21 @@ pub fn read_application_secret(file: &String) -> io::Result<ApplicationSecret> {
}
pub fn parse_application_secret(secret: &String) -> io::Result<ApplicationSecret> {
match serde_json::from_str(secret) {
let result: serde_json::Result<ConsoleApplicationSecret> = serde_json::from_str(secret);
match result {
Err(e) => {
Err(io::Error::new(io::ErrorKind::InvalidData,
format!("Bad application secret: {}", e)))
}
Ok(decoded) => Ok(decoded),
Ok(decoded) => {
if decoded.web.is_some() {
Ok(decoded.web.unwrap())
} else if decoded.installed.is_some() {
Ok(decoded.installed.unwrap())
} else {
Err(io::Error::new(io::ErrorKind::InvalidData,
"Unknown application secret format"))
}
}
}
}