From 6b03b139b79f822888846e81d7f72cc9f96b4075 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 24 Jun 2025 16:13:06 +0000 Subject: [PATCH] client: Move the tokens into the auth struct Signed-off-by: Michael Tremer --- src/pakfire/client.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pakfire/client.c b/src/pakfire/client.c index 88475a40..966e12bb 100644 --- a/src/pakfire/client.c +++ b/src/pakfire/client.c @@ -58,14 +58,14 @@ struct pakfire_client { // Authentication struct pakfire_client_auth { + // Tokens + char access_token[1024]; + char refresh_token[1024]; + // Timer sd_event_source* timer; } auth; - // Tokens - char access_token[1024]; - char refresh_token[1024]; - // Callbacks struct pakfire_client_auth_callback { pakfire_client_auth_callback callback; @@ -117,7 +117,7 @@ static int pakfire_client_auth_refresh(struct pakfire_client* self) { int r; // Cannot do this if we don't have a refresh token - if (!*self->refresh_token) + if (!*self->auth.refresh_token) return -ENOTSUP; // Create a new transfer @@ -131,7 +131,7 @@ static int pakfire_client_auth_refresh(struct pakfire_client* self) { goto ERROR; // Add the refresh token - r = pakfire_json_add_string(request, "refresh_token", self->refresh_token); + r = pakfire_json_add_string(request, "refresh_token", self->auth.refresh_token); if (r < 0) goto ERROR; @@ -148,7 +148,7 @@ static int pakfire_client_auth_refresh(struct pakfire_client* self) { } // Store the new access token - r = pakfire_string_set(self->access_token, access_token); + r = pakfire_string_set(self->auth.access_token, access_token); if (r < 0) goto ERROR; @@ -175,11 +175,11 @@ static int pakfire_client_xfer_auth(struct pakfire_client* self, struct pakfire_ int r; // Fail if not authenticated - if (!*self->access_token) + if (!*self->auth.access_token) return -ENOTSUP; // Set the access token - r = pakfire_xfer_add_header(xfer, "Authorization: Bearer %s", self->access_token); + r = pakfire_xfer_add_header(xfer, "Authorization: Bearer %s", self->auth.access_token); if (r < 0) return r; @@ -318,17 +318,17 @@ static int pakfire_client_auth_successful( } // Store the access token - r = pakfire_string_set(self->access_token, access_token); + r = pakfire_string_set(self->auth.access_token, access_token); if (r < 0) return r; // Store the refresh token - r = pakfire_string_set(self->refresh_token, refresh_token); + r = pakfire_string_set(self->auth.refresh_token, refresh_token); if (r < 0) return r; // Extract the expiry time of the access token - expires_at = r = pakfire_jwt_expires_at(self->access_token); + expires_at = r = pakfire_jwt_expires_at(self->auth.access_token); if (expires_at < 0) { ERROR(self->ctx, "Failed to fetch the expiry time of the access token: %s\n", strerror(-r)); return r; -- 2.47.2