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

refactor(core-connections): CB-1252 move credentials filling logic to loadAuthModel

Browse Source
This commit is contained in:
Naumov Alexey
2021-09-14 18:41:25 +03:00
parent b0b68f1445
commit b83fcc90bb
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-connections/src/DatabaseAuthDialog/DBAuthDialogController.ts
+22 -31
View File
@@ -56,7 +56,6 @@ export class DBAuthDialogController implements IInitializableController, IDestru
this.close = onClose;
await this.loadAuthModel();
this.fillCredentials();
this.loadDrivers();
this.configured = true;
@@ -90,35 +89,6 @@ export class DBAuthDialogController implements IInitializableController, IDestru
}
};
private fillCredentials() {
const connection = this.connectionInfoResource.get(this.connectionId);
if (!connection) {
return;
}
if (connection.authNeeded) {
const property = connection.authProperties?.find(property => property.id === USER_NAME_PROPERTY_ID);
if (property?.value) {
this.config.credentials[USER_NAME_PROPERTY_ID] = property.value;
}
}
for (const id of this.networkHandlers) {
const handler = connection.networkHandlersConfig.find(handler => handler.id === id);
if (handler?.userName) {
this.config.networkHandlersConfig.push({
id: handler.id,
userName: handler.userName,
password: handler.password,
savePassword: handler.savePassword,
});
}
}
}
private getConfig() {
const config: ConnectionInitConfig = {
id: this.connectionId,
@@ -138,7 +108,28 @@ export class DBAuthDialogController implements IInitializableController, IDestru
private async loadAuthModel() {
try {
await this.connectionInfoResource.load(this.connectionId, ['includeAuthProperties', 'customIncludeNetworkHandlerCredentials']);
const connection = await this.connectionInfoResource.load(this.connectionId, ['includeAuthProperties', 'customIncludeNetworkHandlerCredentials']);
if (connection.authNeeded) {
const property = connection.authProperties?.find(property => property.id === USER_NAME_PROPERTY_ID);
if (property?.value) {
this.config.credentials[USER_NAME_PROPERTY_ID] = property.value;
}
}
for (const id of this.networkHandlers) {
const handler = connection.networkHandlersConfig.find(handler => handler.id === id);
if (handler?.userName) {
this.config.networkHandlersConfig.push({
id: handler.id,
userName: handler.userName,
password: handler.password,
savePassword: handler.savePassword,
});
}
}
} catch (exception) {
this.notificationService.logException(exception, 'Can\'t load auth model');
}