kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change bearer_auth to header("Authorization"

This commit is contained in:
bitfl0wer 2023-08-17 22:26:07 +02:00
parent 4424e3f07a
commit 0396e318d3
12 changed files with 70 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/channels/channels.rs
View File

@ -20,7 +20,7 @@ impl Channel {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.get(format!("{}/channels/{}", url, channel_id)) .get(format!("{}/channels/{}", url, channel_id))
.bearer_auth(user.token()), .header("Authorization", user.token()),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };
chorus_request.deserialize_response::<Channel>(user).await chorus_request.deserialize_response::<Channel>(user).await
@ -41,7 +41,7 @@ impl Channel {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
self.id self.id
)) ))
.bearer_auth(user.token()), .header("Authorization", user.token()),
limit_type: LimitType::Channel(self.id), limit_type: LimitType::Channel(self.id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -74,7 +74,7 @@ impl Channel {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
channel_id channel_id
)) ))
.bearer_auth(user.token()) .header("Authorization", user.token())
.body(to_string(&modify_data).unwrap()), .body(to_string(&modify_data).unwrap()),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };
@ -102,7 +102,7 @@ impl Channel {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
channel_id channel_id
)) ))
.bearer_auth(user.token()) .header("Authorization", user.token())
.query(&range), .query(&range),
limit_type: Default::default(), limit_type: Default::default(),
}; };
@ -129,7 +129,7 @@ impl Channel {
self.id, self.id,
recipient_id recipient_id
)) ))
.bearer_auth(user.token()); .header("Authorization", user.token());
if let Some(schema) = add_channel_recipient_schema { if let Some(schema) = add_channel_recipient_schema {
request = request.body(to_string(&schema).unwrap()); request = request.body(to_string(&schema).unwrap());
} }
@ -157,7 +157,7 @@ impl Channel {
self.id, self.id,
recipient_id recipient_id
)) ))
.bearer_auth(user.token()); .header("Authorization", user.token());
ChorusRequest { ChorusRequest {
request, request,
limit_type: LimitType::Channel(self.id), limit_type: LimitType::Channel(self.id),

4
src/api/channels/messages.rs
View File

@ -26,7 +26,7 @@ impl Message {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.post(format!("{}/channels/{}/messages", url_api, channel_id)) .post(format!("{}/channels/{}/messages", url_api, channel_id))
.bearer_auth(user.token()) .header("Authorization", user.token())
.body(to_string(&message).unwrap()), .body(to_string(&message).unwrap()),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };
@ -62,7 +62,7 @@ impl Message {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.post(format!("{}/channels/{}/messages", url_api, channel_id)) .post(format!("{}/channels/{}/messages", url_api, channel_id))
.bearer_auth(user.token()) .header("Authorization", user.token())
.multipart(form), .multipart(form),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };

9
src/api/channels/permissions.rs
View File

@ -40,7 +40,10 @@ impl types::Channel {
} }
}; };
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().put(url).bearer_auth(user.token()).body(body), request: Client::new()
.put(url)
.header("Authorization", user.token())
.body(body),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -66,7 +69,9 @@ impl types::Channel {
overwrite_id overwrite_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Channel(channel_id), limit_type: LimitType::Channel(channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await

20
src/api/channels/reactions.rs
View File

@ -29,7 +29,9 @@ impl ReactionMeta {
self.message_id self.message_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -51,7 +53,7 @@ impl ReactionMeta {
emoji emoji
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(user.token()), request: Client::new().get(url).header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request chorus_request
@ -77,7 +79,9 @@ impl ReactionMeta {
emoji emoji
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -104,7 +108,7 @@ impl ReactionMeta {
emoji emoji
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().put(url).bearer_auth(user.token()), request: Client::new().put(url).header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -126,7 +130,9 @@ impl ReactionMeta {
emoji emoji
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -156,7 +162,9 @@ impl ReactionMeta {
user_id user_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Channel(self.channel_id), limit_type: LimitType::Channel(self.channel_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await

10
src/api/guilds/guilds.rs
View File

@ -23,7 +23,7 @@ impl Guild {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.post(url.clone()) .post(url.clone())
.bearer_auth(user.token.clone()) .header("Authorization", user.token.clone())
.body(to_string(&guild_create_schema).unwrap()), .body(to_string(&guild_create_schema).unwrap()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
@ -58,7 +58,7 @@ impl Guild {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.post(url.clone()) .post(url.clone())
.bearer_auth(user.token.clone()), .header("Authorization", user.token.clone()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -95,7 +95,7 @@ impl Guild {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
self.id self.id
)) ))
.bearer_auth(user.token()), .header("Authorization", user.token()),
limit_type: LimitType::Channel(self.id), limit_type: LimitType::Channel(self.id),
}; };
let result = chorus_request.send_request(user).await?; let result = chorus_request.send_request(user).await?;
@ -129,7 +129,7 @@ impl Guild {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
guild_id guild_id
)) ))
.bearer_auth(user.token()), .header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
let response = chorus_request.deserialize_response::<Guild>(user).await?; let response = chorus_request.deserialize_response::<Guild>(user).await?;
@ -156,7 +156,7 @@ impl Channel {
user.belongs_to.borrow().urls.api, user.belongs_to.borrow().urls.api,
guild_id guild_id
)) ))
.bearer_auth(user.token()) .header("Authorization", user.token())
.body(to_string(&schema).unwrap()), .body(to_string(&schema).unwrap()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };

8
src/api/guilds/member.rs
View File

@ -25,7 +25,7 @@ impl types::GuildMember {
member_id member_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(user.token()), request: Client::new().get(url).header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
chorus_request chorus_request
@ -53,7 +53,7 @@ impl types::GuildMember {
role_id role_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().put(url).bearer_auth(user.token()), request: Client::new().put(url).header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await
@ -79,7 +79,9 @@ impl types::GuildMember {
role_id role_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(user.token()), request: Client::new()
.delete(url)
.header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
chorus_request.handle_request_as_result(user).await chorus_request.handle_request_as_result(user).await

13
src/api/guilds/roles.rs
View File

@ -24,7 +24,7 @@ impl types::RoleObject {
guild_id guild_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(user.token()), request: Client::new().get(url).header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
let roles = chorus_request let roles = chorus_request
@ -50,7 +50,7 @@ impl types::RoleObject {
role_id role_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(user.token()), request: Client::new().get(url).header("Authorization", user.token()),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
chorus_request chorus_request
@ -80,7 +80,10 @@ impl types::RoleObject {
} }
})?; })?;
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().post(url).bearer_auth(user.token()).body(body), request: Client::new()
.post(url)
.header("Authorization", user.token())
.body(body),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
chorus_request chorus_request
@ -111,7 +114,7 @@ impl types::RoleObject {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.patch(url) .patch(url)
.bearer_auth(user.token()) .header("Authorization", user.token())
.body(body), .body(body),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };
@ -146,7 +149,7 @@ impl types::RoleObject {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.patch(url) .patch(url)
.bearer_auth(user.token()) .header("Authorization", user.token())
.body(body), .body(body),
limit_type: LimitType::Guild(guild_id), limit_type: LimitType::Guild(guild_id),
}; };

6
src/api/invites/mod.rs
View File

@ -25,7 +25,7 @@ impl UserMeta {
self.belongs_to.borrow().urls.api, self.belongs_to.borrow().urls.api,
invite_code invite_code
)) ))
.bearer_auth(self.token()), .header("Authorization", self.token()),
limit_type: super::LimitType::Global, limit_type: super::LimitType::Global,
}; };
if session_id.is_some() { if session_id.is_some() {
@ -50,7 +50,7 @@ impl UserMeta {
self.belongs_to.borrow().urls.api self.belongs_to.borrow().urls.api
)) ))
.body(to_string(&code).unwrap()) .body(to_string(&code).unwrap())
.bearer_auth(self.token()), .header("Authorization", self.token()),
limit_type: super::LimitType::Global, limit_type: super::LimitType::Global,
} }
.deserialize_response::<Invite>(self) .deserialize_response::<Invite>(self)
@ -76,7 +76,7 @@ impl UserMeta {
self.belongs_to.borrow().urls.api, self.belongs_to.borrow().urls.api,
channel_id channel_id
)) ))
.bearer_auth(self.token()) .header("Authorization", self.token())
.body(to_string(&create_channel_invite_schema).unwrap()), .body(to_string(&create_channel_invite_schema).unwrap()),
limit_type: super::LimitType::Channel(channel_id), limit_type: super::LimitType::Channel(channel_id),
} }

