Merge branch 'master' of https://github.com/wso2/product-iot-server

modules/analytics/distribution/src/ues/designer.json

@@ -25,21 +25,32 @@
         }
     },
     "authorization": {
-        "activeMethod": "",
+        "activeMethod": "oauth",
         "methods": {
             "oauth": {
                 "attributes": {
-                    "idPServer": "%https.ip%/oauth2/token",
-                    "dynamicClientProperties": {
-                        "callbackUrl": "%https.ip%/portal",
-                        "clientName": "portal",
-                        "owner": "admin",
-                        "applicationType": "JaggeryApp",
-                        "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
-                        "saasApp": false,
-                        "dynamicClientRegistrationEndPoint": "%https.ip%/dynamic-client-web/register/",
-                        "tokenScope": "Production"
-                    }
+                    "apimgt-gateway": false,
+                    "oauthProvider": {
+                        "appRegistration": {
+                            "appType": "webapp",
+                            "clientName": "portal",
+                            "owner": "admin",
+                            "password":"admin",
+                            "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
+                            "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
+                            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
+                            "tokenScope": "admin",
+                            "callbackUrl": "%https.host%/portal",
+                            "saasApp":true
+                        },
+                        "tokenServiceURL": "https://localhost:9443/oauth2/token"
+                    },
+                    "adminUser":"admin@carbon.super",
+                    "adminUserTenantId":"-1234",
+                    "adminRole":"admin",
+                    "scopes" : [
+                        "device:view"
+                    ]
                 }
             }
         }

modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json

@@ -34,17 +34,28 @@
     "methods": {
       "oauth": {
         "attributes": {
-          "idPServer": "%https.host%/oauth2/token",
-          "dynamicClientProperties": {
-            "callbackUrl": "%https.host%/portal",
-            "clientName": "portal",
-            "owner": "admin",
-            "applicationType": "JaggeryApp",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
-            "saasApp": false,
-            "dynamicClientRegistrationEndPoint": "%https.host%/dynamic-client-web/register/",
-            "tokenScope": "Production"
-          }
+          "apimgt-gateway": false,
+          "oauthProvider": {
+            "appRegistration": {
+              "appType": "webapp",
+              "clientName": "portal",
+              "owner": "admin",
+              "password":"admin",
+              "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
+              "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
+              "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
+              "tokenScope": "admin",
+              "callbackUrl": "%https.host%/portal",
+              "saasApp":true
+            },
+            "tokenServiceURL": "https://localhost:9443/oauth2/token"
+          },
+          "adminUser":"admin@carbon.super",
+          "adminUserTenantId":"-1234",
+          "adminRole":"admin",
+          "scopes" : [
+            "device:view"
+          ]
         }
       }
     }

modules/core/p2-profile-gen/pom.xml

@@ -588,6 +588,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!-- TCP Transport -->
@@ -995,6 +998,10 @@
                                     <id>org.wso2.carbon.apimgt.core.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <!-- API Manager Publisher and Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>

pom.xml

@@ -1632,7 +1632,7 @@
         <orbit.version.h2>1.2.140.wso2v3</orbit.version.h2>
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
-        <carbon.dashboard.version>2.0.4</carbon.dashboard.version>
+        <carbon.dashboard.version>2.0.5-SNAPSHOT</carbon.dashboard.version>
         <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>