fix: do not Base64Encode

fix: set sender address

Author: michaelJustin

src/main/oauth2tokenprovider.pas

@@ -16,9 +16,9 @@ function CreateIdHTTPwithSSL12: TIdHTTP;
   IOHandler: TIdSSLIOHandlerSocketOpenSSL;
 begin
   Result := TIdHTTP.Create;
-
   IOHandler := TIdSSLIOHandlerSocketOpenSSL.Create(Result);
   IOHandler.SSLOptions.SSLVersions := [sslvTLSv1_2];
+  IOHandler.SSLOptions.Mode := sslmClient;
   Result.IOHandler := IOHandler;
 end;
 
@@ -53,24 +53,19 @@ function SendPost: string;
 
 function FetchToken: string;
 var
-  jsonData: TJSONData;
-  jsonObject: TJSONObject;
-  jsonString: string;
-  PostResponse: string;
-  AccessToken: string;
+  JsonString: string;
+  JsonData: TJSONData;
+  JsonObject: TJSONObject;
 begin
-  jsonString := SendPost;
-  jsonData := GetJSON(jsonString);
-
-  if jsonData.JSONType = jtObject then
+  JsonString := SendPost;
+  JsonData := GetJSON(JsonString);
+  if JsonData.JSONType = jtObject then
   begin
-    jsonObject := TJSONObject(jsonData);
-    AccessToken := jsonObject.Get('access_token', '');
+    JsonObject := TJSONObject(JsonData);
+    Result := JsonObject.Get('access_token', '');
   end
   else
-    assert(False, 'Invalid JSON object');
-
-  Result := AccessToken;
+    Assert(False, 'Invalid JSON object');
 end;
 
 end.

src/main/smtpoauth2client.pas

@@ -7,42 +7,28 @@ procedure SendSMTP(const OAuth2Token: string);
 implementation
 
 uses
-  IdSMTP, IdSSLOpenSSL, IdMessage, IdGlobal, IdEMailAddress,
-  IdUserPassProvider, IdSASLCollection, IdSASLOAuth,
-  IdExplicitTLSClientServerBase, IdCoder, IdCoderMIME,
+  IdSMTP, IdSSLOpenSSL, IdMessage, IdGlobal, IdEMailAddress, IdSASLOAuth,
+  IdUserPassProvider, IdSASLCollection, IdExplicitTLSClientServerBase,
   Classes, SysUtils;
 
-function EncodeBase64(const Input: string): string;
-var
-  Encoder: TIdEncoderMIME;
-begin
-  Encoder := TIdEncoderMIME.Create(nil);
-  try
-    Result := Encoder.EncodeString(Input);
-  finally
-    Encoder.Free;
-  end;
-end;
-
 procedure SendSMTP(const OAuth2Token: string);
 var
-  Base64EncodedToken: string;
   IdSMTP: TIdSMTP;
   IdMessage: TIdMessage;
   AddressItem: TIdEMailAddressItem;
   Auth: TIdSASLListEntry;
   IOHandler: TidSSLIOHandlerSocketOpenSSL;
   UserPass: TIdUserPassProvider;
 begin
-  Base64EncodedToken := EncodeBase64(OAuth2Token);
-
   IdSMTP := TIdSMTP.Create;
   try
     IdSMTP.Host := 'smtp.office365.com';
     IdSMTP.Port := 587;
 
     IdMessage := TIdMessage.Create(IdSMTP);
     try
+      IdMessage.From.Address := 'user@example.com';
+
       AddressItem := IdMessage.Recipients.Add;
       AddressItem.Address := 'recipient@example.com';
       AddressItem.Name := 'Recipient';
@@ -56,7 +42,7 @@ procedure SendSMTP(const OAuth2Token: string);
 
       UserPass := TIdUserPassProvider.Create(IdSMTP);
       UserPass.Username := 'user@example.com';
-      UserPass.Password := Base64EncodedToken;
+      UserPass.Password := OAuth2Token;
 
       Auth := IdSMTP.SASLMechanisms.Add;
       Auth.SASL := TIdSASLXOAuth2.Create(IdSMTP);

src/test/FpcTests.lpi

@@ -45,6 +45,7 @@
       <Unit>
         <Filename Value="..\main\oauth2tokenprovider.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="OAuth2TokenProvider"/>
       </Unit>
       <Unit>
         <Filename Value="..\main\smtpoauth2client.pas"/>