Skip to content

Commit

Permalink
MARP-607 UIPath Authentication does not work properly (#24)
Browse files Browse the repository at this point in the history
* Fix issues
* Introduce new processes
* Adapt readme as PO's suggestion
* Update machines
* Align process
  • Loading branch information
nqhoan-axonivy authored Jul 29, 2024
1 parent ba3af26 commit 6ecb636
Show file tree
Hide file tree
Showing 17 changed files with 626 additions and 30 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.uipath.ui.path.connector.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.uipath.ui.path.connector.demo
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
eclipse.preferences.version=1
85 changes: 80 additions & 5 deletions ui-path-connector-demo/processes/uiPathDemo.p.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"id" : "f9",
"type" : "RequestStart",
"name" : [
" robot:",
"robot:",
"GetOrders.ivp"
],
"config" : {
Expand All @@ -25,7 +25,7 @@
},
"visual" : {
"at" : { "x" : 96, "y" : 64 },
"labelOffset" : { "x" : -22, "y" : 39 }
"labelOffset" : { "x" : 17, "y" : 41 }
},
"connect" : { "id" : "f2", "to" : "f0" }
}, {
Expand All @@ -44,7 +44,8 @@
}
},
"visual" : {
"at" : { "x" : 224, "y" : 64 }
"at" : { "x" : 224, "y" : 64 },
"icon" : "res:/webContent/icons/uipath.png"
},
"connect" : { "id" : "f3", "to" : "f1" }
}, {
Expand All @@ -61,7 +62,7 @@
}
},
"visual" : {
"at" : { "x" : 96, "y" : 256 },
"at" : { "x" : 512, "y" : 64 },
"labelOffset" : { "x" : 11, "y" : 35 }
}
}, {
Expand All @@ -77,9 +78,83 @@
"docs" : "https://docs.uipath.com/orchestrator/reference/consuming-cloud-api"
},
"visual" : {
"at" : { "x" : 328, "y" : 256 },
"at" : { "x" : 744, "y" : 64 },
"size" : { "width" : 336, "height" : 80 }
},
"connect" : { "id" : "f5", "to" : "f4" }
}, {
"id" : "f6",
"type" : "RequestStart",
"name" : "triggerAllActiveJobs.ivp",
"config" : {
"callSignature" : "triggerAllActiveJobs",
"outLink" : "triggerAllActiveJobs.ivp",
"startName" : "Trigger to start all active Jobs in Orcherstator"
},
"visual" : {
"at" : { "x" : 96, "y" : 192 }
},
"connect" : { "id" : "f11", "to" : "f10" }
}, {
"id" : "f7",
"type" : "TaskEnd",
"visual" : {
"at" : { "x" : 352, "y" : 192 }
}
}, {
"id" : "f10",
"type" : "SubProcessCall",
"name" : "Start all active Jobs",
"config" : {
"processCall" : "uiPathJob:startAllActiveJobs()"
},
"visual" : {
"at" : { "x" : 224, "y" : 192 },
"icon" : "res:/webContent/icons/uipath.png"
},
"connect" : { "id" : "f8", "to" : "f7" }
}, {
"id" : "f13",
"type" : "RequestStart",
"name" : "startJobByName.ivp",
"config" : {
"callSignature" : "startJobByName",
"outLink" : "startJobByName.ivp",
"startName" : "Trigger to start job by name in Orcherstator"
},
"visual" : {
"at" : { "x" : 96, "y" : 320 }
},
"connect" : { "id" : "f16", "to" : "f15" }
}, {
"id" : "f14",
"type" : "TaskEnd",
"visual" : {
"at" : { "x" : 352, "y" : 320 }
}
}, {
"id" : "f15",
"type" : "SubProcessCall",
"name" : [
"Start active Jobs",
"By Name"
],
"config" : {
"processCall" : "uiPathJob:startJobByName(String,String)",
"call" : {
"params" : [
{ "name" : "jobName", "type" : "String" },
{ "name" : "jobArguments", "type" : "String" }
],
"map" : {
"param.jobName" : "\"SendEmailFromGmail\""
}
}
},
"visual" : {
"at" : { "x" : 224, "y" : 320 },
"icon" : "res:/webContent/icons/uipath.png"
},
"connect" : { "id" : "f17", "to" : "f14" }
} ]
}
2 changes: 0 additions & 2 deletions ui-path-connector-product/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ processes. This connector:
- Enables you to steer robotic work from your workflow process.
- Makes the UiPath RPA API features easy and attractive to use in business
processes.
- Supports you with an easy-to-copy demo implementation to reduce your
integration effort.

