Skip to content

Commit

Permalink
feat: remove tuba-id
Browse files Browse the repository at this point in the history
  • Loading branch information
GeopJr committed Jan 11, 2024
1 parent 0df0272 commit 2be79e9
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions src/Services/Accounts/SecretAccountStore.vala
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,6 @@ public class Tuba.SecretAccountStore : AccountStore {
var builder = new Json.Builder ();
builder.begin_object ();

builder.set_member_name ("tuba-id");
builder.add_string_value (Build.DOMAIN);

builder.set_member_name ("id");
builder.add_string_value (account.id);

Expand Down Expand Up @@ -245,15 +242,12 @@ public class Tuba.SecretAccountStore : AccountStore {
// HACK: Partial makeshift secret validation
// see #742 #701 #114
if (
(!root_obj.has_member ("tuba-id") || root_obj.get_string_member ("tuba-id") != Build.DOMAIN)
&& (
!root_obj.has_member ("backend")
|| !root_obj.has_member ("acct")
|| !root_obj.has_member ("id")
|| !root_obj.has_member ("client-secret")
|| !root_obj.has_member ("client-id")
|| !root_obj.has_member ("access-token")
)
!root_obj.has_member ("backend")
|| !root_obj.has_member ("acct")
|| !root_obj.has_member ("id")
|| !root_obj.has_member ("client-secret")
|| !root_obj.has_member ("client-id")
|| !root_obj.has_member ("access-token")
) return null;

// TODO: remove uuid fallback
Expand Down

0 comments on commit 2be79e9

Please sign in to comment.