Merge branch 'feature(single-lifetime-license-support)'

Sendent-B-V · Mar 14, 2024 · 7ce785c · 7ce785c
2 parents 859e6ac + bd56fdf
commit 7ce785c
Show file tree

Hide file tree

Showing 146 changed files with 16,614 additions and 139 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,4 @@ node_modules/
 /js/retentionAssistant.js*
 /js/settings.js*
 /js/termsAgreement.js*
-certificates/sendent.crt
-certificates/sendent.csr
-certificates/sendent.key
-certificates/sendent.key signature.rtf
-certificates/sendent.p12
-certificates/sendent.pem
+/certificates
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -243,6 +243,27 @@
 ### Fix
 - Fixes issue where upon updating the snippet-settings are reset.
 
+## 3.0.0 - 2024-02-25
+### Features
+- More insight into your subscription information for the configured license key(s)
+  - View product- and productlevel that are supported within your subscription
+  - Enhanced status display for your subscription
+- App no longer requires entering a new licensekey when your subscription renewes. The latest licensekey is automatically fetched based on the initial licensekey that is configured.
+- Support for the upcoming new Sendent products
+
+## 3.0.1 - 2024-02-26
+### Bugfix
+- Minor bugfix after release.
+
+## 3.0.3 - 2024-02-27
+### Bugfix
+- Minor bugfix to fix issues where the  "Outlook Add-in version information" block would not work properly.
+
+## 3.0.4 - 2024-03-09
+### Bugfix
+- Minor bugfix to fix issues where the  "Outlook Add-in version information" block would not work properly.
+- Fix for license status not being shown properly for some users.
+- Fix for darkmode compatibility. 
 ## 2.0.5 - 2023-12-13
 ### Support
-- Official Nextcloud version 28 support.
+- Official Nextcloud version 28 support.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -3,23 +3,23 @@
     <id>sendent</id>
     <name>Sendent</name>
     <summary lang="en">Sendent allows you to securely exchange files and emails</summary>
-    <description lang="en">Sendent allows you to securely exchange files and emails. Sendent is linked to Microsoft Outlook, so you can continue to work from your trusted email program while you mail more easily and securely. Very useful, for example, to share privacy-sensitive documents or content or to send attachments that are normally too large to email. All files are uploaded to your personal Nextcloud environment from which you determine who has access to them.</description>
-    <version>2.0.5</version>
+    <description lang="en">Sendent now securely exchanges files and emails, integrating with both Microsoft Outlook and Microsoft Teams. This enhanced capability allows users to seamlessly conduct their work, not only within their preferred email environment but also within the collaborative framework of Microsoft Teams. Whether sharing privacy-sensitive documents, content, or handling attachments that exceed standard email size constraints, Sendent ensures a streamlined and secure communication experience. All files are directed to your Nextcloud instance, empowering you to control and manage access permissions effectively.</description>
+    <version>3.0.4</version>
     <licence>agpl</licence>
-    <author mail="support@sendent.nl" homepage="https://www.sendent.nl">Sendent B.V.</author>
+    <author mail="support@sendent.com" homepage="https://www.sendent.com">Sendent B.V.</author>
     <namespace>Sendent</namespace>
 
     <category>integration</category>
     <category>office</category>
-    <category>social</category>
-    <website>https://www.sendent.nl</website>
-    <bugs>https://sendent.nl/support</bugs>
+    <category>tools</category>
+    <website>https://www.sendent.com</website>
+    <bugs>https://sendent.com/resources/support</bugs>
     <repository>https://github.com/Sendent-B-V/Sendent-App-for-Nextcloud.git</repository>
-    <screenshot>https://download.sendent.nl/serverapp/1.0.0/sendentbanner.png</screenshot>
-    <screenshot>https://download.sendent.nl/serverapp/1.0.0/sharefilesuploading.png</screenshot>
-    <screenshot>https://download.sendent.nl/serverapp/1.0.0/sharefilesfiles.png</screenshot>
-    <screenshot>https://download.sendent.nl/serverapp/1.0.0/publicshare.png</screenshot>
-    <screenshot>https://download.sendent.nl/serverapp/1.0.0/publicsharedate.png</screenshot>
+    <screenshot>https://download.sendent.com/serverapp/1.0.0/sendentbanner.png</screenshot>
+    <screenshot>https://download.sendent.com/serverapp/1.0.0/sharefilesuploading.png</screenshot>
+    <screenshot>https://download.sendent.com/serverapp/1.0.0/sharefilesfiles.png</screenshot>
+    <screenshot>https://download.sendent.com/serverapp/1.0.0/publicshare.png</screenshot>
+    <screenshot>https://download.sendent.com/serverapp/1.0.0/publicsharedate.png</screenshot>
 
     <dependencies>
         <nextcloud min-version="25" max-version="28"/>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -57,7 +57,9 @@
 			'requirements' => ['path' => '.+']
 		],
 		['name' => 'license_api#show', 'url' => '/api/1.0/licensestatus', 'verb' => 'GET'],