## Demo

Expand Down
Binary file modified ui-path-connector-product/images/copyAuth_idKeyTenant.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.uipath.test.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.uipath.test
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
eclipse.preferences.version=1
3 changes: 2 additions & 1 deletion ui-path-connector/.settings/ch.ivyteam.ivy.designer.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.uipath.ui.path.connector.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.uipath.ui.path.connector
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
eclipse.preferences.version=1
14 changes: 8 additions & 6 deletions ui-path-connector/config/rest-clients.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
RestClients:
#Orchestrator API
UIPathRPA:
UIPathRPA (UiPath.WebApi 18.0):
UUID: c700c640-4f76-4cbe-8724-dbc663d8bc0a
Url: https://cloud.uipath.com/
Url: https://cloud.uipath.com/{organization}/{tenant}/orchestrator_/
Icon: res:/webContent/icons/uipath.png
Features:
- ch.ivyteam.ivy.rest.client.mapper.JsonFeature
- com.axonivy.connector.uipath.OAuth2Feature
- com.axonivy.connector.uipath.TenantHeaderFeature
Properties:
AUTH.tenant: ${ivy.var.uiPath-connector.tenant}
AUTH.clientId: ${ivy.var.uiPath-connector.clientId}
AUTH.userKey: ${decrypt:\u00AC\u0078\u004A\u00A5\u000B\u0039\u0050\u0072\u0026\u0091\u000E\u0012\u00D2\u0048\u00F6\u009F\u0012\u00CB\u0048\u00B2\u00B2\u0098\u001A\u00BE\u0098\u0070\u0063\u0067\u0010\u00A4\u00A9\u00F5\u002E\u0097\u0021\u0041\u00D7\u001E\u00A5\u0049\u003B\u0065\u0001\u006C\u00EF\u0024\u00D4\u0008\u0031\u0036\u0081\u00DD\u0096\u0013\u00CE\u0016\u00B5\u00FD\u0049\u00D0\u00BE\u004F\u0031\u0032\u00C5\u0004\u00E0\u0015\u0068\u00BF\u001E\u00E7\u0080\u00BD\u004C\u0090\u0017\u003E\u00EE\u001A\u005B\u0052\u0040\u005E\u0086\u0034\u0088\u00E5\u00C8\u001C\u0014\u0097\u0019\u00E5\u004D\u00BB\u0067\u00E9\u0038\u00EA\u0078\u00AB\u0026\u00AA\u006A\u004A\u0048\u007D\u00B3\u0081\u0090\u00D7\u00B6\u0038\u00C9\u0017\u0072\u008B\u0023\u004C\u00B6\u0029\u00C6\u0028\u0024\u00A1\u006C\u00CD\u00D0\u0005\u007D\u00F8\u00FE\u00C0\u00E5\u0074\u0016\u00DB\u00F5\u00C9\u00BB\u0079\u00E4\u00DE\u00FF\u0004\u0071\u00B2\u00D4\u0000\u00EA\u007D\u0025\u006A\u00E4\u0037\u00B8\u0053\u00F9\u005A\u009E\u0076\u0000\u0086\u00F7\u0051\u0064\u00F2\u002E\u0074\u004C\u0003\u00DF\u007C\u00A2\u00EB\u0061\u001C\u00CE\u001F\u006E\u00B9\u00CB\u0014\u0039\u0026\u000C\u0096\u0004\u00CD\u0061\u0044\u00AC\u00A2\u0098\u00FC\u008C\u0007\u00EA\u00E1\u002A\u005A\u0061\u0021\u00C6\u0053\u00E2\u002D\u00F8\u006B\u00A6\u0019\u001C\u00BD\u0008\u009F\u009A\u00EA\u00B3\u000D\u003F\u00DA\u0069\u0011}
AUTH.tenant: ${ivy.var.uiPathConnector.tenant}
AUTH.clientId: ${ivy.var.uiPathConnector.clientId}
AUTH.userKey: ${decrypt:\u00AC\u0078\u004A\u00A5\u000B\u0039\u0050\u0072\u0026\u0091\u000E\u0012\u00D2\u0048\u00F6\u009F\u0012\u00CB\u0048\u00B2\u00B2\u0098\u001A\u00BE\u0098\u0070\u0063\u0067\u0010\u00A4\u00A9\u00F5\u002E\u0097\u0021\u0041\u00D7\u001E\u00A5\u0049\u003B\u0065\u0001\u006C\u00EF\u0024\u00D4\u0008\u0031\u0036\u0081\u00DD\u0096\u0013\u00CE\u0016\u00B5\u00FD\u0049\u00D0\u00BE\u004F\u0031\u0032\u00C5\u0004\u00E0\u0015\u0068\u00BF\u001E\u00E7\u0080\u00BD\u004C\u0090\u0017\u003E\u00EE\u001A\u005B\u0052\u0040\u005E\u0086\u0034\u0088\u00E5\u00C8\u001C\u0014\u0097\u0019\u00E5\u004D\u00BB\u00E5\u00D9\u00B8\u004E\u00D9\u0082\u00EE\u00BE\u0013\u004F\u0055\u00D8\u003B\u003D\u00BC\u005D\u009B\u002E\u002C\u0001\u00C5\u00FE\u0092\u0070\u0085\u0031\u0081\u0051\u0094\u0089\u006D\u0006\u002D\u00E0\u00A9\u0035\u000A\u00D3\u00EB\u0099\u00C8\u002E\u004D\u002E\u006F\u00F6\u0069\u0064\u0031\u0036\u0081\u00DD\u0096\u0013\u00CE\u0016\u00B5\u00FD\u0049\u00D0\u00BE\u004F\u0031\u0032\u0048\u004B\u007A\u0023\u0026\u0086\u00A9\u004E\u0062\u0042\u00B6\u009B\u00F8\u0050\u0041\u005E\u0081\u0091\u00ED\u0078\u0038\u00D0\u00DF\u00F4\u00A6\u0009\u00A9\u0029\u007A\u000B\u00C5\u0089\u001A\u001E\u0072\u009E\u0066\u00A1\u0000\u003D\u0046\u0037\u00E6\u00E5\u0020\u001C\u0036\u0024}
PATH.tenant: ${ivy.var.uiPathConnector.tenant}
PATH.organization: ${ivy.var.uiPathConnector.organization}
jersey.config.client.followRedirects: 'false'
JSON.Serialization.PROPERTY_INCLUSION: NON_NULL
JSON.Mapper.ACCEPT_CASE_INSENSITIVE_PROPERTIES: 'true'
OpenAPI:
SpecUrl: https://cloud.uipath.com/AXONPRESALES/AXONPRESALES/swagger/v13.0/swagger.json
SpecUrl: https://cloud.uipath.com/AXONPRESALES/AXONPRESALES/swagger/v18.0/swagger.json
Namespace: com.uipath.orchestrator
11 changes: 8 additions & 3 deletions ui-path-connector/config/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
# '<project>/Config/_<environment>/variables.yaml
#
Variables:
uiPath-connector:
tenant: 'AXONPRESALES'
# Login to your UiPath by https://cloud.uipath.com to get the API Access info
uiPathConnector:

