Skip to content

Feature/multiple tokens #395

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

Draft
ThomasPohl wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Feature/multiple tokens #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84752aa
Update config of adapter to be able to save multiple tokens
ThomasPohl Dec 27, 2025
068f562
refactor: migrate configuration from single token to multi-token stru…
ThomasPohl Dec 28, 2025
6ad772f
feat: add support for multiple tokens in native configuration
ThomasPohl Dec 28, 2025
b09b0d0
Merge branch 'main' into feature/multiple-tokens
ThomasPohl Dec 28, 2025
4615e06
fix: handle errors when saving and encrypting tokens in configuration
ThomasPohl Jan 2, 2026
8ee8e88
chore: bump admin 7.6.17 to 7.6.20
ThomasPohl Mar 1, 2026
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: 0 additions & 2 deletions .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
iobroker:
build: ./iobroker
Expand Down
2 changes: 1 addition & 1 deletion admin/blocks/gotify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Blockly.Blocks['gotify'] = {
},
};

Blockly.JavaScript['gotify'] = function (block) {
Blockly.JavaScript.forBlock['gotify'] = function (block) {
var dropdown_instance = block.getFieldValue('INSTANCE');
var message = Blockly.JavaScript.valueToCode(block, 'MESSAGE', Blockly.JavaScript.ORDER_ATOMIC);
var text = '{\n';
Expand Down
55 changes: 48 additions & 7 deletions admin/jsonConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,57 @@
"label": "url",
"help": "urlHelp"
},
"token": {
"table1Err1": {
"type": "staticText",
"text": "ERROR: Exactly one default token allowed!",
"newLine": true,
"type": "text",
"hidden": "let b=null; for(let ii=0; data.tokens && ii<data.tokens.length; ii++){ if (data.tokens[ii].isDefault) { if (b===null){ b=true; } else if (b===true){ return false; } else { b=false; }}}; if (b===false || b===null) return false; return true;",
"style": {
"color": "red"
},
"xs": 12,
"sm": 12,
"md": 8,
"lg": 8,
"xl": 8,
"label": "token",
"help": "tokenHelp"
"md": 12,
"lg": 6,
"xl": 6
},
"tokens": {
"type": "table",
"newLine": true,
"label": "tokens",
"help": "tokensHelp",
"sm": 12,
"md": 12,
"lg": 12,
"xl": 12,
"items": [
{
"type": "checkbox",
"attr": "isDefault",
"width": "10%",
"title": "defaultTokenAlias",
"tooltip": "defaultTokenAliasHelp",
"default": false,
"validator": "let b=null; for(let ii=0; globalData.tokens && ii<globalData.tokens.length; ii++){ if (globalData.tokens[ii].isDefault) { if (b===null){ b=true; } else if (b===true){ return false; } else { b=false; }}}; if (b===false || b===null) return false; return true;",
"validatorNoSaveOnError": true
},
{
"type": "text",
"attr": "alias",
"width": "40%",
"title": "tokenAlias",
"tooltip": "tokenAliasHelp",
"default": ""
},
{
"type": "text",
"attr": "token",
"width": "50%",
"title": "Token",
"tooltip": "tokenHelp",
"default": ""
}
]
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions admin/words.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ systemDictionary = {
uk: 'Url',
'zh-cn': '网址',
},
'Url of Gotify server - http(s)://host(:port)': {
en: 'Url of Gotify server - http(s)://host(:port)',
de: 'Url des Gotify server - http(s)://host(:port)',
ru: 'URL сервера Gotify - http(s)://host(:port)',
pt: 'URL do servidor Gotify - http(s)://host(:port)',
nl: 'URL van Gotify-server - http(s)://host(:port)',
fr: 'URL du serveur Gotify - http(s)://host(:port)',
it: 'URL del server Gotify - http(s)://host(:port)',
es: 'Url del servidor Gotify - http(s)://host(:puerto)',
pl: 'Adres URL serwera Gotify - http(s)://host(:port)',
uk: 'URL-адреса сервера Gotify - http(s)://host(:port)',
'zh-cn': 'Gotify 服务器的 URL - http(s)://host(:port)',
'Url of Gotify server - http(s): //host(:port)': {
en: 'Url of Gotify server - http(s): //host(:port)',
de: 'Url des Gotify server - http(s): //host(:port)',
ru: 'URL сервера Gotify - http(s): //host(:port)',
pt: 'URL do servidor Gotify - http(s): //host(:port)',
nl: 'URL van Gotify-server - http(s): //host(:port)',
fr: 'URL du serveur Gotify - http(s): //host(:port)',
it: 'URL del server Gotify - http(s): //host(:port)',
es: 'Url del servidor Gotify - http(s): //host(:puerto)',
pl: 'Adres URL serwera Gotify - http(s): //host(:port)',
uk: 'URL-адреса сервера Gotify - http(s): //host(:port)',
'zh-cn': 'Gotify 服务器的 URL - http(s): //host(:port)',
},
'gotify adapter settings': {
en: 'Adapter settings for gotify',
Expand Down
117 changes: 91 additions & 26 deletions build/main.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading