Skip to content
37 changes: 37 additions & 0 deletions src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,31 @@ impl DeviceCodes {
}
}

/// Exchange a code for a user access token
///
/// see: https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps
pub async fn get_access_token(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this is a free function as opposed to a impl method?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @XAMPPRocky, TBH I didn't see any value in adding an additional structure as it was done for the device flow. In that case, it's useful as the params are received from another REST API. But if you see any case in which I'm not considering I can change this to be a method

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this look in octokit.js? We try to follow similar conventions when possible.

Copy link
Author

@mattiapitossi mattiapitossi Jun 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it seems that in octokit is defined as a struct:

export type ExchangeWebFlowCodeGitHubAppOptions = {
  clientType: "github-app";
  clientId: string;
  clientSecret: string;
  code: string;
  redirectUrl?: string;
  request?: RequestInterface;
};

https://github.com/octokit/oauth-methods.js/blob/main/src/exchange-web-flow-code.ts

Also the redirectUri seems to be opt.

I'll update the MR and replicate this behavior

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I meant how does it look to get the access token? Like what does the actual method call look like if you used octokit?

Copy link
Author

@mattiapitossi mattiapitossi Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two options (GitHub App is the recommended one):

export async function exchangeWebFlowCode(
  options: ExchangeWebFlowCodeOAuthAppOptions,
): Promise<ExchangeWebFlowCodeOAuthAppResponse>;

export async function exchangeWebFlowCode(
  options: ExchangeWebFlowCodeGitHubAppOptions,
): Promise<ExchangeWebFlowCodeGitHubAppResponse>;

export async function exchangeWebFlowCode(
  options:
    | ExchangeWebFlowCodeOAuthAppOptions
    | ExchangeWebFlowCodeGitHubAppOptions,
): Promise<any> {..}

https://github.com/octokit/oauth-methods.js/blob/main/src/exchange-web-flow-code.ts

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My two cents - the new method should follow the pattern of other post methods and return a Builder to set optional parameters, e.g. redirect_uri. This allows the API to evolve forward without breaking existing usages and is pleasant to use with optional parameters. https://docs.rs/octocrab/latest/octocrab/repos/releases/struct.CreateReleaseBuilder.html, for example

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @XAMPPRocky and @kyle-leonhard, I've updated the changes to use a builder instead of the free function and made the redirect_uri optional.

Please could you take a look whenever you have some time? Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great to me! @XAMPPRocky ptal

crab: &crate::Octocrab,
client_id: &SecretString,
code: String,
client_secret: &SecretString,
redirect_uri: String,
) -> Result<OAuth> {
let data: OAuth = crab
.post(
"/login/oauth/access_token",
Some(&ExchangeCodeForTokenParams {
client_id: client_id.expose_secret(),
client_secret: client_secret.expose_secret(),
code: &code,
redirect_uri: &redirect_uri,
}),
)
.await?;

Ok(data)
}

/// See https://docs.github.com/en/developers/apps/building-oauth-apps/authorizing-oauth-apps#input-parameters
#[derive(Serialize)]
struct DeviceFlow<'a> {
Expand Down Expand Up @@ -301,3 +326,15 @@ struct PollForDevice<'a> {
/// Required. The grant type must be urn:ietf:params:oauth:grant-type:device_code.
grant_type: &'static str,
}

#[derive(Serialize)]
struct ExchangeCodeForTokenParams<'a> {
/// Required. The client ID for your GitHub App.
client_id: &'a str,
/// Required. The client secret for your GitHub App.
client_secret: &'a str,
/// Required. The code received from the POST <https://github.com/login/oauth/authorize?client_id=CLIENT_ID> request.
code: &'a str,
// Strongly recommended. The URL in your application where users will be sent after authorization.
redirect_uri: &'a str,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think redirect_uri is only strongly recommended when directing the user to https://github.com/login/oauth/access_token to login. When calling https://github.com/login/oauth/access_token, redirect_uri is unused afaict and the documentation doesn't mention strongly recommended.

I suggest making this parameter optional.

https://docs.github.com/en/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app#generating-a-user-access-token-when-a-user-installs-your-app

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review @kyle-leonhard. I also noticed that in octokit is defined as optional (#780 (comment))

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
78 changes: 78 additions & 0 deletions tests/auth_oauth_flow_test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
mod mock_error;

use mock_error::setup_error_handler;
use octocrab::{auth, Octocrab};
use secrecy::SecretString;
use serde_json::json;
use wiremock::{
matchers::{method, path},
Mock, MockServer, ResponseTemplate,
};

async fn setup_post_api(template: ResponseTemplate) -> MockServer {
let mock_server = MockServer::start().await;

Mock::given(method("POST"))
.and(path(format!("/login/oauth/access_token")))
.respond_with(template.clone())
.mount(&mock_server)
.await;

setup_error_handler(
&mock_server,
&format!("POST on /login/oauth/access_token was not received"),
)
.await;
mock_server
}

fn setup_octocrab(uri: &str) -> Octocrab {
Octocrab::builder().base_uri(uri).unwrap().build().unwrap()
}

const CLIENT_SECRET: &str = "some_secret";
const CLIENT_ID: &str = "some_client_id";
const CODE: &str = "a_code";
const REDIRECT_URI: &str = "https://yourapp/auth/callback-example";

#[tokio::test]
async fn should_return_access_token() {
let expected_response = json!({
"access_token":"gho_16C7e42F292c6912E7710c838347Ae178B4a",
"scope":"repo,gist",
"token_type":"bearer"
}
);
let template = ResponseTemplate::new(201).set_body_json(expected_response);
let mock_server = setup_post_api(template).await;
let client = setup_octocrab(&mock_server.uri());

let result = auth::get_access_token(
&client,
&SecretString::from(CLIENT_ID),
CODE.to_owned(),
&SecretString::from(CLIENT_SECRET),
REDIRECT_URI.to_owned(),
)
.await;

assert!(result.is_ok());
}

#[tokio::test]
async fn should_fail_when_receving_a_server_error() {
let template = ResponseTemplate::new(500);
let mock_server = setup_post_api(template).await;
let client = setup_octocrab(&mock_server.uri());

let result = auth::get_access_token(
&client,
&SecretString::from(CLIENT_ID),
CODE.to_owned(),
&SecretString::from(CLIENT_SECRET),
REDIRECT_URI.to_owned(),
)
.await;

assert!(result.is_err());
}