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.

Sign up for GitHub

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

Feature/xivy 12667 UI #6

Closed
wants to merge 63 commits into from
Closed

Feature/xivy 12667 UI #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c939c59
added first draft of mock service
ivy-fhe Oct 18, 2023
358f536
Fixed mock service
ivy-fhe Oct 19, 2023
5141dee
finished mocking for GetReveiverInfoTest
ivy-fhe Oct 19, 2023
0c9ee06
changed returned public key to be valid 64bit key
ivy-fhe Oct 19, 2023
2c7ac39
finished api mocking and changed tests to fit mock api
ivy-fhe Oct 19, 2023
041be51
fixed testcases
ivy-fhe Oct 19, 2023
5354afc
added templates to .gitignore
ivy-fhe Oct 19, 2023
903780d
moved process to the right
ivy-fhe Oct 19, 2023
a68f54a
added support for international phone pattern
ivy-fhe Oct 19, 2023
b604bfd
initial webtest commit
ivy-fhe Oct 19, 2023
066389a
added required test for fields
ivy-fhe Oct 19, 2023
c8bcd50
updated ivyVersion
ivy-fhe Oct 19, 2023
30df195
changed ivyversion
ivy-fhe Oct 19, 2023
976cc4b
Update ci.yml to set version to 10.0.11
ivy-fhe Oct 19, 2023
8f605da
removed versionr requirement
ivy-fhe Oct 19, 2023
1a4f713
Update ci.yml
ivy-fhe Oct 19, 2023
28106ea
changed url to point to correct repo
ivy-fhe Oct 20, 2023
32c367f
changed group id to match and fixed version issues
ivy-fhe Oct 20, 2023
0046a20
fixed view to use frame template
ivy-fhe Oct 20, 2023
eac895c
extracted message encryption into util class
ivy-fhe Oct 20, 2023
aae81c9
applied standard ivy formatting
ivy-fhe Oct 20, 2023
5c50c77
removed unused code
ivy-fhe Oct 20, 2023
12ce5cb
fixed repo link
ivy-fhe Oct 20, 2023
01d34b7
fixed formatting
ivy-fhe Oct 20, 2023
ebfcaba
applied formatting
ivy-fhe Oct 20, 2023
8b8e77d
fixed artifact id
ivy-fhe Oct 20, 2023
2a6baa6
fixed perstistence.xml
ivy-fhe Oct 20, 2023
0ba85cd
removed unused ;
ivy-fhe Oct 20, 2023
9f72f7d
Update .classpath
ivy-fhe Oct 20, 2023
63b62d8
added threema-msgapi-tool.* to .gitignore
ivy-fhe Oct 20, 2023
f3eb53b
added plugin to download and extract threema sdk
ivy-fhe Oct 20, 2023
112da5c
temporary removed extraction from task
ivy-fhe Oct 20, 2023
56a0c7c
extracted unzip into own execution step
ivy-fhe Oct 20, 2023
c8094a0
added correct artifactid and groupId
ivy-fhe Oct 20, 2023
1ebf09e
added mkdir to antrun
ivy-fhe Oct 20, 2023
1c79996
Merge pull request #2 from ivy-fhe/master
ivy-rew Oct 20, 2023
4a360b9
[maven-release-plugin] prepare release v10.0.0
ivy-fhe Oct 25, 2023
85974da
[maven-release-plugin] prepare for next development iteration
ivy-fhe Oct 25, 2023
e827042
XIVY-12667 removed dropin installer as it is not needed
ivy-fhe Oct 25, 2023
07f56ab
XIVY-12667 Added Maven ant execution to delete zip-archive
ivy-fhe Oct 25, 2023
2199706
XIVY-12667 Added process to generate keypair
ivy-fhe Oct 25, 2023
abf2338
XIVY-12667 Updated README to include new process for key generation
ivy-fhe Oct 25, 2023
3dd36b5
XIVY-12667 Added test for KeyPairGenerator
ivy-fhe Oct 25, 2023
577760b
XIVY-12667 Added step by step instructions
ivy-fhe Oct 26, 2023
548273c
XIVY-12667 Combined 3 execution steps into 1
ivy-fhe Oct 26, 2023
cf752ec
Update README.md
ivy-fhe Oct 26, 2023
d0aab78
Update README.md
ivy-fhe Oct 26, 2023
4de40c4
Merge pull request #4 from axonivy-market/feature/XIVY-12667_optimiza…
ivy-fhe Oct 26, 2023
bb547f0
Merge branch 'master' into new-release
ivy-fhe Oct 26, 2023
ed536f9
Merge pull request #3 from axonivy-market/new-release
ivy-fhe Oct 26, 2023
e5a3d65
[maven-release-plugin] prepare release v10.0.1
ivy-fhe Oct 26, 2023
55b105c
[maven-release-plugin] prepare for next development iteration
ivy-fhe Oct 26, 2023
b199436
Merge pull request #5 from axonivy-market/new-release
ivy-fhe Oct 26, 2023
2f63d2a
XIVY-12667 Restructured demo processes
ivy-fhe Nov 2, 2023
6833b63
XIVY-12667 Added option to send another message from result screen
ivy-fhe Nov 2, 2023
e75a505
XIVY-12667 Removed console output
ivy-fhe Nov 2, 2023
f0f226c
XIVY-12667 Added dynamic placeholder for recipient
ivy-fhe Nov 2, 2023
1d01c96
Update README.md
ivy-fhe Nov 2, 2023
34f2c74
Update README.md
ivy-fhe Nov 2, 2023
79d0834
XIVY-12667 Upgraded buildplugin to 10.0.14 enabled and configured
ivy-fhe Nov 2, 2023
bf5dbef
XIVY-12667 removed backup variable file
ivy-fhe Nov 2, 2023
a2e60e6
Create variables.yaml
ivy-fhe Nov 2, 2023
b10869b
XIVY-12667 Update ci.yml
ivy-fhe Nov 2, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ on:
jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
with:
mvnArgs: -Dmaven.test.failure.ignore=true -Divy.engine.version=10.0.14
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ src_wsproc/
# local config
**/resources/
threema-connector/config/variables.yaml
threema-connector/config/variables.yaml_template
threema-connector/config/variables.yaml_complete

