From f7d4cf9639007848472a1e3de64072659fd270cf Mon Sep 17 00:00:00 2001
From: Dmytro Landiak <n0fear2110@gmail.com>
Date: Wed, 20 Sep 2017 18:18:37 +0300
Subject: [PATCH 1/2] rest api https support

---
 .../rest/plugin/RestApiCallPlugin.java        |  3 ++-
 .../RestApiCallPluginConfiguration.java       |  2 ++
 .../RestApiCallPluginDescriptor.json          | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
index a07c80d74e..abf3dde912 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
@@ -34,7 +34,7 @@ public class RestApiCallPlugin extends AbstractPlugin<RestApiCallPluginConfigura
     private static final String AUTHORIZATION_HEADER_NAME = "Authorization";
     private static final String AUTHORIZATION_HEADER_FORMAT = "Basic %s";
     private static final String CREDENTIALS_TEMPLATE = "%s:%s";
-    private static final String BASE_URL_TEMPLATE = "http://%s:%d%s";
+    private static final String BASE_URL_TEMPLATE = "%s%s:%d%s";
     private RestApiCallMsgHandler handler;
     private String baseUrl;
     private HttpHeaders headers = new HttpHeaders();
@@ -43,6 +43,7 @@ public class RestApiCallPlugin extends AbstractPlugin<RestApiCallPluginConfigura
     public void init(RestApiCallPluginConfiguration configuration) {
         this.baseUrl = String.format(
                 BASE_URL_TEMPLATE,
+                configuration.getProtocol(),
                 configuration.getHost(),
                 configuration.getPort(),
                 configuration.getBasePath());
diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
index cfd23b8c20..c504972770 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
@@ -22,6 +22,8 @@ import java.util.List;
 
 @Data
 public class RestApiCallPluginConfiguration {
+
+    private String protocol;
     private String host;
     private int port;
     private String basePath;
diff --git a/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json b/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
index 06f8559cf0..129380cb6a 100644
--- a/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
+++ b/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
@@ -3,6 +3,10 @@
     "title": "REST API Call Plugin Configuration",
     "type": "object",
     "properties": {
+      "protocol": {
+        "title": "URI Scheme name",
+        "type": "string"
+      },
       "host": {
         "title": "Host",
         "type": "string"
@@ -51,6 +55,7 @@
       }
     },
     "required": [
+      "protocol",
       "host",
       "port",
       "basePath",
@@ -58,6 +63,21 @@
     ]
   },
   "form": [
+    {
+      "key": "protocol",
+      "type": "rc-select",
+      "multiple": false,
+      "items": [
+        {
+          "value": "http://",
+          "label": "HTTP"
+        },
+        {
+          "value": "https://",
+          "label": "HTTPS"
+        }
+      ]
+    },
     "host",
     "port",
     "basePath",

From b562e8ed1505be255b62e6ed049c424dadaea4f0 Mon Sep 17 00:00:00 2001
From: Dmytro Landiak <n0fear2110@gmail.com>
Date: Wed, 20 Sep 2017 20:45:21 +0300
Subject: [PATCH 2/2] improved URI scheme support

---
 .../server/extensions/rest/plugin/RestApiCallPlugin.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
index abf3dde912..53ab8487ee 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
@@ -41,10 +41,16 @@ public class RestApiCallPlugin extends AbstractPlugin<RestApiCallPluginConfigura
 
     @Override
     public void init(RestApiCallPluginConfiguration configuration) {
+        String host = configuration.getHost();
+        host = host.trim();
+        if (host.contains("://")) {
+            host = host.substring(host.lastIndexOf('/') + 1, host.length());
+        }
+
         this.baseUrl = String.format(
                 BASE_URL_TEMPLATE,
                 configuration.getProtocol(),
-                configuration.getHost(),
+                host,
                 configuration.getPort(),
                 configuration.getBasePath());