Skip to content

Commit 3f08371

Browse files
committed
Update deprecated library
1 parent 5ba57f3 commit 3f08371

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spotify_api/src/api_model/credentials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub mod Code {
1414
use std::net::TcpListener;
1515
use utils::throw_url;
1616
use reqwest;
17-
use base64;
17+
use base64::{Engine as _, engine::general_purpose};
1818
use serde::Deserialize;
1919
use std::collections::HashMap;
2020

@@ -113,7 +113,7 @@ pub mod Code {
113113

114114
fn make_auth_header(&self) -> String {
115115
let original = format!{"{}:{}", self.client_id, self.secret_id};
116-
base64::encode(original)
116+
general_purpose::STANDARD_NO_PAD.encode(original)
117117
}
118118

119119
pub async fn perform_auth(&mut self)

twitter_api/src/api_model/oauth1_header.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use std::str;
55
use rand::{thread_rng, Rng};
66
use rand::distributions::Alphanumeric;
77
use url::Url;
8+
use base64::{Engine as _, engine::general_purpose};
89

910
pub struct OAuthHeader {
1011
pub signature: String,
@@ -83,7 +84,7 @@ impl OAuthHeader {
8384
let base = format!{"{}&{}&{}", request_method, p_encode(&(Self::get_base_url(url))), p_encode(&param_string)};
8485
let hash = hmacsha1::hmac_sha1(crypt_key.as_bytes(), base.as_bytes());
8586

86-
base64::encode(&hash).to_string()
87+
general_purpose::STANDARD_NO_PAD.encode(&hash)
8788
}
8889

8990
fn get_base_url(url: &Url) -> String {
@@ -102,7 +103,7 @@ impl OAuthHeader {
102103
.map(char::from)
103104
.collect();
104105

105-
let b64_encoded_str: String = base64::encode(rand_str);
106+
let b64_encoded_str = general_purpose::STANDARD_NO_PAD.encode(rand_str);
106107
let res = b64_encoded_str.replace(&['+', '/', '='], "");
107108

108109
res

0 commit comments

Comments
 (0)