+		['name' => 'license_api#showInternal', 'url' => '/api/1.0/licensestatusinternal', 'verb' => 'GET'],
 		['name' => 'license_api#showForNCGroup', 'url' => '/api/1.0/licensestatusForNCGroup', 'verb' => 'GET'],
+		['name' => 'license_api#showForNCGroupInternal', 'url' => '/api/1.0/licensestatusForNCGroupinternal', 'verb' => 'GET'],
 		['name' => 'license_api#delete', 'url' => '/api/1.0/license', 'verb' => 'DELETE'],
 		['name' => 'license_api#create', 'url' => '/api/1.0/license', 'verb' => 'POST'],
 		['name' => 'license_api#validate', 'url' => '/api/1.0/licensevalidation', 'verb' => 'GET'],

diff --git a/assets/templates/talkhtml.html b/assets/templates/talkhtml.html
@@ -0,0 +1,22 @@
+<html>
+<body>
+    <br />
+    <br />
+    <strong><span style='font-size: 14pt;font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;'>Nextcloud
+            Talk Conversation</span><br /></strong>
+    <br />
+    <span style='font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;'>You can join our conversation
+        using your computer or smartphone.</span><br />
+    <b><a style='font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;' href='{URL}'>Click here to join
+            the conversation </a></b><br />
+    <br />
+    {0}
+    <br />
+    <a style='font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;'
+        href='https://docs.nextcloud.com/server/latest/user_manual/en/talk/join_a_call_or_chat_as_guest.html'>How to use
+        Nextcloud Talk </a>|<a style='font-family: Calibri,Candara,Segoe,Segoe UI,Optima,Arial,sans-serif;'
+        href='https://nextcloud.com/talk/'>About Nextcloud Talk </a></b></b><br /><br />
+
+    <body>
+
+</html>
diff --git a/css/style.css b/css/style.css
@@ -1,6 +1,18 @@
+
+
 #hello {
 	color: red;
 }
+.badge {
+	background-color: darkblue;
+	color: white;
+	padding: 0px 4px 0px 4px;
+	margin-left:5px;
+	text-align: center;
+	height:24px;
+	font-size:10px;
+	border-radius: 5px;
+  }
 .personal-settings-setting-box, .license-settings-setting-box, .dependency-settings-setting-box{
 	position:relative;
 }
@@ -76,7 +88,6 @@
 	display: inline-flex;
 	font-size:medium;
 	border-radius: var(--border-radius-large) var(--border-radius-large) 0px 0px;
-	background: white;
 	min-width: 110px !important;
 	max-width: 220px;
 	min-height: 40px;
@@ -88,9 +99,8 @@
 	display: inline-flex;
 	font-weight: bold;
 	font-size:medium;
-	border-bottom: 1px solid black;
+	border-bottom: 2px solid blue;
 	border-radius: var(--border-radius-large) var(--border-radius-large) 0px 0px;
-	background: whitesmoke;
 	min-width: 110px !important;
 	max-width: 220px;
 	min-height: 40px;
@@ -180,13 +190,13 @@ label{
 	grid-column-end:e;
 }
 .errorStatus{
-	color:darkred;
+	color:red;
 }
 .warningStatus{
 	color:darkorange;
 }
 .okStatus{
-	color:darkblue;
+	color:green;
 }
 .licensekeyvalueinput {
 	line-height: 40px;
@@ -198,6 +208,11 @@ label{
 	margin: 0;
 	line-height: 34px;
   }
+
+  &[data-state="licenseproductavailable"]::before {
+	content: '';
+	background-image: var(--icon-checkmark-color-green);
+}
 .templatesettingkeynametextareakind {
 	vertical-align: text-top;
   }

diff --git a/lib/Controller/Dto/LicenseStatus.php b/lib/Controller/Dto/LicenseStatus.php
@@ -13,10 +13,12 @@ class LicenseStatus implements JsonSerializable {
 	public $licensekey;
 	public $level;
 	public $ncgroup;
+	public $product;
+	public $istrial;
 
 	public function __construct(string $status, string $statusKind,
 	string $level, string $licensekey,
-	string $dateExpiration, string $dateLastCheck, string $email, string $ncgroup = '') {
+	string $dateExpiration, string $dateLastCheck, string $email, string $product = '', int $istrial = -1, string $ncgroup = '') {
 		// add types in constructor
 		$this->status = $status;
 		$this->statusKind = $statusKind;
@@ -26,6 +28,8 @@ public function __construct(string $status, string $statusKind,
 		$this->email = $email;
 		$this->level = $level;
 		$this->ncgroup = $ncgroup;
+		$this->product = $product;
+		$this->istrial = $istrial;
 	}
 
 	public function jsonSerialize() {
@@ -38,6 +42,8 @@ public function jsonSerialize() {
 			'licensekey' => $this->licensekey,
 			'dateLastCheck' => $this->dateLastCheck,
 			'ncgroup' => $this->ncgroup,
+			'product' => $this->product,
+			'istrial' => $this->istrial,
 		];
 	}
 }