fixed commit comments

revert-70aa11f8
ayyoob 8 years ago
parent e3849ef21e
commit ec3dbd37dd

@ -1,3 +1,16 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*
*/
package org.wso2.carbon.device.mgt.jaxrs.beans; package org.wso2.carbon.device.mgt.jaxrs.beans;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

@ -28,6 +28,7 @@
"tokenServiceURL": "%https.ip%/oauth2/token" "tokenServiceURL": "%https.ip%/oauth2/token"
}, },
"adminUser":"admin@carbon.super", "adminUser":"admin@carbon.super",
"adminUserTenantId":"-1234",
"adminRole":"admin", "adminRole":"admin",
"usernameLength":30, "usernameLength":30,
"pageSize":10, "pageSize":10,

@ -101,8 +101,9 @@ var utils = function () {
return cachedTenantBasedClientAppCredentials; return cachedTenantBasedClientAppCredentials;
} else { } else {
var adminUsername = deviceMgtProps["adminUser"]; var adminUsername = deviceMgtProps["adminUser"];
var adminUserTenantId = deviceMgtProps["adminUserTenantId"];
//claims required for jwtAuthenticator. //claims required for jwtAuthenticator.
var claims = {"http://wso2.org/claims/enduserTenantId": "-1234", var claims = {"http://wso2.org/claims/enduserTenantId": adminUserTenantId,
"http://wso2.org/claims/enduser": adminUsername}; "http://wso2.org/claims/enduser": adminUsername};
var jwtToken = publicMethods.getJwtToken(adminUsername, claims); var jwtToken = publicMethods.getJwtToken(adminUsername, claims);

Loading…
Cancel
Save