Skip to content

Commit 8011f2b

Browse files
srinivasankavithavepanimas
authored andcommitted
Move the ssl config into the extensions config.
1 parent a83835c commit 8011f2b

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/main/com/intellij/lang/jsgraphql/ide/introspection/GraphQLIntrospectionService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,7 @@ public CloseableHttpClient createHttpClient() throws NoSuchAlgorithmException, K
196196
builder.setRedirectStrategy(LaxRedirectStrategy.INSTANCE);
197197

198198
if (PropertiesComponent.getInstance(myProject).isTrueValue(GRAPHQL_TRUST_ALL_HOSTS)) {
199-
Map<VirtualFile, GraphQLConfigData> configEntries =
200-
GraphQLConfigManager.getService(myProject).getConfigurationsByPath();
201-
GraphQLConfigSecurity sslConfig = configEntries.get(myProject.getBaseDir()).sslConfiguration;
199+
GraphQLConfigSecurity sslConfig = GraphQLConfigManager.getService(myProject).getSSLConfiguration();
202200
if (sslConfig != null) {
203201
if (sslConfig.clientCertificate.path == null || sslConfig.clientCertificateKey.path == null) {
204202
throw new RuntimeException("Path needs to be specified for the key and certificate");

src/main/com/intellij/lang/jsgraphql/ide/project/graphqlconfig/GraphQLConfigManager.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
package com.intellij.lang.jsgraphql.ide.project.graphqlconfig;
99

10+
import com.fasterxml.jackson.databind.ObjectMapper;
1011
import com.google.common.annotations.VisibleForTesting;
1112
import com.google.common.collect.Lists;
1213
import com.google.common.collect.Maps;
@@ -106,6 +107,7 @@ public class GraphQLConfigManager implements Disposable {
106107
);
107108

108109
public static final String ENDPOINTS_EXTENSION = "endpoints";
110+
public static final String SSL_EXTENSION = "sslConfiguration";
109111

110112
public static final String GRAPHQLCONFIG = ".graphqlconfig";
111113
public static final String GRAPHQLCONFIG_COMMENT = ".graphqlconfig=";
@@ -427,6 +429,18 @@ public List<GraphQLConfigEndpoint> getEndpoints(@NotNull VirtualFile virtualFile
427429
}
428430
}
429431

432+
@Nullable
433+
public GraphQLConfigSecurity getSSLConfiguration() {
434+
try {
435+
readLock.lock();
436+
Map<VirtualFile, GraphQLConfigData> configEntries = getService(myProject).getConfigurationsByPath();
437+
GraphQLConfigSecurity sslConfig = new ObjectMapper().convertValue(configEntries.get(myProject.getBaseDir()).extensions.get(SSL_EXTENSION), GraphQLConfigSecurity.class);
438+
return sslConfig;
439+
} finally {
440+
readLock.unlock();
441+
}
442+
}
443+
430444
void initialize() {
431445
final MessageBusConnection connection = myProject.getMessageBus().connect(this);
432446
connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() {

src/main/com/intellij/lang/jsgraphql/ide/project/graphqlconfig/model/GraphQLResolvedConfigData.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,4 @@ public class GraphQLResolvedConfigData {
2323
public List<String> excludes;
2424

2525
public Map<String, Object> extensions;
26-
27-
public GraphQLConfigSecurity sslConfiguration;
2826
}

0 commit comments

Comments
 (0)