From 28e2355b63a1d746b54351ff9de2520bdb886aab Mon Sep 17 00:00:00 2001
From: okhiroyuki <ok.okada.hiroyuki@gmail.com>
Date: Sun, 8 Mar 2020 13:06:32 +0900
Subject: [PATCH 1/2] modify output

---
 nodes/line-notify.js                 | 14 +++++-----
 nodes/locales/en-US/line-nofify.html |  7 ++++-
 nodes/locales/ja/line-notify.html    |  5 ++++
 test/line-notify_spec.js             | 39 +++++++++++++++++++++-------
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/nodes/line-notify.js b/nodes/line-notify.js
index 8759e03..9879c14 100644
--- a/nodes/line-notify.js
+++ b/nodes/line-notify.js
@@ -52,7 +52,7 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             if(!node.accessToken){
-                sendError(node, "toeken is empty");
+                sendError(node, "token is empty");
                 return;
             }
             let datajson = {
@@ -130,19 +130,21 @@ module.exports = function(RED) {
             };
 
             axios.request(lineconfig).then((res) => {
-                msg.payload = res.data;
+                msg.status = res.data.status;
                 node.send(msg);
                 node.status({fill: "blue", shape: "dot", text: "success"});
             })
             .catch((error) => {
-                sendError(node, error.message);
+                msg.status = error.response.data.status;
+                msg.payload = error.response.data.message;
+                sendError(node, msg);
             });
         });
     }
 
