semcon 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3980361cb218919f5d7b87ffbbe03ee325c5d4e807f5da14ec474e65f120faf
-  data.tar.gz: 987a4b6112b196eb4409ea67c7589aef6d24efb12002ba8050105d3181bb62da
+  metadata.gz: 7ee16deb2a5ad8f6853d3cb8408f56d9b9c5d69e8043f8a6721a4b93ce79e8a3
+  data.tar.gz: 1c1b57506dd53622cd4e583a9bf27ea13d727a39c6557323de8bb32908b40759
 SHA512:
-  metadata.gz: dcf9ab7da19da4f1e7ca478f39c145b2cc95ca1ce9c84f3263c9b011da0e900df1c9852a5fd7fd7c977eddb4aefb04b65ac86488ac269618def615264ba5e949
-  data.tar.gz: 416a13437f6f51d3385bb15b9a2cad25c97845b55070b5239c408fe4dbccd8e5f3a73bf22fe741316aba1af7a5f59cddd6457bae98c995bbc8945743dd5aa3ef
+  metadata.gz: 8394a8fbe28fee22c8b54bab20782156f2b08c3a5d831ccad1c56f0ca9ece15e11a9e5dc90600e8be896799bfe71098cb93752ff71442c4e597879024df369ec
+  data.tar.gz: 577b2c31c534fdef35b1746b3df51df1f532e364d45d79dfab9f9eeb41bb94ddec12832c16fa08f146da0012a1c08fc24e4186d22851a7e6b6a3afea778c622f

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/semcon/basic.rb

@@ -37,4 +37,31 @@ class Semcon
             return [result_url, ""]
         end
     end
+
+    # OAuth functions ---------------------------
+    def self.oauth_headers(token)
+        { 'Accept' => '*/*',
+          'Content-Type' => 'application/json',
+          'Authorization' => 'Bearer ' + token.to_s
+        }
+    end
+
+    def self.oauth_token(url, key, secret)
+        auth_url = url.to_s + "/oauth/token"
+        response_nil = false
+        begin
+            response = HTTParty.post(auth_url, 
+                headers: { 'Content-Type' => 'application/json' },
+                body: { client_id: key, 
+                    client_secret: secret, 
+                    grant_type: "client_credentials" }.to_json )
+        rescue => e
+            return [nil, e.message.to_s]
+        end
+        if !response_nil && !response.body.nil? && response.code == 200
+            return [response.parsed_response["access_token"].to_s, ""]
+        else
+            return ["", response.code.to_s]
+        end
+    end
 end

data/lib/semcon.rb

@@ -7,14 +7,16 @@ require 'semcon/basic'
 
 class Semcon
     def self.write(payload, target, options)
-        record_dri = Oydid.hash(Oydid.canonical({"content": payload, "meta": {}}))
-        # puts "Record DRI: " + record_dri.to_s
+        write_payload = {"content": payload, "meta": {}}
+        if !options[:meta].nil?
+            write_payload[:meta] = options[:meta]
+        end
+        record_dri = Oydid.hash(Oydid.canonical(write_payload))
         target_url, err_msg = host_from_did(target, "DecentralizedWebNode", options)
         if target_url.nil? || err_msg != ""
+            puts "Error: " +  err_msg.to_s
             return [nil, err_msg]
         end
-        # puts "Target URL: " + target_url.to_s
-
         content = [
             {
                 "id": "#data", 
@@ -25,17 +27,34 @@ class Semcon
         options[:location] = target_url
         options[:doc_location] = target_url
         options[:log_location] = target_url
-        did, didDocument, revoc_log, l1, l2, r1, privateKey, revocationKey, did_old, log_old, msg = Oydid.generate_base(content, "", "create", options)
+        # did, didDocument, revoc_log, l1, l2, r1, privateKey, revocationKey, did_old, log_old, msg = Oydid.generate_base(content, "", "create", options)
+        did_doc, did_key, did_log, msg = Oydid.generate_base(content, "", "create", options)
+        did = did_doc[:did]
+        didDocument = did_doc[:didDocument]
+        did_old = did_doc[:did_old]
+        revoc_log = did_log[:revoc_log]
+        l1 = did_log[:l1]
+        l2 = did_log[:l2]
+        r1 = did_log[:r1]
+        log_old = did_log[:log_old]
+
         semcon_object = {}
-        semcon_object["data"] = {"content": payload, "meta": {}}
+        semcon_object["data"] = write_payload
         semcon_object["did-document"] = didDocument
         semcon_object["did-log"] = [l1, l2]
         # puts "Write Object"
         # puts JSON.pretty_generate(semcon_object)
 
-        retVal = HTTParty.post(target_url + "/api/data",
-            headers: { 'Content-Type' => 'application/json' },
-            body: semcon_object.to_json )
+        if options[:token].to_s == ""
+            retVal = HTTParty.post(target_url + "/api/data",
+                headers: { 'Content-Type' => 'application/json' },
+                body: semcon_object.to_json )
+        else
+            retVal = HTTParty.post(target_url + "/api/data",
+                headers: { 'Content-Type' => 'application/json',
+                           'Authorization' => 'Bearer ' + options[:token].to_s },
+                body: semcon_object.to_json )
+        end
 
         # puts "Response from dc-base:"
         # puts JSON.pretty_generate(retVal.parsed_response)
@@ -48,16 +67,26 @@ class Semcon
         return [did, err_msg]
     end
 
-    def self.read(target, options)
-        target_url, err_msg = host_from_did(target, "data", options)
-        if target_url.nil? || err_msg != ""
-            return [nil, err_msg]
-        end
+    def self.read(target_url, options)
         dc_did = target_url.dup.split("?").first
         host_url, err_msg = host_from_did(dc_did, "DecentralizedWebNode", options)
         target_url = host_url.to_s + "/api/data?" + target_url.dup.split("?").last
-        retVal = HTTParty.get(target_url)
-        result = retVal.parsed_response
+        if options[:key_pwd].to_s != ""
+            options[:token] = Oydid.token_from_challenge(host_url, options[:key_pwd]) rescue ""
+        end
+        if options[:token].to_s == ""
+            retVal = HTTParty.get(target_url)
+        else
+            retVal = HTTParty.get(target_url,
+                    headers: { 'Authorization' => 'Bearer ' + options[:token].to_s })
+        end
+        err_msg = ""
+        if retVal.code == 200
+            result = retVal.parsed_response
+        else
+            result = nil
+            err_msg = retVal.response.message
+        end
 
         return [result, err_msg]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semcon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Christoph Fabianek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.7
+      version: 2.6.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="