Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-05 22:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5389 from ToolJet/merge-main/v2.0.4

Browse source 
Merge main/v2.0.4
This commit is contained in:
Sherfin Shamsudeen 2023-01-20 23:58:12 +05:30 committed by GitHub
commit dd0015fb39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.0.3
2.0.4

5
frontend/src/_services/authentication.service.js
View file

@ -206,7 +206,10 @@ function resetPassword(params) {
function logout() {
clearUser();
const loginPath = (window.public_config?.SUB_PATH || '/') + 'login';
window.location.href = loginPath + `?redirectTo=${window.location.pathname}`;
const pathname = window.public_config?.SUB_PATH
? window.location.pathname.replace(window.public_config?.SUB_PATH, '')
: window.location.pathname;
window.location.href = loginPath + `?redirectTo=${!(pathname.indexOf('/') === 0) ? '/' : ''}${pathname}`;
}
function clearUser() {

2
frontend/src/_styles/theme.scss
View file

@ -348,7 +348,7 @@ button {
}
.editor-sidebar {
height: 100%;
height: calc(100% - 45px);
position: fixed;
right: 0;
overflow-x: hidden;

2
plugins/packages/graphql/lib/index.ts
View file

@ -25,7 +25,7 @@ export default class GraphqlQueryService implements QueryService {
const json = {
query,
variables: variables || {},
variables: variables ? JSON.parse(variables) : {},
};
try {

2
plugins/packages/graphql/lib/types.ts
View file

@ -3,5 +3,5 @@ export type QueryOptions = {
operation: string;
query: string;
headers?: [string, string][];
variables?: object;
variables?: string;
};

2
server/.version
View file

@ -1 +1 @@
2.0.3
2.0.4

4
server/src/modules/auth/query-auth.guard.ts
View file

@ -1,6 +1,7 @@
import { ExecutionContext, Injectable } from '@nestjs/common';
import { AuthGuard } from '@nestjs/passport';
import { DataQueriesService } from '@services/data_queries.service';
import { maybeSetSubPath } from 'src/helpers/utils.helper';
@Injectable()
export class QueryAuthGuard extends AuthGuard('jwt') {
@ -12,7 +13,8 @@ export class QueryAuthGuard extends AuthGuard('jwt') {
const request = context.switchToHttp().getRequest();
// unauthenticated users should be able to to run queries of public apps
if (request.route.path === '/api/data_queries/:id/run') {
const apiUrl = maybeSetSubPath('/api/data_queries/:id/run');
if (request.route.path === apiUrl) {
const dataQuery = await this.dataQueriesService.findOne(request.params.id);
const app = dataQuery.dataSource.app;