-
Notifications
You must be signed in to change notification settings - Fork 213
Oauth integrations #1214
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Oauth integrations #1214
Conversation
📝 WalkthroughWalkthroughThis change introduces a comprehensive OAuth2 plugin system into the project. It adds new workspace crates for OAuth core logic, providers, client, server, and callback handling. The Tauri application is updated to include the OAuth2 plugin, with associated permissions and configuration. The OAuth2 plugin features a Rust backend (with Axum server) and TypeScript bindings, supporting extensible provider registration, command scaffolding, and permission management. Changes
Sequence Diagram(s)sequenceDiagram
participant App as Tauri App
participant Plugin as OAuth2 Plugin
participant Server as Axum OAuth2 Server
participant Provider as OAuthProvider
participant SecretStore as SecretStore
App->>Plugin: Initialize plugin (init)
Plugin->>Server: Start Axum server (run_server)
App->>Plugin: Invoke get_base_url command
Plugin->>App: Return base URL
App->>Server: POST /oauth/authorize (OAuthRequest)
Server->>Provider: Lookup provider in registry
Server->>SecretStore: Retrieve client secret
Provider->>Server: Build authorization URL
Server->>App: Respond with OAuthResponse (auth URL, state, session_id)
App->>Server: GET /oauth/callback (code, state)
Server-->>App: (Not implemented: would handle callback, exchange code, return tokens)
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes
Note ⚡️ Unit Test Generation is now available in beta!Learn more here, or try it out under "Finishing Touches" below. ✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 9
🧹 Nitpick comments (12)
crates/oauth-core/Cargo.toml (1)
1-4
: Add missing crate metadata (description & license).
description
andlicense
(orlicense-file
) fields are required for publishing and for internal clarity/compliance.crates/oauth-server/Cargo.toml (1)
9-9
: Consider explicittower
feature set.Importing full
tower
increases compile time; enable only the features you need (e.g.,tower = { workspace = true, features = ["util"] }
).plugins/oauth2/package.json (1)
4-4
: Consider pointingmain
to compiled JS
main
targets./js/index.ts
. Node resolution expects JavaScript unless you have a build step / loader in every consumer. If this package is only used via bundlers (vite/ts-node, etc.) that’s fine; otherwise emit JS and pointmain
at it.crates/oauth-core/src/lib.rs (1)
1-6
: Explicitly curate the public API surface
pub use provider::*;
andpub use types::*;
automatically expose every new item added to those modules, which can make semver-compatible evolution harder. Prefer enumerating the items you intentionally want to export, e.g.-pub use provider::*; -pub use types::*; +pub use provider::{OAuthProvider, ProviderMetadata}; +pub use types::{OAuthConfig, OAuthRequest, OAuthResponse, CallbackRequest, TokenResponse, OAuthError};This keeps the crate’s public contract intentional and minimizes accidental breaking changes.
crates/oauth-providers/Cargo.toml (1)
1-14
: Add missing package metadata for future publishingThe manifest lacks
license
,description
,repository
, andkeywords
.cargo publish
will warn or fail without at least alicense
field, and the additional metadata improves discoverability.[package] name = "oauth-providers" version = "0.1.0" edition = "2021" +license = "MIT OR Apache-2.0" +description = "Concrete OAuth provider implementations and registry for Hyprnote" +repository = "https://github.com/<org>/<repo>" +keywords = ["oauth2", "provider", "hyprnote"]plugins/oauth2/permissions/autogenerated/reference.md (1)
5-8
: Resolve markdown-lint violationsHeading jumps from H2 to H4 and bears a trailing colon, triggering MD001 and MD026. Adjust to an H3 without trailing punctuation:
-#### This default permission set includes the following: +### Included permissionscrates/oauth-providers/src/lib.rs (1)
35-37
: Consider thread safety for concurrent access patterns.The
register
method requires&mut self
whileget
uses&self
. If this registry will be accessed concurrently, consider using interior mutability (e.g.,RwLock<HashMap<...>>
) to allow safe concurrent registration and retrieval.-pub struct ProviderRegistry { - providers: HashMap<String, Arc<dyn OAuthProvider>>, -} +pub struct ProviderRegistry { + providers: std::sync::RwLock<HashMap<String, Arc<dyn OAuthProvider>>>, +}plugins/oauth2/Cargo.toml (1)
8-8
: Add a description for the plugin.The description field is empty. Please provide a meaningful description for the OAuth2 plugin to improve package metadata.
-description = "" +description = "OAuth2 authentication plugin for Tauri applications"crates/oauth-providers/src/slack.rs (1)
19-20
: Remove redundant comments.The comments repeat what the
todo!()
messages already indicate. Per the coding guidelines, comments should be minimal and about "why", not "what".- // TODO: Implement Slack OAuth URL building todo!("Implement Slack OAuth URL building")
- // TODO: Implement Slack code exchange todo!("Implement Slack code exchange")
- // TODO: Implement Slack token refresh todo!("Implement Slack token refresh")
Also applies to: 29-30, 38-39
crates/oauth-providers/src/attio.rs (1)
19-20
: Remove redundant comments.The comments repeat what the
todo!()
messages already indicate. Per the coding guidelines, comments should be minimal and about "why", not "what".- // TODO: Implement Attio OAuth URL building todo!("Implement Attio OAuth URL building")
- // TODO: Implement Attio code exchange todo!("Implement Attio code exchange")
- // TODO: Implement Attio token refresh todo!("Implement Attio token refresh")
Also applies to: 29-30, 38-39
plugins/oauth2/src/server.rs (2)
121-134
: Callback endpoint is not implemented.The OAuth callback endpoint returns
NOT_IMPLEMENTED
, which means the OAuth flow cannot complete successfully.Would you like me to help implement the callback endpoint logic that handles code exchange and token retrieval?
30-32
: TODO: Implement proper secret storage mechanism.Using environment variables for client secrets is noted as temporary. Consider implementing a more secure secret management solution.
Do you want me to create an issue to track implementing a proper secret storage mechanism, or would you like suggestions for secure secret management approaches?
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (2)
Cargo.lock
is excluded by!**/*.lock
pnpm-lock.yaml
is excluded by!**/pnpm-lock.yaml
📒 Files selected for processing (36)
Cargo.toml
(4 hunks)apps/desktop/src-tauri/Cargo.toml
(1 hunks)apps/desktop/src-tauri/capabilities/default.json
(1 hunks)apps/desktop/src-tauri/src/lib.rs
(1 hunks)crates/oauth-callback/Cargo.toml
(1 hunks)crates/oauth-callback/src/lib.rs
(1 hunks)crates/oauth-callback/src/service.rs
(1 hunks)crates/oauth-client/Cargo.toml
(1 hunks)crates/oauth-client/src/lib.rs
(1 hunks)crates/oauth-core/Cargo.toml
(1 hunks)crates/oauth-core/src/lib.rs
(1 hunks)crates/oauth-core/src/provider.rs
(1 hunks)crates/oauth-core/src/types.rs
(1 hunks)crates/oauth-providers/Cargo.toml
(1 hunks)crates/oauth-providers/src/attio.rs
(1 hunks)crates/oauth-providers/src/lib.rs
(1 hunks)crates/oauth-providers/src/slack.rs
(1 hunks)crates/oauth-server/Cargo.toml
(1 hunks)crates/oauth-server/src/lib.rs
(1 hunks)crates/oauth-server/src/service.rs
(1 hunks)plugins/oauth2/.gitignore
(1 hunks)plugins/oauth2/Cargo.toml
(1 hunks)plugins/oauth2/build.rs
(1 hunks)plugins/oauth2/js/bindings.gen.ts
(1 hunks)plugins/oauth2/js/index.ts
(1 hunks)plugins/oauth2/package.json
(1 hunks)plugins/oauth2/permissions/autogenerated/commands/get_base_url.toml
(1 hunks)plugins/oauth2/permissions/autogenerated/reference.md
(1 hunks)plugins/oauth2/permissions/default.toml
(1 hunks)plugins/oauth2/permissions/schemas/schema.json
(1 hunks)plugins/oauth2/src/commands.rs
(1 hunks)plugins/oauth2/src/error.rs
(1 hunks)plugins/oauth2/src/ext.rs
(1 hunks)plugins/oauth2/src/lib.rs
(1 hunks)plugins/oauth2/src/server.rs
(1 hunks)plugins/oauth2/tsconfig.json
(1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{js,ts,tsx,rs}
⚙️ CodeRabbit Configuration File
**/*.{js,ts,tsx,rs}
: 1. No error handling.
2. No unused imports, variables, or functions.
3. For comments, keep it minimal. It should be about "Why", not "What".
Files:
crates/oauth-server/src/service.rs
crates/oauth-client/src/lib.rs
apps/desktop/src-tauri/src/lib.rs
plugins/oauth2/build.rs
plugins/oauth2/js/index.ts
crates/oauth-core/src/lib.rs
crates/oauth-server/src/lib.rs
crates/oauth-callback/src/lib.rs
plugins/oauth2/src/ext.rs
plugins/oauth2/src/error.rs
crates/oauth-providers/src/slack.rs
plugins/oauth2/src/lib.rs
plugins/oauth2/src/commands.rs
plugins/oauth2/js/bindings.gen.ts
crates/oauth-core/src/types.rs
crates/oauth-providers/src/lib.rs
crates/oauth-core/src/provider.rs
plugins/oauth2/src/server.rs
crates/oauth-providers/src/attio.rs
crates/oauth-callback/src/service.rs
🪛 markdownlint-cli2 (0.17.2)
plugins/oauth2/permissions/autogenerated/reference.md
5-5: Heading levels should only increment by one level at a time
Expected: h3; Actual: h4
(MD001, heading-increment)
5-5: Trailing punctuation in heading
Punctuation: ':'
(MD026, no-trailing-punctuation)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: ci
- GitHub Check: ci (windows, windows-latest)
- GitHub Check: ci (macos, macos-latest)
🔇 Additional comments (32)
crates/oauth-core/Cargo.toml (1)
6-12
: Dependencies look fine.All dependencies are workspace-scoped and minimal – no issues spotted.
crates/oauth-client/Cargo.toml (1)
9-9
: Pinreqwest
to a version.Leaving
reqwest
un-versioned can introduce accidental breaking changes. Pin to the workspace version or an explicit semver range.-reqwest = { workspace = true } +reqwest = { workspace = true, version = ">=0.11, <0.13" } # adjust to workspace policyLikely an incorrect or invalid review comment.
crates/oauth-server/src/service.rs (1)
1-2
: Empty module – add at least a stub implementation or remove the public re-export.An empty file compiles but exposes no API, risking dead code and confusing consumers. Either implement the planned
Service
trait(s) or comment it out until ready.apps/desktop/src-tauri/src/lib.rs (1)
100-101
: Confirm OAuth2 plugin registration & orderingVerified:
- apps/desktop/src-tauri/capabilities/default.json contains
"oauth2:default"
(line 53).- apps/desktop/src-tauri/Cargo.toml includes
tauri-plugin-oauth2 = { workspace = true }
(line 43).- apps/desktop/src-tauri/src/lib.rs registers plugins in this order:
• 88:.plugin(tauri_plugin_deep_link::init())
• 99:.plugin(tauri_plugin_membership::init())
• 100:.plugin(tauri_plugin_oauth2::init())
• 101:.plugin(tauri_plugin_process::init())
Deep‐link is correctly before OAuth2; HTTP “process” comes immediately after. If the OAuth2 setup callback (local HTTP server) requires the Process plugin at init time, swap lines 100–101 so
tauri_plugin_process::init()
precedes.plugin(tauri_plugin_oauth2::init())
. Otherwise, all checks pass.crates/oauth-server/src/lib.rs (1)
1-1
: Scaffolding is soundExposing
service
publicly is fine and matches the new empty module. No further feedback at this point.plugins/oauth2/permissions/default.toml (1)
1-3
: Permission block LGTMThe default permission aligns with the new
get_base_url
command. No issues.crates/oauth-callback/src/lib.rs (1)
1-1
: Public module export approvedThe crate now exposes its
service
module; no concerns.apps/desktop/src-tauri/Cargo.toml (1)
43-43
: LGTM: Dependency addition follows workspace conventions.The OAuth2 plugin dependency is correctly added using the workspace pattern and is properly positioned alphabetically with other Tauri plugins.
plugins/oauth2/js/index.ts (1)
1-1
: LGTM: Standard plugin entry point pattern.The re-export from bindings.gen follows the typical Tauri plugin structure and is implemented correctly.
plugins/oauth2/tsconfig.json (1)
1-5
: LGTM: Clean TypeScript configuration.The configuration properly extends the base config and includes only the necessary files with appropriate exclusions.
plugins/oauth2/permissions/autogenerated/commands/get_base_url.toml (1)
1-13
: LGTM: Auto-generated permissions follow Tauri standards.The permission definitions for the get_base_url command are properly structured with both allow and deny entries, following Tauri's permission system conventions.
plugins/oauth2/build.rs (1)
1-5
: LGTM: Standard Tauri plugin build script.The build script correctly defines the available commands and uses the standard tauri_plugin::Builder pattern. Implementation is clean and follows Tauri conventions.
apps/desktop/src-tauri/capabilities/default.json (1)
53-55
: Confirm permission identifier alignmentEnsure that
"oauth2:default"
exactly matches the identifier defined inplugins/oauth2/permissions/default.toml
. A typo or mismatch will cause the plugin’s commands to be rejected at runtime without an obvious error message.plugins/oauth2/.gitignore (1)
1-18
: Ignore list looks goodEntries comprehensively cover common Rust, Node, and Tauri artefacts.
plugins/oauth2/src/commands.rs (1)
1-9
: LGTM! Clean Tauri command implementation.The command follows proper Tauri patterns with appropriate annotations, generic runtime type, and clean error propagation using the extension trait pattern.
plugins/oauth2/src/ext.rs (1)
1-9
: Excellent extension trait design.The trait provides clean extensibility for Tauri managers with proper generic constraints and a sensible default implementation. The blanket impl pattern allows seamless integration across the plugin system.
crates/oauth-callback/Cargo.toml (1)
1-23
: Well-structured dependency management.The dependencies are appropriate for OAuth callback handling with proper workspace dependency usage and relevant feature flags. The combination of tower, serde, reqwest, and tracing aligns well with the service architecture needs.
plugins/oauth2/src/error.rs (1)
1-21
: Solid error handling architecture.The error enum provides clean cross-platform error handling with appropriate conditional compilation for mobile targets. The Serialize implementation and Result type alias enhance usability across the plugin boundary.
crates/oauth-providers/src/lib.rs (1)
11-38
: Well-designed provider registry with extensible architecture.The registry provides clean provider management with sensible defaults and dynamic registration capabilities. The Arc-based design enables safe sharing across threads.
plugins/oauth2/src/lib.rs (1)
1-71
: Well-structured Tauri plugin implementation.The plugin follows standard Tauri plugin patterns with proper module organization, state management, and TypeScript binding generation. The implementation correctly uses
tauri_specta
for command registration and includes appropriate test coverage.Cargo.toml (1)
53-57
: Workspace dependencies properly organized.The new OAuth-related workspace dependencies and external dependencies are correctly structured and follow consistent naming conventions. The additions support the OAuth2 plugin implementation effectively.
Also applies to: 103-103, 114-114, 128-128
crates/oauth-core/src/provider.rs (2)
6-33
: Well-designed OAuth provider trait.The trait provides a clean abstraction for OAuth providers with appropriate async methods and error handling. The
Send + Sync
bounds ensure thread safety for concurrent usage.
35-42
: Good metadata structure for provider capabilities.The
ProviderMetadata
struct captures essential OAuth provider characteristics with sensible defaults.plugins/oauth2/js/bindings.gen.ts (1)
1-86
: Generated bindings file looks correct.The TypeScript bindings are properly generated with appropriate types and command structure. The
@ts-nocheck
directive is acceptable for generated files.crates/oauth-callback/src/service.rs (1)
10-27
: Well-structured OAuth service implementation.The service design using Tower's
Service
trait with proper async handling and dependency injection is well-architected.Also applies to: 29-37
plugins/oauth2/permissions/schemas/schema.json (1)
1-318
: Well-structured permission schema.The JSON schema properly defines the permission structure for the OAuth2 plugin with appropriate constraints, types, and validation rules.
crates/oauth-core/src/types.rs (6)
1-2
: LGTM! Clean imports with no unused dependencies.All imports are properly utilized throughout the file.
8-15
: Well-designed OAuth configuration struct.Good use of optional client_secret and proper serde attributes for conditional serialization.
17-23
: Proper OAuth request structure with good field design.Appropriate use of optional fields for state and PKCE challenge, supporting different OAuth flow variants.
25-30
: Clean OAuth response structure.Appropriate field types and optionality for OAuth authorization flow responses.
32-38
: Well-structured callback request type.Proper handling of required OAuth callback parameters with optional fields for different flow variants.
40-48
: Excellent token response design with extensibility.Good use of serde flatten for provider-specific extra fields while maintaining OAuth spec compliance for core fields.
let auth_url = provider | ||
.build_auth_url(&req.config, &state, req.pkce_challenge.as_deref()) | ||
.unwrap(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replace unwrap() with proper error handling.
The unwrap()
call can cause panics if URL building fails. Use proper error propagation instead.
- let auth_url = provider
- .build_auth_url(&req.config, &state, req.pkce_challenge.as_deref())
- .unwrap();
+ let auth_url = provider
+ .build_auth_url(&req.config, &state, req.pkce_challenge.as_deref())
+ .map_err(|e| OAuthError::InvalidRequest(e.to_string()))?;
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
let auth_url = provider | |
.build_auth_url(&req.config, &state, req.pkce_challenge.as_deref()) | |
.unwrap(); | |
let auth_url = provider | |
.build_auth_url(&req.config, &state, req.pkce_challenge.as_deref()) | |
.map_err(|e| OAuthError::InvalidRequest(e.to_string()))?; |
🤖 Prompt for AI Agents
In crates/oauth-callback/src/service.rs around lines 58 to 60, replace the
unwrap() call on build_auth_url with proper error handling to avoid panics.
Modify the code to propagate the error using the ? operator or handle the error
explicitly by returning a Result type from the function. This ensures that
failures in URL building are gracefully managed instead of causing a panic.
[dependencies] | ||
hypr-oauth-core = { workspace = true } | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Broken dependency name – crate will not resolve.
hypr-oauth-core
does not exist in this workspace; the actual crate you added is named oauth-core
(see crates/oauth-core/Cargo.toml). Compilation will fail.
-hypr-oauth-core = { workspace = true }
+oauth-core = { workspace = true }
🤖 Prompt for AI Agents
In crates/oauth-client/Cargo.toml around lines 6 to 8, the dependency name is
incorrect as it uses "hypr-oauth-core" which does not exist in the workspace.
Change the dependency name to "oauth-core" to match the actual crate name in
crates/oauth-core/Cargo.toml so that the crate resolves correctly and
compilation succeeds.
@@ -0,0 +1 @@ | |||
pub const a: i32 = 1; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Placeholder constant provides no functionality.
pub const a: i32 = 1;
is unused and leaks an arbitrary public API surface. Remove it or replace with meaningful client logic; otherwise this crate serves no purpose and will fail the “no unused exports” guideline.
-pub const a: i32 = 1;
+// TODO: implement OAuth client functions (token request, refresh, etc.)
🤖 Prompt for AI Agents
In crates/oauth-client/src/lib.rs at line 1, the public constant `a` is unused
and adds unnecessary public API surface. Remove this placeholder constant or
replace it with meaningful client logic to ensure the crate has a valid exported
API and complies with the "no unused exports" guideline.
pub enum OAuthError { | ||
ProviderNotFound, | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add standard error traits for proper error handling.
The enum should implement standard error traits for better integration with Rust's error handling ecosystem.
+use std::fmt;
+
+#[derive(Debug)]
pub enum OAuthError {
ProviderNotFound,
}
+
+impl fmt::Display for OAuthError {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ OAuthError::ProviderNotFound => write!(f, "OAuth provider not found"),
+ }
+ }
+}
+
+impl std::error::Error for OAuthError {}
Committable suggestion skipped: line range outside the PR's diff.
🤖 Prompt for AI Agents
In crates/oauth-core/src/types.rs around lines 4 to 6, the OAuthError enum lacks
implementation of standard error traits. Implement the std::error::Error trait
and also derive or implement std::fmt::Display and std::fmt::Debug for
OAuthError to enable proper error handling and integration with Rust's error
ecosystem.
[dependencies] | ||
hypr-oauth-core = { workspace = true } | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Broken dependency name – crate will not resolve.
Same naming mismatch as in oauth-client
.
-hypr-oauth-core = { workspace = true }
+oauth-core = { workspace = true }
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
[dependencies] | |
hypr-oauth-core = { workspace = true } | |
[dependencies] | |
oauth-core = { workspace = true } |
🤖 Prompt for AI Agents
In crates/oauth-server/Cargo.toml around lines 6 to 8, the dependency name
"hypr-oauth-core" is incorrect and will cause the crate not to resolve. Correct
the dependency name to match the actual crate name used in the workspace,
ensuring consistency with the naming used in oauth-client. Update the dependency
entry accordingly to fix the resolution issue.
"scripts": { | ||
"codegen": "cargo test -p tauri-plugin-oauth" | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix broken codegen
script – wrong crate name
The workspace crate is named tauri-plugin-oauth2
, but the script references tauri-plugin-oauth
, which will fail.
- "codegen": "cargo test -p tauri-plugin-oauth"
+ "codegen": "cargo test -p tauri-plugin-oauth2"
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
"scripts": { | |
"codegen": "cargo test -p tauri-plugin-oauth" | |
}, | |
"scripts": { | |
"codegen": "cargo test -p tauri-plugin-oauth2" | |
}, |
🤖 Prompt for AI Agents
In plugins/oauth2/package.json around lines 5 to 7, the "codegen" script
references the wrong crate name "tauri-plugin-oauth". Update the script to use
the correct crate name "tauri-plugin-oauth2" to match the workspace crate and
ensure the script runs successfully.
.with_state(app_state) | ||
.layer( | ||
CorsLayer::new() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replace unwrap() calls with proper error handling.
The unwrap()
calls can cause panics. Use proper error propagation instead.
- .build_auth_url(&req.config, &state, req.pkce_challenge.as_deref())
- .unwrap();
+ .build_auth_url(&req.config, &state, req.pkce_challenge.as_deref())?;
- .await
- .unwrap();
+ .await
+ .map_err(|e| tracing::error!("Server error: {}", e));
Also applies to: 83-84
🤖 Prompt for AI Agents
In plugins/oauth2/src/server.rs around lines 58 to 60 and also lines 83 to 84,
the code uses unwrap() calls which can cause panics if an error occurs. Replace
these unwrap() calls with proper error handling by propagating the errors using
the ? operator or matching on the Result to handle errors gracefully. This will
prevent the application from panicking and allow for controlled error
management.
.layer( | ||
CorsLayer::new() | ||
.allow_origin(cors::Any) | ||
.allow_methods(cors::Any) | ||
.allow_headers(cors::Any), | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CORS configuration is too permissive and poses security risk.
Allowing any origin, method, and header creates potential security vulnerabilities. Consider restricting CORS to specific origins and methods based on your application's requirements.
- .layer(
- CorsLayer::new()
- .allow_origin(cors::Any)
- .allow_methods(cors::Any)
- .allow_headers(cors::Any),
- );
+ .layer(
+ CorsLayer::new()
+ .allow_origin("http://localhost:3000".parse::<HeaderValue>().unwrap())
+ .allow_methods([Method::GET, Method::POST])
+ .allow_headers([AUTHORIZATION, CONTENT_TYPE]),
+ );
Committable suggestion skipped: line range outside the PR's diff.
🤖 Prompt for AI Agents
In plugins/oauth2/src/server.rs around lines 59 to 64, the CORS configuration
currently allows any origin, method, and header, which is too permissive and
insecure. Update the CorsLayer to restrict allowed origins to a specific list of
trusted domains and limit allowed methods to only those necessary for your
application. Also, specify only the required headers instead of allowing all
headers. This will tighten security by preventing unauthorized cross-origin
requests.
Ok(service) => match service.call(request).await { | ||
Ok(response) => Ok(Json(response)), | ||
Err(err) => Err((StatusCode::BAD_REQUEST, "OAuth error".to_string())), | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Error details are lost in error handling.
The actual error from the OAuth service is discarded, making debugging difficult. Consider logging the error or providing more specific error messages.
- Err(err) => Err((StatusCode::BAD_REQUEST, "OAuth error".to_string())),
+ Err(err) => {
+ tracing::error!("OAuth service error: {}", err);
+ Err((StatusCode::BAD_REQUEST, format!("OAuth error: {}", err)))
+ }
🤖 Prompt for AI Agents
In plugins/oauth2/src/server.rs around lines 103 to 106, the error handling
discards the actual error from the OAuth service, losing valuable debugging
information. Modify the Err branch to either log the error details or include
the error message in the returned error response, so the specific cause of the
failure is preserved and easier to diagnose.
No description provided.