From 34461c51c914e3cc8621f95d78e9827d161dfce5 Mon Sep 17 00:00:00 2001 From: Manuel Iglesias Date: Fri, 9 Feb 2018 15:41:53 -0800 Subject: [PATCH 1/2] Update x-amz-user-agent header --- packages/aws-appsync/CHANGELOG.md | 3 +++ packages/aws-appsync/src/link/auth-link.js | 6 ++++-- packages/aws-appsync/src/platform.js | 3 +++ packages/aws-appsync/src/platform.native.js | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 packages/aws-appsync/src/platform.js create mode 100644 packages/aws-appsync/src/platform.native.js diff --git a/packages/aws-appsync/CHANGELOG.md b/packages/aws-appsync/CHANGELOG.md index a5e0ecc1..0a293d08 100644 --- a/packages/aws-appsync/CHANGELOG.md +++ b/packages/aws-appsync/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### vNext +- Update x-amz-user-agent header [PR#XX](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/XX) + ### 1.0.9 - Fix AWS_IAM credentials fetching [PR#38](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/38) - Preserve the observer associated with an existing topic [PR#37](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/37) diff --git a/packages/aws-appsync/src/link/auth-link.js b/packages/aws-appsync/src/link/auth-link.js index d949683e..ddd0991a 100644 --- a/packages/aws-appsync/src/link/auth-link.js +++ b/packages/aws-appsync/src/link/auth-link.js @@ -13,11 +13,13 @@ import { print } from 'graphql/language/printer'; import aws4 from './signer/signer'; import * as Url from 'url'; -var packageInfo = require("../../package.json"); +import { userAgent } from "../platform"; + +const packageInfo = require("../../package.json"); const SERVICE = 'appsync'; const USER_AGENT_HEADER = 'x-amz-user-agent'; -const USER_AGENT = `aws-appsync-sdk-js/${packageInfo.version}`; +const USER_AGENT = `aws-amplify/${packageInfo.version}${userAgent && ' '}${userAgent}`; export const AUTH_TYPE = { NONE: 'NONE', diff --git a/packages/aws-appsync/src/platform.js b/packages/aws-appsync/src/platform.js new file mode 100644 index 00000000..cb528789 --- /dev/null +++ b/packages/aws-appsync/src/platform.js @@ -0,0 +1,3 @@ +const userAgent = ''; + +export { userAgent }; diff --git a/packages/aws-appsync/src/platform.native.js b/packages/aws-appsync/src/platform.native.js new file mode 100644 index 00000000..51c52c8c --- /dev/null +++ b/packages/aws-appsync/src/platform.native.js @@ -0,0 +1,3 @@ +const userAgent = 'react-native'; + +export { userAgent }; From 50d0dac11ea08231ba3a80a03a7249d35df786f4 Mon Sep 17 00:00:00 2001 From: Manuel Iglesias Date: Fri, 9 Feb 2018 15:44:39 -0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- packages/aws-appsync/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-appsync/CHANGELOG.md b/packages/aws-appsync/CHANGELOG.md index 0a293d08..42174d4a 100644 --- a/packages/aws-appsync/CHANGELOG.md +++ b/packages/aws-appsync/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ### vNext -- Update x-amz-user-agent header [PR#XX](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/XX) +- Update x-amz-user-agent header [PR#40](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/40) ### 1.0.9 - Fix AWS_IAM credentials fetching [PR#38](https://github.com/awslabs/aws-mobile-appsync-sdk-js/pull/38)