Skip to content

Fix for: #29 #30

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.

Sign up for GitHub

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

Open
mikerabat wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for: #29 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea49fcf
Fix for:
mikerabat Jan 27, 2026
c8adf30
Upgraded the project to use PKCE protocol.
mikerabat Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion EmailOAuthDm.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,15 @@ TEmailOAuthDataModule = class(TDataModule)
FOAuth2_Enhanced : TEnhancedOAuth2Authenticator;
FIniSettings : TIniFile;
FIsAuthenticated : Boolean;
fPKCE: Boolean;
procedure DoLog(const msg: String);
procedure ForceForegroundNoActivate(hWnd: THandle);
procedure DeleteSASL(SASLMechanisms: TIdSASLEntries; xClass: TIdSASLOAuthBaseClass);
procedure DeleteSASLOAuth;

procedure SetPKCE(const Value: Boolean);
public
property PKCE : Boolean read fPKCE write SetPKCE;
public
{ Public declarations }
SendAddress : string;
Expand Down Expand Up @@ -207,7 +212,12 @@ procedure TEmailOAuthDataModule.IdHTTPServer1CommandGet(AContext: TIdContext; AR
FOAuth2_Enhanced.AuthCode := LCode;
FOAuth2_Enhanced.ChangeAuthCodeToAccesToken;
LTokenName := Provider.AuthName + 'Token';

FIniSettings.WriteString('Authentication', LTokenName, FOAuth2_Enhanced.RefreshToken);
FIniSettings.WriteBool('Authentication', LTokenName + '_PKCE', FOAuth2_Enhanced.UsePKCE );
FIniSettings.WriteString('Authentication', LTokenName + '_PKCE_Verifier', FOAuth2_Enhanced.PKCEVerifier);
FIniSettings.WriteString('Authentication', LTokenName + '_PKCE_Challenge', FOAuth2_Enhanced.PKCEChallenge);

var jwt := TJWT.Create(FOAuth2_Enhanced.IDToken);
if jwt.Payload.ContainsKey('email') then
begin
Expand All @@ -228,7 +238,7 @@ function TEmailOAuthDataModule.IsAuthenticated: boolean;

function TEmailOAuthDataModule.ReadString(const Ident, Default: string): string;
begin
Result := FIniSettings.ReadString('Authentication', Ident, '');
Result := FIniSettings.ReadString('Authentication', Ident, Default);
end;

procedure TEmailOAuthDataModule.DeleteSASL(SASLMechanisms : TIdSASLEntries; xClass: TIdSASLOAuthBaseClass);
Expand Down Expand Up @@ -689,6 +699,12 @@ procedure TEmailOAuthDataModule.CheckPOP;
IdPOP3.Disconnect;
end;

procedure TEmailOAuthDataModule.SetPKCE(const Value: Boolean);
begin
fPKCE := Value;
FOAuth2_Enhanced.UsePKCE := fPKCE;
end;

procedure TEmailOAuthDataModule.SetupAuthenticator;
begin
FOAuth2_Enhanced.ClientID := Provider.ClientID;
Expand All @@ -699,6 +715,9 @@ procedure TEmailOAuthDataModule.SetupAuthenticator;
FOAuth2_Enhanced.AccessTokenEndpoint := Provider.AccessTokenEndpoint;

FOAuth2_Enhanced.RefreshToken := FIniSettings.ReadString('Authentication', Provider.TokenName, '');
FOAuth2_Enhanced.UsePKCE := FIniSettings.ReadBool('Authentication', Provider.TokenName + '_PKCE', False);
FOAuth2_Enhanced.PKCEVerifier := FIniSettings.ReadString('Authentication', Provider.TokenName + '_PKCE_Verifier', '');
FOAuth2_Enhanced.PKCEChallenge := FIniSettings.ReadString('Authentication', Provider.TokenName + '_PKCE_Challenge', '');
SendAddress := FIniSettings.ReadString('Authentication', Provider.TokenName + 'Email', '');


Expand Down
Loading