CBAM Auswertung; Verzollungspreise; T2 aus EXG manuell

VERAG_PROG_ALLGEMEIN/Schnittstellen/HMRC/CHMRC.vb

@@ -333,7 +333,7 @@ Public Class cHMRC
         '    genGVMS_GMR(AccessToken)
         'End If
     End Sub
-    Shared Sub grantAccess(ByRef AccessToken, scope, HMRC_APPLICATION)
+    Shared Sub grantAccess(ByRef AccessToken, ByRef RefreshToken, scope, HMRC_APPLICATION)
         Try
             VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
 
@@ -458,6 +458,7 @@ Public Class cHMRC
             '  MsgBox("OAuth2 authorization granted!")
             Debug.WriteLine("OAuth2 authorization granted!")
             Debug.WriteLine("Access Token = " & oauth2.AccessToken)
+            Debug.WriteLine("Refresh Token = " & oauth2.RefreshToken)
             Dim json As Chilkat.JsonObject = New Chilkat.JsonObject()
             json.Load(oauth2.AccessTokenResponse)
             json.EmitCompact = False
@@ -495,6 +496,10 @@ Public Class cHMRC
             'fac.WriteEntireTextFile("qa_data/tokens/hmrc.json", json.Emit(), "utf-8", False)
             '  fac.WriteEntireTextFile("C:\Users\DEVELOPER1\Desktop\hmrc.json", json.Emit(), "utf-8", False)
             AccessToken = oauth2.AccessToken
+            RefreshToken = oauth2.RefreshToken
+
+
+
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
@@ -503,7 +508,7 @@ Public Class cHMRC
 
     Shared Sub HMRC_RefreshToken(ByRef TOKEN As cHMRCToken, HMRC_APPLICATION As String)
 
-        If DateDiff(DateInterval.Minute, TOKEN.token_refresh_datetime, Now) < 230 Then 'bis 240 MIN / 4hr 
+        If DateDiff(DateInterval.Minute, TOKEN.token_accestoken_datetime, Now) < 230 Then 'bis 240 MIN / 4hr 
             'Token ist noch frisch
             Exit Sub
         End If
@@ -527,11 +532,10 @@ Public Class cHMRC
         Dim CREDENTIALS = getCredentials(HMRC_APPLICATION)
 
 
-        Dim TOKEN_NEW = ""
         req.AddParam("client_secret", CREDENTIALS.CLIENT_SECRET)
         req.AddParam("client_id", CREDENTIALS.CLIENT_ID)
         req.AddParam("grant_type", "client_credentials")
-        req.AddParam("refresh_token", TOKEN_NEW)
+        req.AddParam("refresh_token", TOKEN.token_REFRESH_TOKEN)
 
 
 
@@ -565,8 +569,9 @@ Public Class cHMRC
         'json.EmitCompact = False
         'json.WriteFile(tokenFile)
 
-        TOKEN.token_BEARER_TOKEN = If(accessToken <> "", accessToken, newRefreshToken)
-        TOKEN.token_refresh_datetime = Now
+        TOKEN.token_REFRESH_TOKEN = newRefreshToken
+        TOKEN.token_BEARER_TOKEN = accessToken
+        TOKEN.token_accestoken_datetime = Now
         TOKEN.SAVE()
 
         Console.WriteLine("Tokens wurden in TokenDB gespeichert.")
@@ -1538,13 +1543,18 @@ Public Class cHMRC
 
 
             If forceNewToken OrElse TOKEN.hasEntry = False OrElse TOKEN.token_BEARER_TOKEN Is Nothing OrElse TOKEN.token_BEARER_TOKEN = "" Then
+                'Neuer Token  
                 Dim AccessToken = ""
-                grantAccess(AccessToken, appl, HMRC_APPLICATION)
+                Dim RefreshToken = ""
+                grantAccess(AccessToken, RefreshToken, appl, HMRC_APPLICATION)
                 TOKEN.token_Application = APPLICATION
                 TOKEN.token_BEARER_TOKEN = AccessToken
+                TOKEN.token_REFRESH_TOKEN = RefreshToken
                 TOKEN.token_refresh_datetime = Now
+                TOKEN.token_accestoken_datetime = Now
                 TOKEN.SAVE()
             Else
+                'Refresh
                 HMRC_RefreshToken(TOKEN, HMRC_APPLICATION)
             End If