feat(oauth): implement authentication flow with login and logout #442

amitksingh1490 · 2025-03-04T04:28:28Z

No description provided.

…t commands

…out functionality

…d add tracing libraries

….lock

…-tls feature; remove unused packages from Cargo.lock

…_token function

amitksingh1490 · 2025-03-05T12:26:20Z

crates/forge_domain/src/auth_service.rs

@@ -0,0 +1,19 @@
+use anyhow::Result;


move to app

amitksingh1490 · 2025-03-05T13:08:10Z

crates/forge_api/src/api.rs

@@ -63,6 +67,18 @@ impl<F: App + Infrastructure> API for ForgeAPI<F> {
        self.app.conversation_service().create(workflow).await
    }

+    async fn login(&self) -> anyhow::Result<()> {


Suggested change

async fn login(&self) -> anyhow::Result<()> {

async fn authenticate(&self) -> anyhow::Result<()> {

amitksingh1490 · 2025-03-05T13:09:52Z

crates/forge_api/src/lib.rs

+    fn logout(&self) -> anyhow::Result<bool>;
+
+    /// Checks if the user is currently authenticated
+    fn is_authenticated(&self) -> bool;


amitksingh1490 · 2025-03-05T13:11:22Z

crates/forge_oauth/src/oauth.rs

+        let (auth_url, pkce_verifier, csrf_token, _nonce) = self.generate_auth_url();
+
+        // 2. Open browser for user authentication
+        println!("Opening browser for authentication...");


remove println

amitksingh1490 · 2025-03-05T13:12:08Z

crates/forge_oauth/src/oauth.rs

+    }
+
+    /// Complete the OAuth2 flow and return the token and user info
+    pub async fn complete_auth_flow(&self) -> Result<()> {


Suggested change

pub async fn complete_auth_flow(&self) -> Result<()> {

pub async fn complete_auth_flow(&self) -> Result<URL> {

This needs to be split this flow in two parts one to create the URL and other to actually login. api.rs needs to be changed

amitksingh1490 · 2025-03-05T13:14:56Z

crates/forge_oauth/src/oauth.rs

+        // 7. create a new key
+        let client = reqwest::Client::new();
+        let key: Key = client
+            .put("https://antinomy.ai/api/v1/key")


url in new should come as argument

amitksingh1490 · 2025-03-05T13:15:42Z

crates/forge_oauth/src/oauth.rs

+}
+
+impl Default for ClerkConfig {
+    fn default() -> Self {


implement new with config as argument

amitksingh1490 · 2025-03-05T13:17:08Z

crates/forge_main/src/ui.rs

@@ -118,6 +119,62 @@ impl<F: API> UI<F> {
                    input = self.console.prompt(prompt_input).await?;
                    continue;
                }
+                Command::Login => {
+                    info!("Starting OAuth authentication flow...");


make logging consistent with our existing formats

…for Antinomy provider (#459) Co-authored-by: amitksingh1490 <amitksingh1490@users.noreply.github.com>

…rvice

…tatements

…er to ClerkAuthClient

…e initialization

tusharmath · 2025-03-06T07:54:43Z

crates/forge_app/src/provider.rs


-        Self { or, cache: Cache::new(1024) }
+    fn build_provider_service(&self) -> Result<Self> {
+        if self.or.is_some() {


This will never be some.

tusharmath · 2025-03-06T07:57:29Z

crates/forge_app/src/provider.rs

-    or: Box<dyn ProviderService>,
+pub struct ForgeProviderService<F> {
+    infra: Arc<F>,
+    or: Option<Arc<dyn ProviderService>>,


Suggested change

or: Option<Arc<dyn ProviderService>>,

or: Option<Arc<P>>,

Don't use dyn.

tusharmath · 2025-03-06T07:58:09Z

crates/forge_app/src/provider.rs

-                self.or
+                this.or
+                    .as_ref()
+                    .ok_or_else(|| anyhow::anyhow!("Provider service not initialized"))?


Duplicate error messages. Move them to a common place.

…ency

…method names with repository pattern - Rename AuthService to CredentialRepository for better semantic clarity - Change method names from init_auth/logout to create/delete to align with repository pattern - Update method call sites across the codebase - Refactor AuthFlowState to encapsulate internal implementation details

…structure provider initialization

…handling

…onses

…handling - Refactor Provider enum with hierarchical OpenAiCompat structure - Improve URL handling with proper Url type and consistent API - Simplify ClientBuilder implementation and authentication flow - Consolidate provider identification with helper methods

…t handling

…ient ID

…sages

…out (#442)" This reverts commit 14dac83.

feat(oauth): implement OAuth authentication flow with login and logou…

a68a5fd

…t commands

github-actions bot added the type: feature label Mar 4, 2025

amitksingh1490 and others added 7 commits March 4, 2025 12:57

fix: add missing commas and format code for better readability

d40a03d

feat(auth): implement OAuth authentication service with login and log…

3269c3b

…out functionality

Merge remote-tracking branch 'origin/main' into feat/integrate-auth

7481c31

chore: update dependencies in Cargo.lock

2dbd0eb

chore: update dependencies in Cargo.lock to remove unused packages an…

5570f6b

…d add tracing libraries

[autofix.ci] apply automated fixes

dba4b16

chore: remove unused forge_oauth dependency from Cargo.toml and Cargo…

928a12d

….lock

amitksingh1490 changed the title ~~feat(oauth): implement OAuth authentication flow with login and logou…~~ feat(oauth): implement authentication flow with login and logout Mar 4, 2025

chore: remove unused test module for keyring functionality in oauth.rs

ff4c259

amitksingh1490 marked this pull request as ready for review March 4, 2025 14:24

amitksingh1490 added the build-all-targets label Mar 4, 2025

amitksingh1490 added 2 commits March 4, 2025 19:59

chore: add MockAuthService to test infrastructure in attachment.rs

9f1e7cb

chore: update reqwest dependency to version 0.12.12 and enable rustls…

863060e

…-tls feature; remove unused packages from Cargo.lock

amitksingh1490 removed the build-all-targets label Mar 5, 2025

amitksingh1490 and others added 2 commits March 5, 2025 07:29

Merge branch 'main' into feat/integrate-auth

0871b1f

feat: implement unimplemented methods in AuthService and add get_auth…

535c0cc

…_token function

amitksingh1490 commented Mar 5, 2025

View reviewed changes

crates/forge_domain/src/auth_service.rs Outdated

@@ -0,0 +1,19 @@

use anyhow::Result;

Copy link

Contributor Author

amitksingh1490 Mar 5, 2025

Choose a reason for hiding this comment

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

move to app

amitksingh1490 commented Mar 5, 2025

View reviewed changes

amitksingh1490 and others added 4 commits March 5, 2025 22:39

feat: update get_auth_token to return Option<String> and add support …

49e9ad5

…for Antinomy provider (#459) Co-authored-by: amitksingh1490 <amitksingh1490@users.noreply.github.com>

Merge branch 'main' into feat/integrate-auth

59ef2e0

[autofix.ci] apply automated fixes

23b39f6

fix(provider): simplify condition check for 'or' in build_provider_se…

ddbc64d

…rvice

amitksingh1490 added 7 commits March 6, 2025 09:52

refactor(auth): improve error handling and remove unnecessary print s…

a9e41bf

…tatements

feat(oauth): integrate forge_oauth crate and update authentication flow

743d05a

feat(auth): update ClerkConfig initialization and add key_url paramet…

c379e75

…er to ClerkAuthClient

refactor(auth): format code for better readability in ForgeAuthServic…

d5bbe13

…e initialization

refactor(ui): remove unnecessary log statements from authentication flow

934864e

fix(provider): correct base URL for Antinomy provider

4423721

refactor(api): simplify imports by using wildcard for forge_domain

63cd373

tusharmath reviewed Mar 6, 2025

View reviewed changes

tusharmath and others added 16 commits March 6, 2025 13:46

refactor(auth): rename authentication methods for clarity and consist…

c025f1f

…ency

[autofix.ci] apply automated fixes

37159f9

refactor: add mutex in ForgeProviderService

6d2d6cc

refactor(auth): rename auth_service to credentials_service for clarity

e888edd

[autofix.ci] apply automated fixes

671cc1f

refactor(provider): replace ProviderBuilder with ClientBuilder and re…

e3a79bc

…structure provider initialization

refactor(api): simplify header construction by consolidating API key …

8cbb5d9

…handling

refactor(api): enhance models method to handle multiple provider resp…

377065f

…onses

refactor(api): update provider match to use OpenAiCompat for Antinomy

d6cffd5

refactor(provider): update OpenRouter URL to new endpoint

3d61cfa

refactor(provider): fix Antinomy URL formatting and update environmen…

6e96822

…t handling

refactor(auth): update Clerk OAuth configuration with new URLs and cl…

05e1bb1

…ient ID

feat(html): add new HTML templates for error handling and success mes…

bea131b

…sages

[autofix.ci] apply automated fixes

97fe923

tusharmath enabled auto-merge (squash) March 7, 2025 04:36

tusharmath merged commit 14dac83 into main Mar 7, 2025
9 checks passed

tusharmath added a commit that referenced this pull request Mar 7, 2025

Revert "feat(oauth): implement authentication flow with login and log…

beb60a2

…out (#442)" This reverts commit 14dac83.

tusharmath mentioned this pull request Mar 7, 2025

Revert "feat(oauth): implement authentication flow with login and logout" #464

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(oauth): implement authentication flow with login and logout #442

feat(oauth): implement authentication flow with login and logout #442

amitksingh1490 commented Mar 4, 2025 •

edited

Loading

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

amitksingh1490 Mar 5, 2025

tusharmath Mar 6, 2025

tusharmath Mar 6, 2025

tusharmath Mar 6, 2025

	async fn login(&self) -> anyhow::Result<()> {
	async fn authenticate(&self) -> anyhow::Result<()> {

	pub async fn complete_auth_flow(&self) -> Result<()> {
	pub async fn complete_auth_flow(&self) -> Result<URL> {

feat(oauth): implement authentication flow with login and logout #442

feat(oauth): implement authentication flow with login and logout #442

Conversation

amitksingh1490 commented Mar 4, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amitksingh1490 commented Mar 4, 2025 •

edited

Loading