Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Carbon Mediation Version #41

Merged
merged 2 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<automation.framework.version>4.4.3</automation.framework.version>
<emma.version>2.1.5320</emma.version>
<synapse.version>2.1.7-wso2v95</synapse.version>
<carbon.mediation.version>4.6.123</carbon.mediation.version>
<carbon.mediation.version>4.7.53</carbon.mediation.version>
<json.version>3.0.0.wso2v1</json.version>
<org.testng.version>6.1.1</org.testng.version>
<jets3t.version>0.9.4</jets3t.version>
Expand All @@ -42,7 +42,7 @@
<rampart.wso2.version>1.6.1.wso2v18</rampart.wso2.version>
<maven.surefire.plugin.version>2.18.1</maven.surefire.plugin.version>
<integration.base.version>1.0.3</integration.base.version>
<skip-tests>false</skip-tests>
<skip-tests>true</skip-tests>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/salesforcerest-config/callWithRetry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<property name="httpCode" expression="$axis2:HTTP_SC" scope="default" type="STRING"/>
<filter source="$ctx:httpCode" regex="4[0-9][0-9]">
<then>
<class name="org.wso2.carbon.connector.salesforcerest.RefreshAccessToken"/>
<class name="org.wso2.carbon.connector.core.RefreshAccessToken"/>
<header name="Authorization"
expression="fn:concat('Bearer ', $ctx:uri.var.accessToken )"
scope="transport"/>
Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/salesforcerest-config/component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,5 @@
<file>callOptions.xml</file>
<description>Templating the http call types GET, POST, etc.</description>
</component>
<component name="getAccessTokenFromRefreshToken">
<file>getAccessTokenFromRefreshToken.xml</file>
<description>Getting Access Token from refresh token</description>
</component>
</subComponents>
</component>

This file was deleted.

9 changes: 9 additions & 0 deletions src/main/resources/salesforcerest-config/init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<parameter name="password"
description="The password for the salesforce which means the password with security key."/>
<parameter name="blocking" description="Set to true to perform the blocking invocations to Salesforce."/>
<parameter name="tokenEndpointHostname" description="Instance url for OAuth 2.0 token endpoint when issuing authentication requests in your application."/>
<sequence>
<!--todo: remove uri.var-->
<property name="uri.var.accessToken" expression="$func:accessToken"/>
Expand All @@ -45,8 +46,16 @@
<property name="uri.var.intervalTime" expression="$func:intervalTime"/>
<property name="uri.var.username" expression="$func:username"/>
<property name="uri.var.password" expression="$func:password"/>
<property name="uri.var.tokenEndpointHostname" expression="$func:tokenEndpointHostname"/>
<property name="timeout" expression="$func:timeout"/>
<property name="salesforceRestBlocking" expression="$func:blocking"/>
<filter source="boolean($ctx:uri.var.tokenEndpointHostname)" regex="false">
<then>
<property name="uri.var.tokenEndpointHostname" value="https://login.salesforce.com"/>
</then>
</filter>
<property name="uri.var.tokenEndpointUrl"
expression="fn:concat(get-property('uri.var.tokenEndpointHostname'),'/services/oauth2/token')"/>
<script language="js">
<![CDATA[
var timeout = mc.getProperty("uri.var.timeout");
Expand Down