flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-12-04 03:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: make credentialsFilePath nullable in OAuth models and update related logic

Browse Source
This commit is contained in:
Udhay-Adithya
2025-08-06 11:43:56 +05:30
parent 71a98cd2e5
commit c0bb09fd35
10 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/better_networking/lib/utils/auth/handle_auth.dart
View File

@@ -188,7 +188,9 @@ Future<HttpRequestModel> handleAuth(
throw Exception("No Redirect URL found!");
}
final credentialsFile = File(oauth2.credentialsFilePath);
final credentialsFile = oauth2.credentialsFilePath != null
? File(oauth2.credentialsFilePath!)
: null;
switch (oauth2.grantType) {
case OAuth2GrantType.authorizationCode:

30
packages/better_networking/lib/utils/auth/oauth2_utils.dart
View File

@@ -20,12 +20,12 @@ Future<(oauth2.Client, OAuthCallbackServer?)> oAuth2AuthorizationCodeGrant({
required Uri authorizationEndpoint,
required Uri tokenEndpoint,
required Uri redirectUrl,
required File credentialsFile,
required File? credentialsFile,
String? state,
String? scope,
}) async {
// Check for existing valid credentials first
if (await credentialsFile.exists()) {
// Check for existing credentials first
if (credentialsFile != null && await credentialsFile.exists()) {
try {
final json = await credentialsFile.readAsString();
final credentials = oauth2.Credentials.fromJson(json);
@@ -139,7 +139,9 @@ Future<(oauth2.Client, OAuthCallbackServer?)> oAuth2AuthorizationCodeGrant({
);
log('OAuth2 authorization successful, saving credentials');
await credentialsFile.writeAsString(client.credentials.toJson());
if (credentialsFile != null) {
await credentialsFile.writeAsString(client.credentials.toJson());
}
log(client.credentials.toJson());
return (client, callbackServer);
@@ -166,10 +168,10 @@ Future<(oauth2.Client, OAuthCallbackServer?)> oAuth2AuthorizationCodeGrant({
Future<oauth2.Client> oAuth2ClientCredentialsGrantHandler({
required AuthOAuth2Model oauth2Model,
required File credentialsFile,
required File? credentialsFile,
}) async {
// Try to use saved credentials
if (await credentialsFile.exists()) {
if (credentialsFile != null && await credentialsFile.exists()) {
try {
final json = await credentialsFile.readAsString();
final credentials = oauth2.Credentials.fromJson(json);
@@ -211,8 +213,10 @@ Future<oauth2.Client> oAuth2ClientCredentialsGrantHandler({
log('Successfully authenticated via client credentials grant');
try {
await credentialsFile.writeAsString(client.credentials.toJson());
log('Saved credentials to file');
if (credentialsFile != null) {
await credentialsFile.writeAsString(client.credentials.toJson());
log('Saved credentials to file');
}
} catch (e) {
log('Failed to save credentials: $e');
}
@@ -230,10 +234,10 @@ Future<oauth2.Client> oAuth2ClientCredentialsGrantHandler({
Future<oauth2.Client> oAuth2ResourceOwnerPasswordGrantHandler({
required AuthOAuth2Model oauth2Model,
required File credentialsFile,
required File? credentialsFile,
}) async {
// Try to use saved credentials
if (await credentialsFile.exists()) {
if (credentialsFile != null && await credentialsFile.exists()) {
try {
final json = await credentialsFile.readAsString();
final credentials = oauth2.Credentials.fromJson(json);
@@ -281,8 +285,10 @@ Future<oauth2.Client> oAuth2ResourceOwnerPasswordGrantHandler({
log('Successfully authenticated via client credentials grant');
try {
await credentialsFile.writeAsString(client.credentials.toJson());
log('Saved credentials to file');
if (credentialsFile != null) {
await credentialsFile.writeAsString(client.credentials.toJson());
log('Saved credentials to file');
}
} catch (e) {
log('Failed to save credentials: $e');
}