Skip to content

Commit

Permalink
Oauth2 (#2974)
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox authored Mar 1, 2025
1 parent 78ce292 commit 17bd4c3
Show file tree
Hide file tree
Showing 54 changed files with 1,317 additions and 772 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ The icons may not be reused in other projects without the proper flaticon licens
- (@GermanBluefox) Used socket classes with TypeScript
- (@GermanBluefox) Added support for `plugins.sentry.enabled` flag in adapter
- (@GermanBluefox) Updated packages
- (@GermanBluefox) Corrected stopping of running admin instances
- (@GermanBluefox) Added OAuth2 authentication
- (@GermanBluefox) Corrected the focus lost by editing of tables in JSON Config
- (@GermanBluefox) Added the renaming of objects via context menu in Object Browser

### 7.4.21 (2025-02-07)
- (@GermanBluefox) Corrected the device manager in `hm-rpc` and other adapters
Expand Down
163 changes: 133 additions & 30 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"scripts": {
"build": "npm run clean && lerna run build",
"clean": "lerna run clean",
"install-monorepo": "npm i && npm i -w packages/adapter-react-v5 && npm i -w packages/dm-gui-components && npm i -w packages/jsonConfig && npm i -w packages/admin",
"install-monorepo": "npm i && npm i -w packages/adapter-react-v5 && npm i -w packages/dm-gui-components && npm i -w packages/jsonConfig && npm i -w packages/admin && cd packages/admin/src-admin && npm i -f",
"npm": "npm run install-monorepo",
"start": "npm run start -w packages/admin",
"release": "release-script -y --noPush --no-update-lockfile",
Expand Down
4 changes: 2 additions & 2 deletions packages/adapter-react-v5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@emotion/styled": "^11.14.0",
"@iobroker/js-controller-common": "^7.0.6",
"@iobroker/js-controller-common-db": "^7.0.6",
"@iobroker/socket-client": "^4.0.1",
"@iobroker/socket-client": "4.0.21",
"@iobroker/types": "^7.0.6",
"@mui/icons-material": "^6.4.5",
"@mui/material": "^6.4.5",
Expand All @@ -69,7 +69,7 @@
"react-color": "^2.19.3",
"react-colorful": "^5.6.1",
"react-cropper": "^2.3.3",
"react-dropzone": "^14.3.5",
"react-dropzone": "^14.3.6",
"react-inlinesvg": "^4.2.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/adapter-react-v5/src/Components/ComplexCron.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export class ComplexCron extends Component<ComplexCronProps, ComplexCronState> {
let select;
if (this.state.modes[type] === null) {
select = every ? 'every' : everyN ? 'everyN' : 'specific';
const modes = JSON.parse(JSON.stringify(this.state.modes));
const modes: CronProps = JSON.parse(JSON.stringify(this.state.modes));
modes[type] = select;
setTimeout(() => this.setState({ modes }, () => this.recalcCron()), 100);
return null;
Expand All @@ -367,8 +367,8 @@ export class ComplexCron extends Component<ComplexCronProps, ComplexCronState> {
style={{ ...styles.periodSelect, verticalAlign: 'bottom' }}
value={select}
onChange={e => {
const modes = JSON.parse(JSON.stringify(this.state.modes));
modes[type] = e.target.value;
const modes: CronProps = JSON.parse(JSON.stringify(this.state.modes));
modes[type] = e.target.value as string;
if (e.target.value === 'every') {
this.setCronAttr(type, '*', modes);
} else if (e.target.value === 'everyN') {
Expand Down
4 changes: 2 additions & 2 deletions packages/adapter-react-v5/src/Components/FileBrowser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2257,7 +2257,7 @@ export class FileBrowserClass extends Component<FileBrowserProps, FileBrowserSta
const adapter = parts.shift();
void this.props.socket.deleteFolder(adapter || '', parts.join('/')).then(() => {
// remove this folder
const folders = JSON.parse(JSON.stringify(this.state.folders));
const folders: Folders = JSON.parse(JSON.stringify(this.state.folders));
delete folders[item.id];
// delete folder from parent item
const parentId = getParentDir(item.id);
Expand Down Expand Up @@ -2418,7 +2418,7 @@ export class FileBrowserClass extends Component<FileBrowserProps, FileBrowserSta
// used in tabs/Files
// eslint-disable-next-line react/no-unused-class-component-methods
updateItemsAcl(info: FolderOrFileItem[]): void {
this.cacheFolders = this.cacheFolders || JSON.parse(JSON.stringify(this.state.folders));
this.cacheFolders ||= JSON.parse(JSON.stringify(this.state.folders));
let changed;

info.forEach(it => {
Expand Down
Loading

0 comments on commit 17bd4c3

Please sign in to comment.