Skip to content

Commit

Permalink
Merge branch 'master' into s3_image_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
powerful23 authored Jan 17, 2018
2 parents d5a7515 + e235705 commit 1cdf05a
Show file tree
Hide file tree
Showing 21 changed files with 93 additions and 71 deletions.
52 changes: 34 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
# Changelog for AWS Amplify
<!--LATEST=0.1.30-->
<!--LATEST=0.1.35-->
<!--ENTRYINSERT-->

## 12/22/2017
## 01/16/2018
* aws-amplify - v0.1.35
* Improvements to Typescript developer experience. #155
* fix RN props #158
* delete ama #142
* aws-amplify-react-native - v0.1.23
* fix RN props #158

## 01/12/2018
* aws-amplify-react-native - v0.1.22
* bug fix: fix aws-sdk package
## 01/11/2018
* aws-amplify - v0.1.34
* bug fix: fix aws-sdk package
* bug fix: update main script

* aws-amplify - v0.1.30
## 01/09/2018

* aws-amplify - v0.1.32
* aws-amplify-react - v0.1.30
* aws-amplify-react-native - v0.1.20
* aws-ampliify-react-native - v0.1.21

* feature: Federated Authentication with Google and Facebook in React
* bugFix: Federated auth token fixes
* feature: Automatic S3 Analytics tracking with React components
* feature: Increase unit test coverage
* feature: Jest snapshot update
* feature: Update default auth theme
* feature: Export Signer interface for 3rd party HttpModules
* bugFix: aws-amplify-react-native: Update pinpoint region in React Native
* feature: Better support for guest (Unauthenticated) credentials
* bugFix: documentation: Fix broken link (to authentication)
* Enhancement: remove aws-sdk-mobile-analytics dependency from package.json

## 01/08/2018

Expand All @@ -33,10 +40,19 @@
* Bug fix: Doc syntax error fix
* Bug fix: Add charset on default header for API

## 01/09/2018
## 12/22/2017

* aws-amplify - v0.1.32
* aws-amplify - v0.1.30
* aws-amplify-react - v0.1.30
* aws-ampliify-react-native - v0.1.21
* aws-amplify-react-native - v0.1.20

* Enhancement: remove aws-sdk-mobile-analytics dependency from package.json
* feature: Federated Authentication with Google and Facebook in React
* bugFix: Federated auth token fixes
* feature: Automatic S3 Analytics tracking with React components
* feature: Increase unit test coverage
* feature: Jest snapshot update
* feature: Update default auth theme
* feature: Export Signer interface for 3rd party HttpModules
* bugFix: aws-amplify-react-native: Update pinpoint region in React Native
* feature: Better support for guest (Unauthenticated) credentials
* bugFix: documentation: Fix broken link (to authentication)
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import VerifyContact from './VerifyContact';
import SignUp from './SignUp';
import ConfirmSignUp from './ConfirmSignUp';
import ForgotPassword from './ForgotPassword';
import RequireNewPassword from './RequireNewPassword';
import Greetings from './Greetings';