**/threema-connector-webtest/**
# threema SKD
threema-connector/lib/threema-msgapi-tool.*
28 changes: 14 additions & 14 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>threema-connector-modules</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<name>threema-connector-modules</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Threema Connector

[![CI Build](https://github.com/axonivy-market/REPO-NAME/actions/workflows/ci.yml/badge.svg)](https://github.com/axonivy-market/threema-connector/actions/workflows/ci.yml)
[![CI Build](https://github.com/axonivy-market/threema-connector/actions/workflows/ci.yml/badge.svg)](https://github.com/axonivy-market/threema-connector/actions/workflows/ci.yml)

Use the [Threema.Gateway API](https://threema.ch/en/gateway) to send messages to one or more recipients, enabling new notification options for your business processes.

Expand Down
7 changes: 5 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.market</groupId><!-- your group id: e.g. com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
<groupId>com.axonivy.connector.threema</groupId><!-- your group id: e.g.
com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
<name>threema-connector</name>
<artifactId>threema-connector-modules</artifactId>
<version>10.0.0-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
<version>10.0.2-SNAPSHOT</version><!-- identicate your minimal compliant
ivy version with the first 2 digits -->
<packaging>pom</packaging>

<modules>
<module>${project.name}</module>
<module>${project.name}-demo</module>
<module>${project.name}-test</module>
<module>${project.name}-product</module>
<module>${project.name}-webtest</module>
</modules>

<scm>
Expand Down
54 changes: 29 additions & 25 deletions threema-connector-demo/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_wsproc">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_dataClasses">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="IVY_CONTAINER"/>
<classpathentry kind="con" path="WEBAPP_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="src" path="src">
<attributes>
<attribute name="optional" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_wsproc">
<attributes>
<attribute name="optional" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_dataClasses">
<attributes>
<attribute name="optional" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER" />
<classpathentry exported="true" kind="con"
path="IVY_CONTAINER" />
<classpathentry kind="con" path="WEBAPP_CONTAINER" />
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.web.container" />
<classpathentry kind="output" path="target/classes" />
</classpath>
92 changes: 46 additions & 46 deletions threema-connector-demo/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>threema-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<name>threema-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
23 changes: 14 additions & 9 deletions threema-connector-demo/.settings/.jsdtscope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="webContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
<classpathentry
excluding="**/bower_components/*|**/node_modules/*|**/*.min.js"
kind="src" path="webContent" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER" />
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true" />
</attributes>
</classpathentry>
<classpathentry kind="con"
path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary" />
<classpathentry kind="output" path="" />
</classpath>
26 changes: 17 additions & 9 deletions threema-connector-demo/.settings/org.eclipse.wst.common.component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="threema-connector-demo">
<wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
<property name="context-root" value="threema-connector-demo"/>
<property name="java-output-path" value="/threema-connector-demo/target/classes"/>
</wb-module>
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId"
project-version="1.5.0">
<wb-module deploy-name="threema-connector-demo">
<wb-resource deploy-path="/" source-path="/webContent"
tag="defaultRootSource" />
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src" />
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src_wsproc" />
<wb-resource deploy-path="/WEB-INF/classes"
source-path="/src_dataClasses" />
<property name="context-root"
value="threema-connector-demo" />
<property name="java-output-path"
value="/threema-connector-demo/target/classes" />
</wb-module>
</project-modules>
3 changes: 2 additions & 1 deletion threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<root>
<facet id="jst.jsf">
<node name="libprov">
<attribute name="provider-id" value="jsf-user-library-provider"/>
<attribute name="provider-id"
value="jsf-user-library-provider" />
</node>
</facet>
</root>
10 changes: 5 additions & 5 deletions threema-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="17"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
<fixed facet="wst.jsdt.web" />
<installed facet="java" version="17" />
<installed facet="jst.web" version="3.0" />
<installed facet="wst.jsdt.web" version="1.0" />
<installed facet="jst.jsf" version="2.1" />
</faceted-project>
4 changes: 3 additions & 1 deletion threema-connector-demo/config/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"/>
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd" />
2 changes: 1 addition & 1 deletion threema-connector-demo/config/roles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<role>
<identifier>Everybody</identifier>
<identifier>Everybody</identifier>
</role>
2 changes: 1 addition & 1 deletion threema-connector-demo/config/users.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<userConfig/>
<userConfig />
6 changes: 6 additions & 0 deletions threema-connector-demo/dataclasses/threema/connector/demo/sendDemoMessageData.ivyClass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ type String #field
type PERSISTENT #fieldModifier
apiResponse List<String> #field
apiResponse PERSISTENT #fieldModifier
publicKey String #field
publicKey PERSISTENT #fieldModifier
privatekey String #field
privatekey PERSISTENT #fieldModifier
sendAnother Boolean #field
sendAnother PERSISTENT #fieldModifier
11 changes: 5 additions & 6 deletions threema-connector-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>threema.connector.demo</groupId>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector-demo</artifactId>
<version>10.0.0-SNAPSHOT</version>
<version>10.0.2-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
<groupId>threema.connector</groupId>
<groupId>com.axonivy.connector.threema</groupId>
<artifactId>threema-connector</artifactId>
<version>${project.version}</version>
<type>iar</type>
Expand All @@ -19,7 +18,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.6</version>
<version>10.0.14</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
Loading
Loading