This comment has been minimized.

Copy link
@ivy-rew

ivy-rew Aug 2, 2024

Member

by changing the name and introducing a new property,
we made updating the connector in production manual work.

we should make the users aware of this; there should be some kind of migration guide for users that already run this in LTS10. IMHO the 'releases' section in the repo would be a great space to document such "braking changes" ... later we could prominently link it on the market-website.

# The id of organization, access to Admin > Tenant > Services > API Access > Organization ID
organization: ''
# The name of UiPath tenant, access to Admin > Tenant > Services > API Access > Name
tenant: ''
# The ID of service client, access to Admin > Tenant > Services > API Access > Client ID
clientId: ''
# The key of service user, access to Admin > Tenant > Services > API Access > User Key
# [password]
userKey: ''

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
UiPathJobData #class
com.axonivy.connector.uipath.ui.path.connector #namespace
organizationunitId Long #field
releases java.util.List<com.uipath.orchestrator.ReleaseDto> #field
machines java.util.List<com.uipath.orchestrator.MachineRobotDto> #field
startInfo com.uipath.orchestrator.StartProcessDto #field
jobName String #field
jobArguments String #field
filter String #field
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ license com.uipath.orchestrator.LicenseDto #field
jobs List<com.uipath.orchestrator.JobDto> #field
robots List<com.uipath.orchestrator.RobotDto> #field
releases List<com.uipath.orchestrator.ReleaseDto> #field
organizationunitId Long #field
Binary file not shown.
2 changes: 1 addition & 1 deletion ui-path-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.6</version>
<version>10.0.16</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
Loading

0 comments on commit 6ecb636

Please sign in to comment.