opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1111 from dbeaver/CB-2545-fix-session-context

Browse Source 
CB-2545 fix web session context
This commit is contained in:
Alexander Skoblikov
2022-09-06 17:25:40 +03:00
committed by GitHub
parent 0db8559c07 bfd15751c7
commit 6299c6291b
2 changed files with 1 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SMWebSessionContext.java
-65
View File
@@ -1,65 +0,0 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2022 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cloudbeaver.model.session;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.auth.SMAuthSpace;
import org.jkiss.dbeaver.model.auth.SMAuthToken;
import org.jkiss.dbeaver.model.auth.SMSession;
import org.jkiss.dbeaver.model.auth.SMSessionContext;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
public class SMWebSessionContext implements SMSessionContext {
private final WebSession session;
private final SMSessionContext parentContext;
public SMWebSessionContext(SMSessionContext parentContext, WebSession session) {
this.parentContext = parentContext;
this.session = session;
}
@Nullable
@Override
public SMSession getSpaceSession(@NotNull DBRProgressMonitor monitor, @NotNull SMAuthSpace space, boolean open) throws DBException {
return parentContext.getSpaceSession(monitor, session.getSessionSpace(), open);
}
@Nullable
@Override
public SMSession findSpaceSession(@NotNull SMAuthSpace space) {
return parentContext.findSpaceSession(session.getSessionSpace());
}
@Override
public SMAuthToken[] getSavedTokens() {
return parentContext.getSavedTokens();
}
@Override
public void addSession(@NotNull SMSession session) {
parentContext.addSession(session);
}
@Override
public boolean removeSession(@NotNull SMSession session) {
return parentContext.removeSession(session);
}
}
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+1 -2
View File
@@ -352,10 +352,9 @@ public class WebSession extends AbstractSessionPersistent implements SMSession,
public VirtualProjectImpl createVirtualProject(RMProject project) {
// Do not filter data sources from user project
DataSourceFilter filter = project.getType() == RMProject.Type.USER ? x -> true : this::isDataSourceAccessible;
SMSessionContext projectSessionContext = new SMWebSessionContext(sessionAuthContext, this);
VirtualProjectImpl sessionProject = application.createProjectImpl(
project,
projectSessionContext,
sessionAuthContext,
this,
filter);
DBPDataSourceRegistry dataSourceRegistry = sessionProject.getDataSourceRegistry();