diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json index b55701c9..9d15c49e 100644 --- a/modules/analytics/distribution/src/ues/designer.json +++ b/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" + ] } } } diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json index 7fa6049a..f6c0c85a 100644 --- a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json +++ b/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" + ] } } }