Set auto provision bucket to true as default and fixed assignment of project

Author: bautisflow

ttn-stack/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.1] - 2024-03-22
+
+### Fixed
+
+- Auto provision bucket is set true as default
+- Assign project to provisioned failing device provisioning
+
 ## [1.2.0] - 2024-03-08
 
 ### Added
@@ -32,7 +39,8 @@
 
 - Make sure Thinger server is running before starting service
 
-[1.2.0]: https://github.com/thinger-io/plugins/compare/ttn-stack/v1.2.0...ttn-stack/v1.2.0
+[1.2.1]: `https://github.com/thinger-io/plugins/compare/ttn-stack/v1.2.0...ttn-stack/v1.2.1`
+[1.2.0]: `https://github.com/thinger-io/plugins/compare/ttn-stack/v1.1.0...ttn-stack/v1.2.0`
 [1.1.0]: https://github.com/thinger-io/plugins/compare/ttn-stack/v1.0.4...ttn-stack/v1.1.0
 [1.0.4]: https://github.com/thinger-io/plugins/compare/ttn-stack/v1.0.3...ttn-stack/v1.0.4
 [1.0.3]: https://github.com/thinger-io/plugins/tree/ttn-stack/v1.0.3

ttn-stack/gui/ttn-stack-settings.js

@@ -22,6 +22,7 @@ angular.module('TTNStackPlugin', ['uiAce'])
             function initSettings(type){
                 $scope.settings.value[type] = {};
                 $scope.settings.value[type].auto_provision_resources = false;
+                $scope.settings.value[type].auto_provision_bucket = true;
                 $scope.settings.value[type].device_downlink_data = '""';
             }
 
@@ -143,4 +144,4 @@ angular.module('TTNStackPlugin', ['uiAce'])
 
         }]
     }
-});
+});

ttn-stack/plugin.json

@@ -1,6 +1,6 @@
 {
   "name" : "ttn-stack",
-  "version" : "1.2.0",
+  "version" : "1.2.1",
   "description" : "Plugin for handling The Things Stack integration",
   "author" : "Alvaro Luis Bustamante",
   "license" : "MIT",
@@ -20,13 +20,13 @@
       "name" : "Access from TTN Stack plugin to Thinger.io account",
       "allow" : {
         "Device" : {
-          "*" : ["CreateDevice", "SetDeviceProperty", "ReadDeviceProperty", "UpdateDeviceCallback", "CallDeviceCallback"]
+          "*" : ["CreateDevice", "SetDeviceProperty", "ReadDeviceProperty", "UpdateDeviceCallback", "CallDeviceCallback", "UpdateDeviceProjects"]
         },
         "User" : {
           "*" : ["SubscribeUserEvents"]
         },
         "Bucket" : {
-          "*" : ["CreateBucket"]
+          "*" : ["CreateBucket", "UpdateBucketProjects"]
         },
         "Plugin" : {
           "ttn-stack" : "*"

ttn-stack/task/api/api.js

@@ -21,7 +21,6 @@ module.exports.createHTTPDevice = async function(deviceId, deviceName, deviceDes
     };
     if(settings.assign_asset_type) data.asset_type = settings.assign_asset_type;
     if(settings.assign_asset_group) data.asset_group = settings.assign_asset_group;
-    if(settings.assign_project) data.project = settings.assign_project;
     if(settings.assign_product) data.product = settings.assign_product;
     console.log(`creating device: ${JSON.stringify(data)}`);
     return axios({
@@ -42,7 +41,6 @@ module.exports.createBucket = async function(bucketId, bucketName, bucketDescrip
     }
     if(settings.assign_asset_type) data.asset_type = settings.assign_asset_type;
     if(settings.assign_asset_group) data.asset_group = settings.assign_asset_group;
-    if(settings.assign_project) data.project = settings.assign_project;
     if(settings.assign_product) data.product = settings.assign_product;
     console.log(`creating bucket: ${JSON.stringify(data)}`);
     return axios({
@@ -114,3 +112,21 @@ module.exports.getDeviceProperty = async function(deviceId, propertyId){
         url: `/v3/users/${USER}/devices/${deviceId}/properties/${propertyId}`,
     });
 };
+
+module.exports.setDeviceProject = async function(deviceId, project) {
+  console.log(`setting project ${project} for ${deviceId}`);
+  return axios({
+    method: 'put',
+    url: `/v1/users/${USER}/devices/${deviceId}/projects`,
+    data: [ `${USER}@${project}` ]
+  });
+}
+
+module.exports.setBucketProject = async function(bucketId, project) {
+  console.log(`setting project ${project} for ${bucketId}`);
+  return axios({
+    method: 'put',
+    url: `/v1/users/${USER}/buckets/${bucketId}/projects`,
+    data: [ `${USER}@${project}` ]
+  });
+}

ttn-stack/task/app.js

@@ -320,7 +320,7 @@ async function handleDeviceUplink(req) {
                 if (payload!==undefined && (error.response && error.response.status===404)) {
 
                     // no auto provision
-                    if (!settings.auto_provision_resources && !settings.auto_provision_bucket) return reject(error);
+                    if (!settings.auto_provision_resources) return reject(error);
 
                     let realBucketId = getBucketId(deviceId, settings);
 
@@ -338,6 +338,8 @@ async function handleDeviceUplink(req) {
                           if ( typeof realBucketId !== 'undefined' ) actions["write_bucket"] = realBucketId;
                           thinger.setDeviceCallback(realDeviceId, actions, {timeout: getDeviceTimeout(settings)})
                         })
+                        .then(() => settings.assign_project ? thinger.setDeviceProject(realDeviceId, settings.assign_project) : Promise.resolve())
+                        .then(() => settings.assign_project && settings.auto_provision_bucket ? thinger.setBucketProject(realBucketId, settings.assign_project) : Promise.resolve())
                         .then(() => updateDeviceProperties(req, realDeviceId, payload, settings))
                         .then(() => thinger.callDeviceCallback(realDeviceId, processedPayload, sourceIP, timestamp))
                         .then((response) => { resolve(response); })
@@ -509,7 +511,7 @@ function launchServer() {
             settings = {
               'Default' : {
                 auto_provision_resources : false,
-                auto_provision_bucket: false,
+                auto_provision_bucket: true,
                 device_downlink_data : '""'
               }
             };

ttn-stack/task/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ttn-stack",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Plugin for handling TTN (v3) integration.",
   "author": "Alvaro Luis Bustamante",
   "license": "MIT",