Merge branch 'add-integrations'

slovensko-digital · Jun 13, 2024 · 29a2abb · 29a2abb
2 parents 9ee71ad + 52993da
commit 29a2abb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/controllers/api/v1/documents_controller.rb b/app/controllers/api/v1/documents_controller.rb
@@ -81,7 +81,7 @@ def set_key
           @key = Base64.strict_decode64(key_b64)
         end
       rescue => e
-        raise AvmUnauthorizedError.new("ENCRYPTION_KEY_MALFORMED", "Encryption key Base64 decryption failed.", e.message)
+        raise AvmUnauthorizedError.new("ENCRYPTION_KEY_MALFORMED", "Encryption key Base64 decryption failed.", "Encryption key must be a base64 string encoding 32 bytes long key, but was: \"#{key_b64}\"")
       end
 
       raise AvmUnauthorizedError.new("ENCRYPTION_KEY_MISSING", "Encryption key not provided.", "Encryption key must be provided either in X-Encryption-Key header or as encryptionKey query parameter.") unless @key

diff --git a/app/models/device.rb b/app/models/device.rb
@@ -10,12 +10,18 @@ class Device < ApplicationRecord
 
 
   def notify(integration, document_guid, document_encryption_key)
-    encrpyted_message = encrypt_message({
+    # TODO: encrypt notifications
+    # encrpyted_message = encrypt_message({
+    #     document_guid: document_guid,
+    #     key: document_encryption_key
+    #   }.to_json,
+    #   integration.pushkey
+    # )
+
+    encrpyted_message = {
         document_guid: document_guid,
         key: document_encryption_key
-      }.to_json,
-      integration.pushkey
-    )
+      }.to_json
 
     if ['ios', 'android'].include? platform
       ApiEnvironment.fcm_notifier.notify(registration_id, encrpyted_message)