community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #918 from charithag/master

Browse Source 
Fix twisted username and password fields in remote session
This commit is contained in:
Hasunie 2018-10-22 23:30:09 -07:00 committed by GitHub
commit f32480683a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java
View File

@ -107,8 +107,8 @@ public class OAuthTokenValidatorStubFactory extends BasePoolableObjectFactory {
auth.setPreemptiveAuthentication(true);
String username = tokenValidationProperties.get(RemoteSessionConstants.USERNAME);
String password = tokenValidationProperties.get(RemoteSessionConstants.PASSWORD);
auth.setPassword(username);
auth.setUsername(password);
auth.setUsername(username);
auth.setPassword(password);
Options options = client.getOptions();
options.setProperty(HTTPConstants.AUTHENTICATE, auth);
options.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Constants.VALUE_TRUE);

15
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
View File

@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException {
return null;
}
@Override
public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation)
throws OperationManagementException {
@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return 0;
}
@Override
public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
return null;
}
@Override
public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
return 0;
}
@Override
public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
return 0;
}
@Override
public List<MonitoringOperation> getMonitoringOperationList(String s) {
return null;

15
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
View File

@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException {
return null;
}
@Override
public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation)
throws OperationManagementException {
@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return 0;
}
@Override
public List<Activity> getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException {
return null;
}
@Override
public int getActivityCountUpdatedAfter(long l) throws OperationManagementException {
return 0;
}
@Override
public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException {
return 0;
}
@Override
public List<MonitoringOperation> getMonitoringOperationList(String s) {
return null;

2
pom.xml
View File

@ -1230,7 +1230,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management -->
<carbon.devicemgt.version>3.1.34</carbon.devicemgt.version>
<carbon.devicemgt.version>3.1.47</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range>
<!-- Carbon App Management -->