Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
yuth authored Aug 22, 2018
2 parents 5ebbe64 + cd92e9f commit aca1b58
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 12 deletions.
8 changes: 8 additions & 0 deletions packages/amazon-cognito-identity-js/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="2.0.22-unstable.6"></a>
## [2.0.22-unstable.6](https://github.com/aws/aws-amplify/compare/amazon-cognito-identity-js@[email protected]) (2018-08-21)




**Note:** Version bump only for package amazon-cognito-identity-js

<a name="2.0.22-unstable.5"></a>
## [2.0.22-unstable.5](https://github.com/aws/aws-amplify/compare/amazon-cognito-identity-js@[email protected]) (2018-08-21)

Expand Down
2 changes: 1 addition & 1 deletion packages/amazon-cognito-identity-js/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "amazon-cognito-identity-js",
"description": "Amazon Cognito Identity Provider JavaScript SDK",
"version": "2.0.22-unstable.5",
"version": "2.0.22-unstable.6",
"author": {
"name": "Amazon Web Services",
"email": "[email protected]",
Expand Down
8 changes: 8 additions & 0 deletions packages/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.7-unstable.6"></a>
## [1.0.7-unstable.6](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2018-08-21)




**Note:** Version bump only for package @aws-amplify/api

<a name="1.0.7-unstable.5"></a>
## [1.0.7-unstable.5](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2018-08-21)

Expand Down
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/api",
"version": "1.0.7-unstable.5",
"version": "1.0.7-unstable.6",
"description": "Api category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib/index.js",
Expand Down Expand Up @@ -50,7 +50,7 @@
"webpack": "^3.5.5"
},
"dependencies": {
"@aws-amplify/auth": "^1.0.7-unstable.5",
"@aws-amplify/auth": "^1.0.7-unstable.6",
"@aws-amplify/cache": "^1.0.6-unstable.2",
"@aws-amplify/core": "^1.0.6-unstable.1",
"@types/zen-observable": "^0.5.3",
Expand Down
11 changes: 11 additions & 0 deletions packages/auth/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.7-unstable.6"></a>
## [1.0.7-unstable.6](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2018-08-21)


### Bug Fixes

* **@aws-amplify/auth:** check if window object exists for browser usage ([17d6a3d](https://github.com/aws/aws-amplify/commit/17d6a3d))




<a name="1.0.7-unstable.5"></a>
## [1.0.7-unstable.5](https://github.com/aws/aws-amplify/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2018-08-21)

Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/auth",
"version": "1.0.7-unstable.5",
"version": "1.0.7-unstable.6",
"description": "Auth category of aws-amplify",
"main": "./lib/index.js",
"module": "./lib/index.js",
Expand Down Expand Up @@ -53,7 +53,7 @@
"@aws-amplify/cache": "^1.0.6-unstable.2",
"@aws-amplify/core": "^1.0.6-unstable.1",
"amazon-cognito-auth-js": "^1.1.9",
"amazon-cognito-identity-js": "^2.0.22-unstable.5"
"amazon-cognito-identity-js": "^2.0.22-unstable.6"
},
"jest": {
"transform": {
Expand Down
4 changes: 4 additions & 0 deletions packages/auth/src/Auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ export default class AuthClass {
logger.debug('user already logged in');
}).catch(e => {
logger.debug('not logged in, try to parse the url');
if (!window || !window.location) {
logger.debug('not in the browser');
return;
}
const curUrl = window.location.href;
this._cognitoAuthClient.parseCognitoWebResponse(curUrl);
});
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify-react-native/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.7-unstable.6"></a>
## [1.0.7-unstable.6](https://github.com/aws/aws-amplify/compare/aws-amplify-react-native@[email protected]) (2018-08-21)




**Note:** Version bump only for package aws-amplify-react-native

<a name="1.0.7-unstable.5"></a>
## [1.0.7-unstable.5](https://github.com/aws/aws-amplify/compare/aws-amplify-react-native@[email protected]) (2018-08-21)

Expand Down
4 changes: 2 additions & 2 deletions packages/aws-amplify-react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-amplify-react-native",
"version": "1.0.7-unstable.5",
"version": "1.0.7-unstable.6",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "dist/index.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
"rimraf": "^2.6.2"
},
"dependencies": {
"aws-amplify": "^1.0.7-unstable.5",
"aws-amplify": "^1.0.7-unstable.6",
"axios": "^0.17.1",
"babel-preset-es2015": "^6.24.1"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.7-unstable.6"></a>
## [1.0.7-unstable.6](https://github.com/aws/aws-amplify/compare/[email protected]@1.0.7-unstable.6) (2018-08-21)




**Note:** Version bump only for package aws-amplify-react

<a name="1.0.7-unstable.5"></a>
## [1.0.7-unstable.5](https://github.com/aws/aws-amplify/compare/[email protected]@1.0.7-unstable.5) (2018-08-21)

Expand Down
4 changes: 2 additions & 2 deletions packages/aws-amplify-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-amplify-react",
"version": "1.0.7-unstable.5",
"version": "1.0.7-unstable.6",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -52,7 +52,7 @@
}
},
"dependencies": {
"aws-amplify": "^1.0.7-unstable.5",
"aws-amplify": "^1.0.7-unstable.6",
"qrcode.react": "^0.8.0",
"regenerator-runtime": "^0.11.1"
}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-amplify/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

<a name="1.0.7-unstable.6"></a>
## [1.0.7-unstable.6](https://github.com/aws/aws-amplify/compare/[email protected]@1.0.7-unstable.6) (2018-08-21)




**Note:** Version bump only for package aws-amplify

<a name="1.0.7-unstable.5"></a>
## [1.0.7-unstable.5](https://github.com/aws/aws-amplify/compare/[email protected]@1.0.7-unstable.5) (2018-08-21)

Expand Down
6 changes: 3 additions & 3 deletions packages/aws-amplify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-amplify",
"version": "1.0.7-unstable.5",
"version": "1.0.7-unstable.6",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "./lib/index.js",
"typings": "./lib/index.d.ts",
Expand Down Expand Up @@ -48,8 +48,8 @@
},
"dependencies": {
"@aws-amplify/analytics": "^1.0.6-unstable.2",
"@aws-amplify/api": "^1.0.7-unstable.5",
"@aws-amplify/auth": "^1.0.7-unstable.5",
"@aws-amplify/api": "^1.0.7-unstable.6",
"@aws-amplify/auth": "^1.0.7-unstable.6",
"@aws-amplify/cache": "^1.0.6-unstable.2",
"@aws-amplify/core": "^1.0.6-unstable.1",
"@aws-amplify/interactions": "^1.0.6-unstable.1",
Expand Down

0 comments on commit aca1b58

Please sign in to comment.