updates property handlers to move towards compatibility with http basic profile

Author: wDove1

webthing/server.py

@@ -151,7 +151,7 @@ def get(self):
         for thing in self.things.get_things():
             description = thing.as_thing_description()
             description['href'] = thing.get_href()
-            description['forms'].append({
+            description['links'].append({
                 'rel': 'alternate',
                 'href': '{}{}'.format(ws_href, thing.get_href()),
             })
@@ -243,7 +243,7 @@ def get(self, thing_id='0'):
         )
 
         description = self.thing.as_thing_description()
-        description['forms'].append({
+        description['links'].append({
             'rel': 'alternate',
             'href': '{}{}'.format(ws_href, self.thing.get_href()),
         })
@@ -419,6 +419,36 @@ def get(self, thing_id='0'):
         self.set_header('Content-Type', 'application/json')
         self.write(json.dumps(thing.get_properties()))
 
+    def put(self, thing_id='0'):
+        """
+        Handle a PUT request.
+
+        thing_id -- ID of the thing this request is for
+        """
+        thing = self.get_thing(thing_id)
+        if thing is None:
+            self.set_status(404)
+            return
+
+        try:
+            properties = json.loads(self.request.body.decode())
+        except ValueError:
+            self.set_status(400)
+            return
+
+        for property_name, value in properties.items():
+            if thing.has_property(property_name):
+                try:
+                    thing.set_property(property_name, value)
+                except PropertyError:
+                    self.set_status(400)
+                    return
+            else:
+                self.set_status(404)
+                return
+
+        self.set_status(204)
+
 
 class PropertyHandler(BaseHandler):
     """Handle a request to /properties/<property>."""
@@ -466,8 +496,7 @@ def put(self, thing_id='0', property_name=None):
                 self.set_status(400)
                 return
 
-            self.set_header('Content-Type', 'application/json')
-            self.write(json.dumps(thing.get_property(property_name)))
+            self.set_status(204)
         else:
             self.set_status(404)
 
@@ -570,6 +599,7 @@ def post(self, thing_id='0', action_name=None):
             return
 
         # Allow payloads wrapped inside `value` field
+        #TODO: remove this in the future
         if 'value' in input_:
             input_ = input_['value']
 

webthing/thing.py

@@ -20,7 +20,8 @@ def __init__(self, id_, title, type_=[], description=''):
             type_ = [type_]
 
         self.id = id_
-        self.context = 'https://webthings.io/schemas'
+        self.context = ['https://www.w3.org/ns/wot-next/td', 'https://webthings.io/schemas']
+        self.profiles = ["https://www.w3.org/2022/wot/profile/http-basic/v1"]
         self.type = type_
         self.title = title
         self.description = description
@@ -32,6 +33,9 @@ def __init__(self, id_, title, type_=[], description=''):
         self.subscribers = set()
         self.href_prefix = ''
         self.ui_href = None
+        self.securityDefinitions = { "nosec_sc": { "scheme": "nosec" }}
+        self.security = "nosec_sc"
+
 
     def as_thing_description(self):
         """
@@ -43,27 +47,29 @@ def as_thing_description(self):
             'id': self.id,
             'title': self.title,
             '@context': self.context,
+            'profile': self.profiles,
             'properties': self.get_property_descriptions(),
             'actions': {},
             'events': {},
             'forms': [
                 {
-                    'rel': 'properties',
+                    'op': "readallproperties",
                     'href': '{}/properties'.format(self.href_prefix),
+                    'contentType': 'application/json',
                 },
                 {
-                    'rel': 'actions',
-                    'href': '{}/actions'.format(self.href_prefix),
-                },
-                {
-                    'rel': 'events',
-                    'href': '{}/events'.format(self.href_prefix),
-                },
+                    'op': "writemultipleproperties",
+                    'href': '{}/properties'.format(self.href_prefix),
+                    'contentType': 'application/json',
+                }
             ],
+            'securityDefinitions': self.securityDefinitions,
+            'security': self.security
         }
 
         for name, action in self.available_actions.items():
             thing['actions'][name] = action['metadata']
+            thing['actions'][name]['synchronous'] = True
             thing['actions'][name]['forms'] = [
                 {
                     'op': ['invokeaction'],