-    function sendError(node, message){
-        node.error(message);
-        node.status({ fill: "red", shape: "ring", text: message});
+    function sendError(node, msg){
+        node.error(msg);
+        node.status({ fill: "red", shape: "ring", text: msg.payload});
     }
 
     function linetoken(n){
diff --git a/nodes/locales/en-US/line-nofify.html b/nodes/locales/en-US/line-nofify.html
index dfa0133..049cce5 100644
--- a/nodes/locales/en-US/line-nofify.html
+++ b/nodes/locales/en-US/line-nofify.html
@@ -1,6 +1,6 @@
 <script type="text/x-red" data-help-name="line-notify">
     <p>You can send notifications to LINE at this node.</p>
-    <h3>入力</h3>
+    <h3>Input</h3>
     <dl class="message-properties">
         <dt class="optional">payload <span class="property-type">string</span></dt>
         <dd>message</dd>
@@ -13,6 +13,11 @@ <h3>入力</h3>
         <dt class="optional">stickerId <span class="property-type">number</span></dt>
         <dd>stikckerId</dd>
     </dl>
+    <h3>Output</h3>
+    <dl class="message-properties">
+        <dt>status <span class="property-type">number</span></dt>
+        <dd>status code</dd>
+    </dl>
     <h3>Detials</h3>
     <p>Message and image URL can be overwritten with msg variable only when the set value is empty.</p>
     <p>If no thumbnail is specified, it will be overwritten with the full size image URL.</p>
diff --git a/nodes/locales/ja/line-notify.html b/nodes/locales/ja/line-notify.html
index d758cf0..5b57c31 100644
--- a/nodes/locales/ja/line-notify.html
+++ b/nodes/locales/ja/line-notify.html
@@ -13,6 +13,11 @@ <h3>入力</h3>
         <dt class="optional">stickerId <span class="property-type">number</span></dt>
         <dd>ステッカーId</dd>
     </dl>
+    <h3>出力</h3>
+    <dl class="message-properties">
+        <dt>status <span class="property-type">number</span></dt>
+        <dd>ステータスコード</dd>
+    </dl>
     <h3>詳細</h3>
     <p>メッセージおよび画像URLは、設定した値が空の場合のみmsg変数で上書きすることが可能です。</p>
     <p>サムネイルが指定されていない場合は、フルサイズの画像URLで上書きします。</p>
diff --git a/test/line-notify_spec.js b/test/line-notify_spec.js
index 508c631..3d4c393 100644
--- a/test/line-notify_spec.js
+++ b/test/line-notify_spec.js
@@ -40,12 +40,31 @@ describe("Line Notify Node", () => {
         helper.load(node, flow, {creds:{accessToken: "dummy"}}, () => {
             const n1 = helper.getNode("n1");
             n1.on("call:error", (err) => {
+                should.equal(err.lastArg,"token is empty");
                 done();
             });
             n1.receive({});
         });
     });
 
+    it("error token", (done) => {
+        const flow = [
+            { id: "n1", type: "line-notify", name: "test", message:"message test", creds: "creds", contentType: "message", wires:[["n2"]]},
+            { id: "creds", type: "linetoken"},
+            { id: "n2", type: "helper" }
+        ];
+        helper.load(node, flow, {creds:{accessToken: "hoge"}},() => {
+            const n2 = helper.getNode("n2");
+            const n1 = helper.getNode("n1");
+            n1.on("call:error", (err) => {
+                should.equal(err.lastArg.status,401);
+                should.equal(err.lastArg.payload, "Invalid access token");        
+                done();
+            });
+            n1.receive({payload: "test"});
+        });
+    });
+
     (process.env.GITHUB_ACTIONS ? describe.skip : describe)("should send returned message", () => {
         const tests=[
             {title:"send message" , flow: { id: "n1", type: "line-notify", name: "test", message:"message test", creds: "creds", contentType: "message", wires:[["n2"]]}},
@@ -63,7 +82,8 @@ describe("Line Notify Node", () => {
                     const n2 = helper.getNode("n2");
                     const n1 = helper.getNode("n1");
                     n2.on("input", (msg) => {
-                        should.equal(msg.payload.status,200);
+                        should.equal(msg.status,200);
+                        should.equal(msg.payload, "test");
                         done();
                     });
                     n1.on("call:error", (err) => {
@@ -86,7 +106,8 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
+                    should.equal(msg.payload, "can overwrite");
                 });
                 n1.on("call:warn", (msg) => {
                     should.equal(msg.lastArg,"line-notify.warn.nooverride.message");
@@ -105,7 +126,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                     done();
                 });
                 n1.receive({payload: "can overwrite"});
@@ -124,7 +145,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                 });
                 n1.on("call:warn", (msg) => {
                     should.equal(msg.lastArg,"line-notify.warn.nooverride.imageUrl");
@@ -158,7 +179,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                     done();
                 });
                 n1.receive({imageUrl: "https://dummyimage.com/640x640"});
@@ -177,7 +198,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                 });
                 n1.on("call:warn", (msg) => {
                     should.equal(msg.lastArg,"line-notify.warn.nooverride.imageThumbnail");
@@ -196,7 +217,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                     done();
                 });
                 n1.receive({imageThumbnail: "https://dummyimage.com/64x64"});
@@ -232,7 +253,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                     done();
                 });
                 n1.receive({
@@ -271,7 +292,7 @@ describe("Line Notify Node", () => {
                 const n2 = helper.getNode("n2");
                 const n1 = helper.getNode("n1");
                 n2.on("input", (msg) => {
-                    should.equal(msg.payload.status,200);
+                    should.equal(msg.status,200);
                     done();
                 });
                 n1.receive({

From 77bff0edc26e825e8b305a97d8fef065b0fd2bde Mon Sep 17 00:00:00 2001
From: okhiroyuki <ok.okada.hiroyuki@gmail.com>
Date: Sun, 8 Mar 2020 13:25:34 +0900
Subject: [PATCH 2/2] add token error messge

---
 nodes/line-notify.js                 | 4 +++-
 nodes/locales/en-US/line-nofify.html | 1 +
 nodes/locales/ja/line-notify.html    | 1 +
 test/line-notify_spec.js             | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nodes/line-notify.js b/nodes/line-notify.js
index 9879c14..2f39ae6 100644
--- a/nodes/line-notify.js
+++ b/nodes/line-notify.js
@@ -52,7 +52,9 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             if(!node.accessToken){
-                sendError(node, "token is empty");
+                msg.payload = "token is empty";
+                msg.status = -1;
+                sendError(node, msg);
                 return;
             }
             let datajson = {
diff --git a/nodes/locales/en-US/line-nofify.html b/nodes/locales/en-US/line-nofify.html
index 049cce5..edfe426 100644
--- a/nodes/locales/en-US/line-nofify.html
+++ b/nodes/locales/en-US/line-nofify.html
@@ -22,6 +22,7 @@ <h3>Detials</h3>
     <p>Message and image URL can be overwritten with msg variable only when the set value is empty.</p>
     <p>If no thumbnail is specified, it will be overwritten with the full size image URL.</p>
     <p>For further details of see <a href="https://notify-bot.line.me/doc/en/">LINE Notify API Document</a>.</p>
+    <p>If an error occurs, an error message is output to msg.payload.</p>
 </script>
 
 <script type="text/x-red" data-help-name="line-notify">
diff --git a/nodes/locales/ja/line-notify.html b/nodes/locales/ja/line-notify.html
index 5b57c31..9ff6c70 100644
--- a/nodes/locales/ja/line-notify.html
+++ b/nodes/locales/ja/line-notify.html
@@ -22,6 +22,7 @@ <h3>詳細</h3>
     <p>メッセージおよび画像URLは、設定した値が空の場合のみmsg変数で上書きすることが可能です。</p>
     <p>サムネイルが指定されていない場合は、フルサイズの画像URLで上書きします。</p>
     <p>詳しくは、<a href="https://notify-bot.line.me/doc/ja/">LINE Notify API Document</a>を参照ください。</p>
+    <p>エラーの場合、msg.payloadにはエラーメッセージが出力されます。</p>
 </script>
 
 <script type="text/x-red" data-help-name="line-notify">
diff --git a/test/line-notify_spec.js b/test/line-notify_spec.js
index 3d4c393..1e46529 100644
--- a/test/line-notify_spec.js
+++ b/test/line-notify_spec.js
@@ -40,7 +40,8 @@ describe("Line Notify Node", () => {
         helper.load(node, flow, {creds:{accessToken: "dummy"}}, () => {
             const n1 = helper.getNode("n1");
             n1.on("call:error", (err) => {
-                should.equal(err.lastArg,"token is empty");
+                should.equal(err.lastArg.payload,"token is empty");
+                should.equal(err.lastArg.status,-1);
                 done();
             });
             n1.receive({});