const logger = new Logger('Authenticator');
Expand Down Expand Up @@ -57,7 +58,7 @@ export default class Authenticator extends React.Component {
super(props);
this.state = {
authState: props.authState || 'signIn',
authDate: props.authData
authData: props.authData
};

this.handleStateChange = this.handleStateChange.bind(this);
Expand Down Expand Up @@ -106,7 +107,7 @@ export default class Authenticator extends React.Component {

const { hideDefault } = this.props;
const props_children = this.props.children || [];
const default_children = [React.createElement(SignIn, null), React.createElement(ConfirmSignIn, null), React.createElement(VerifyContact, null), React.createElement(SignUp, null), React.createElement(ConfirmSignUp, null), React.createElement(ForgotPassword, null), React.createElement(Greetings, null)];
const default_children = [React.createElement(SignIn, null), React.createElement(ConfirmSignIn, null), React.createElement(VerifyContact, null), React.createElement(SignUp, null), React.createElement(ConfirmSignUp, null), React.createElement(ForgotPassword, null), React.createElement(RequireNewPassword, null), React.createElement(Greetings, null)];
const children = (hideDefault ? [] : default_children).concat(props_children).map((child, index) => {
return React.cloneElement(child, {
key: 'auth_piece_' + index,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default class RequireNewPassword extends AuthPiece {
React.createElement(Button, {
title: I18n.get('Change Password'),
onPress: this.change,
disabled: !this.state.code
disabled: !this.state.password
})
),
React.createElement(Footer, { theme: theme, onStateChange: this.changeState }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ export default class VerifyContact extends AuthPiece {
selectedValue: this.state.pickAttr,
onValueChange: (value, index) => this.setState({ pickAttr: value })
},
email ? React.createElement(Picker.Item, { label: 'Email', value: 'email' }) : null,
phone_number ? React.createElement(Picker.Item, { label: 'Phone Number', value: 'phone_number' }) : null
email ? React.createElement(Picker.Item, { label: I18n.get('Email'), value: 'email' }) : null,
phone_number ? React.createElement(Picker.Item, { label: I18n.get('Phone Number'), value: 'phone_number' }) : null
),
React.createElement(Button, {
title: I18n.get('Verify'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ import ConfirmSignIn from './ConfirmSignIn';
import SignUp from './SignUp';
import ConfirmSignUp from './ConfirmSignUp';
import ForgotPassword from './ForgotPassword';
import RequireNewPassword from './RequireNewPassword';
import VerifyContact from './VerifyContact';
import Greetings from './Greetings';

const logger = new Logger('auth components');

export { Authenticator, AuthPiece, SignIn, ConfirmSignIn, SignUp, ConfirmSignUp, ForgotPassword, VerifyContact, Greetings };
export { Authenticator, AuthPiece, SignIn, ConfirmSignIn, SignUp, ConfirmSignUp, ForgotPassword, RequireNewPassword, VerifyContact, Greetings };

export function withAuthenticator(Comp, includeGreetings = false) {
class Wrapper extends React.Component {
Expand Down
12 changes: 6 additions & 6 deletions packages/aws-amplify-react-native/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 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": "0.1.22",
"version": "0.1.23",
"description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.",
"main": "dist/index.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class Authenticator extends React.Component {
super(props);
this.state = {
authState: props.authState || 'signIn',
authDate: props.authData
authData: props.authData
};

this.handleStateChange = this.handleStateChange.bind(this);
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/dist/aws-amplify.js
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ exports.JS = JS_1.default;
var Signer_1 = __webpack_require__(104);
exports.Signer = Signer_1.default;
exports.Constants = {
userAgent: 'aws-amplify/0.1.22 js'
userAgent: 'aws-amplify/0.1.x js'
};
var logger = new Logger_1.ConsoleLogger('Common');
if (Facet_1.AWS['util']) {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/dist/aws-amplify.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/aws-amplify/dist/aws-amplify.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/aws-amplify/dist/aws-amplify.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions packages/aws-amplify/lib/Common/Logger/logger-interface.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export interface Logger {
debug(msg: string): void;
info(msg: string): void;
warn(msg: string): void;
error(msg: string): void;
}
export default Logger;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/aws-amplify/lib/Common/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/aws-amplify/lib/Common/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 11 additions & 13 deletions packages/aws-amplify/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/aws-amplify/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "aws-amplify",
"version": "0.1.34",
"version": "0.1.35",
"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",
"scripts": {
"test": "jest --coverage",
"build-with-test": "npm run clean && npm test && tsc && webpack",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/src/Common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export { default as JS } from './JS';
export { default as Signer } from './Signer';

export const Constants = {
userAgent: 'aws-amplify/0.1.22 js'
userAgent: 'aws-amplify/0.1.x js'
};

const logger = new Logger('Common');
Expand Down

0 comments on commit 1cdf05a

Please sign in to comment.