Skip to content

Commit

Permalink
Merge pull request #960 from jonatasrs/fix-imp-empty-cert
Browse files Browse the repository at this point in the history
Fix: import empty certificate path
  • Loading branch information
jijojosephk authored Sep 29, 2023
2 parents 69508d1 + c00fe77 commit cce4983
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/mainAppWindow/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ exports.onAppSecondInstance = function onAppSecondInstance(event, args) {
function applyAppConfiguration(config, window) {
applySpellCheckerConfiguration(config.spellCheckerLanguages, window);

if (typeof config.clientCertPath !== 'undefined') {
if (typeof config.clientCertPath !== 'undefined' && config.clientCertPath !== '') {
app.importCertificate({ certificate: config.clientCertPath, password: config.clientCertPassword }, (result) => {
logger.info('Loaded certificate: ' + config.clientCertPath + ', result: ' + result);
});
Expand Down
7 changes: 7 additions & 0 deletions com.github.IsmaelMartinez.teams_for_linux.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
<releases>
<release version="1.3.12" date="2023-09-28">
<description>
<ul>
<li>Fix: Import empty certificate path. The default config.clientCertPath is an empty string</li>
</ul>
</description>
</release>
<release version="1.3.11" date="2023-09-18">
<description>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teams-for-linux",
"version": "1.3.11",
"version": "1.3.12",
"main": "app/index.js",
"description": "Unofficial client for Microsoft Teams for Linux",
"homepage": "https://github.com/IsmaelMartinez/teams-for-linux",
Expand Down

0 comments on commit cce4983

Please sign in to comment.