2
src/api/users/channels.rs
View File

@ -25,7 +25,7 @@ impl UserMeta {
ChorusRequest { ChorusRequest {
request: Client::new() request: Client::new()
.post(url) .post(url)
.bearer_auth(self.token()) .header("Authorization", self.token())
.body(to_string(&create_private_channel_schema).unwrap()), .body(to_string(&create_private_channel_schema).unwrap()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
} }

2
src/api/users/guilds.rs
View File

@ -22,7 +22,7 @@ impl UserMeta {
self.belongs_to.borrow().urls.api, self.belongs_to.borrow().urls.api,
guild_id guild_id
)) ))
.bearer_auth(self.token()) .header("Authorization", self.token())
.body(to_string(&lurking).unwrap()), .body(to_string(&lurking).unwrap()),
limit_type: crate::api::LimitType::Guild(*guild_id), limit_type: crate::api::LimitType::Guild(*guild_id),
} }

19
src/api/users/relationships.rs
View File

@ -26,7 +26,7 @@ impl UserMeta {
user_id user_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(self.token()), request: Client::new().get(url).header("Authorization", self.token()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request chorus_request
@ -44,7 +44,7 @@ impl UserMeta {
self.belongs_to.borrow().urls.api self.belongs_to.borrow().urls.api
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().get(url).bearer_auth(self.token()), request: Client::new().get(url).header("Authorization", self.token()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request chorus_request
@ -66,7 +66,10 @@ impl UserMeta {
); );
let body = to_string(&schema).unwrap(); let body = to_string(&schema).unwrap();
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().post(url).bearer_auth(self.token()).body(body), request: Client::new()
.post(url)
.header("Authorization", self.token())
.body(body),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request.handle_request_as_result(self).await chorus_request.handle_request_as_result(self).await
@ -86,7 +89,7 @@ impl UserMeta {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.delete(format!("{}/users/@me/relationships/{}", api_url, user_id)) .delete(format!("{}/users/@me/relationships/{}", api_url, user_id))
.bearer_auth(self.token()), .header("Authorization", self.token()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request.handle_request_as_result(self).await chorus_request.handle_request_as_result(self).await
@ -100,7 +103,7 @@ impl UserMeta {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.put(format!("{}/users/@me/relationships/{}", api_url, user_id)) .put(format!("{}/users/@me/relationships/{}", api_url, user_id))
.bearer_auth(self.token()) .header("Authorization", self.token())
.body(to_string(&body).unwrap()), .body(to_string(&body).unwrap()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
@ -115,7 +118,7 @@ impl UserMeta {
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new() request: Client::new()
.put(format!("{}/users/@me/relationships/{}", api_url, user_id)) .put(format!("{}/users/@me/relationships/{}", api_url, user_id))
.bearer_auth(self.token()) .header("Authorization", self.token())
.body(to_string(&body).unwrap()), .body(to_string(&body).unwrap()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
@ -136,7 +139,9 @@ impl UserMeta {
user_id user_id
); );
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request: Client::new().delete(url).bearer_auth(self.token()), request: Client::new()
.delete(url)
.header("Authorization", self.token()),
limit_type: LimitType::Global, limit_type: LimitType::Global,
}; };
chorus_request.handle_request_as_result(self).await chorus_request.handle_request_as_result(self).await

10
src/api/users/users.rs
View File

@ -50,7 +50,7 @@ impl UserMeta {
let request = Client::new() let request = Client::new()
.patch(format!("{}/users/@me", self.belongs_to.borrow().urls.api)) .patch(format!("{}/users/@me", self.belongs_to.borrow().urls.api))
.body(to_string(&modify_schema).unwrap()) .body(to_string(&modify_schema).unwrap())
.bearer_auth(self.token()); .header("Authorization", self.token());
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request, request,
limit_type: LimitType::default(), limit_type: LimitType::default(),
@ -68,7 +68,7 @@ impl UserMeta {
"{}/users/@me/delete", "{}/users/@me/delete",
self.belongs_to.borrow().urls.api self.belongs_to.borrow().urls.api
)) ))
.bearer_auth(self.token()); .header("Authorization", self.token());
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request, request,
limit_type: LimitType::default(), limit_type: LimitType::default(),
@ -90,7 +90,9 @@ impl User {
} else { } else {
format!("{}/users/{}", url_api, id.unwrap()) format!("{}/users/{}", url_api, id.unwrap())
}; };
let request = reqwest::Client::new().get(url).bearer_auth(user.token()); let request = reqwest::Client::new()
.get(url)
.header("Authorization", user.token());
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {
request, request,
limit_type: LimitType::Global, limit_type: LimitType::Global,
@ -115,7 +117,7 @@ impl User {
) -> ChorusResult<UserSettings> { ) -> ChorusResult<UserSettings> {
let request: reqwest::RequestBuilder = Client::new() let request: reqwest::RequestBuilder = Client::new()
.get(format!("{}/users/@me/settings", url_api)) .get(format!("{}/users/@me/settings", url_api))
.bearer_auth(token); .header("Authorization", token);
let mut user = let mut user =
UserMeta::shell(Rc::new(RefCell::new(instance.clone())), token.clone()).await; UserMeta::shell(Rc::new(RefCell::new(instance.clone())), token.clone()).await;
let chorus_request = ChorusRequest { let chorus_request = ChorusRequest {