Bind Giropay to its project (#172)

Author: cmaier

CHANGELOG.md

@@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
 ### Removed
 ### Fixed
 
+## [0.72.3]
+### Fixed
+* core, ui: Bind Giropay to its project (#172)
+
 ## [0.72.2]
 ### Changed
 * core: Explicitly enable buildConfig (#171)

core/src/main/java/io/snabble/sdk/payment/PaymentCredentials.java

@@ -362,16 +362,22 @@ private static long parseValidTo(String format, String expirationDate) {
     }
 
     /**
-     * Encrypts and stores a paydirekt authorization token.
+     * Encrypts and stores a Giropay authorization token.
      */
-    public static PaymentCredentials fromGiropay(GiropayAuthorizationData authorizationData, String customerAuthorizationURI) {
-        if (customerAuthorizationURI == null) {
+    @Nullable
+    public static PaymentCredentials fromGiropay(
+            GiropayAuthorizationData authorizationData,
+            String customerAuthorizationURI,
+            String projectId) {
+
+        if (customerAuthorizationURI == null || projectId == null) {
             return null;
         }
 
         PaymentCredentials pc = new PaymentCredentials();
         pc.generateId();
         pc.type = Type.GIROPAY;
+        pc.projectId = projectId;
 
         List<X509Certificate> certificates = Snabble.getInstance().getPaymentCertificates();
         if (certificates.size() == 0) {

ui/src/main/java/io/snabble/sdk/ui/payment/GiropayInputView.java

@@ -29,6 +29,7 @@
 import java.util.UUID;
 
 import io.snabble.sdk.Environment;
+import io.snabble.sdk.Project;
 import io.snabble.sdk.Snabble;
 import io.snabble.sdk.payment.PaymentCredentials;
 import io.snabble.sdk.payment.data.GiropayAuthorizationData;
@@ -77,6 +78,7 @@ public String getWebLink() {
     private static final String CANCELLED_URL = "snabble-paydirekt://cancelled";
     private static final String FAILURE_URL = "snabble-paydirekt://failure";
 
+    private String projectId;
     private boolean acceptedKeyguard;
     private WebView webView;
     private OkHttpClient okHttpClient;
@@ -183,6 +185,9 @@ public void onProgressChanged(WebView view, final int newProgress) {
     }
 
     private void load() {
+        @Nullable final Project project = Snabble.getInstance().getCheckedInProject().getValue();
+        if (project != null) projectId = project.getId();
+
         String url = Snabble.getInstance().getGiropayAuthUrl();
         if (url == null) {
             finishWithError();
@@ -289,7 +294,11 @@ public void error() {
     }
 
     private void save() {
-        final PaymentCredentials pc = PaymentCredentials.fromGiropay(authorizationData, authorizationResult.getAuthorizationLink());
+        final PaymentCredentials pc = PaymentCredentials.fromGiropay(
+                authorizationData,
+                authorizationResult.getAuthorizationLink(),
+                projectId
+        );
 
         if (pc == null) {
             Toast.makeText(getContext(), "Could not verify payment credentials", Toast.LENGTH_LONG)