Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GraphiQL Client Service Url #1753

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Fix GraphiQL Client Service Url #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6493015
Fix service url used in GraphiQL client
DimuthuMadushan Feb 15, 2024
d53fe76
Update the changelog
DimuthuMadushan Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "graphql"
version = "1.10.0"
version = "1.10.1"
authors = ["Ballerina"]
export=["graphql", "graphql.subgraph", "graphql.dataloader"]
keywords = ["gql", "network", "query", "service"]
Expand All @@ -16,11 +16,11 @@ graalvmCompatible = true
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "graphql-native"
version = "1.10.0"
path = "../native/build/libs/graphql-native-1.10.0.jar"
version = "1.10.1"
path = "../native/build/libs/graphql-native-1.10.1-SNAPSHOT.jar"

[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "graphql-commons"
version = "1.10.0"
path = "../commons/build/libs/graphql-commons-1.10.0.jar"
version = "1.10.1"
path = "../commons/build/libs/graphql-commons-1.10.1-SNAPSHOT.jar"
4 changes: 2 additions & 2 deletions ballerina/CompilerPlugin.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id = "graphql-compiler-plugin"
class = "io.ballerina.stdlib.graphql.compiler.GraphqlCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.10.0.jar"
path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.10.1-SNAPSHOT.jar"

[[dependency]]
path = "../commons/build/libs/graphql-commons-1.10.0.jar"
path = "../commons/build/libs/graphql-commons-1.10.1-SNAPSHOT.jar"
10 changes: 5 additions & 5 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ modules = [
[[package]]
org = "ballerina"
name = "cache"
version = "3.7.0"
version = "3.7.1"
dependencies = [
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -67,7 +67,7 @@ modules = [
[[package]]
org = "ballerina"
name = "graphql"
version = "1.10.0"
version = "1.10.1"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "file"},
Expand Down Expand Up @@ -97,7 +97,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.10.0"
version = "2.10.7"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -301,7 +301,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.2.0"
version = "1.2.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down Expand Up @@ -376,7 +376,7 @@ modules = [
[[package]]
org = "ballerina"
name = "websocket"
version = "2.10.0"
version = "2.10.1"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "constraint"},
Expand Down
3 changes: 3 additions & 0 deletions ballerina/constants.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ const PATH = "path";

// Constants related to the DataLoader
const DEFAULT_PREFETCH_METHOD_NAME_PREFIX = "pre";

// Localhost
const LOCALHOST = "localhost";
9 changes: 4 additions & 5 deletions ballerina/listener.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@ public class Listener {
}
self.wsListener = ();
self.graphiql = {};
string host = configuration.host;
int port = self.httpListener.getPort();
if configuration.secureSocket is () {
self.httpEndpoint = string `http://${host}:${port}`;
self.websocketEndpoint = string `ws://${host}:${port}`;
self.httpEndpoint = string `http://${LOCALHOST}:${port}`;
self.websocketEndpoint = string `ws://${LOCALHOST}:${port}`;
} else {
self.httpEndpoint = string `https://${host}:${port}`;
self.websocketEndpoint = string `wss://${host}:${port}`;
self.httpEndpoint = string `https://${LOCALHOST}:${port}`;
self.websocketEndpoint = string `wss://${LOCALHOST}:${port}`;
}
}

Expand Down
5 changes: 5 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Fixed
- [[#6067] Fix Returning Error while Accessing the Service via GraphiQL Client in Windows](https://github.com/ballerina-platform/ballerina-library/issues/6067)

## [1.10.0] - 2023-09-18

### Added
- [[#2998] Add `@deprecated` Directive Support for Output Object Defined using Record Types](https://github.com/ballerina-platform/ballerina-standard-library/issues/2998)
- [[#4586] Add Support for Printing GraphiQL Url to Stdout](https://github.com/ballerina-platform/ballerina-standard-library/issues/4586)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=1.10.0
version=1.10.1-SNAPSHOT
ballerinaLangVersion=2201.8.0

checkstylePluginVersion=10.12.0
Expand Down
Loading