merge from master

CHANGELOG.md

@@ -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
 
@@ -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)

packages/aws-amplify-react-native/dist/components/auth/Authenticator.js

@@ -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');
@@ -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);
@@ -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,

packages/aws-amplify-react-native/dist/components/auth/RequireNewPassword.js

@@ -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 }),

packages/aws-amplify-react-native/dist/components/auth/VerifyContact.js

@@ -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'),

packages/aws-amplify-react-native/dist/components/auth/index.js

@@ -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 {

packages/aws-amplify-react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-amplify-react-native",
-  "version": "0.1.21",
+  "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": {
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "amazon-cognito-identity-js": "^1.25.0",
-    "aws-sdk": "^2.145.0",
+    "aws-sdk": "2.177.0",
     "aws-sdk-mobile-analytics": "^0.9.2",
     "axios": "^0.17.1",
     "babel-preset-es2015": "^6.24.1"

packages/aws-amplify-react-native/src/components/auth/Authenticator.js

@@ -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');
@@ -59,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);
@@ -111,6 +112,7 @@ export default class Authenticator extends React.Component {
             <SignUp/>,
             <ConfirmSignUp/>,
             <ForgotPassword/>,
+            <RequireNewPassword />,
             <Greetings/>
         ];
         const children = (hideDefault? [] : default_children)

packages/aws-amplify-react-native/src/components/auth/RequireNewPassword.js

@@ -73,7 +73,7 @@ export default class RequireNewPassword extends AuthPiece {
                     <Button
                         title={I18n.get('Change Password')}
                         onPress={this.change}
-                        disabled={!this.state.code}
+                        disabled={!this.state.password}
                     />
                 </View>
                 <Footer theme={theme} onStateChange={this.changeState}/>

packages/aws-amplify-react-native/src/components/auth/VerifyContact.js

@@ -94,8 +94,8 @@ export default class VerifyContact extends AuthPiece {
                     selectedValue={this.state.pickAttr}
                     onValueChange={(value, index) => this.setState({pickAttr: value})}
                 >
-                    { email? <Picker.Item label="Email" value="email"/> : null }
-                    { phone_number? <Picker.Item label="Phone Number" value="phone_number"/> : null }
+                    { email? <Picker.Item label={I18n.get('Email')} value="email"/> : null }
+                    { phone_number? <Picker.Item label={I18n.get('Phone Number')} value="phone_number"/> : null }
                 </Picker>
                 <Button
                     title={I18n.get('Verify')}

packages/aws-amplify-react-native/src/components/auth/index.js

@@ -23,6 +23,7 @@ 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';
 
@@ -36,6 +37,7 @@ export {
     SignUp,
     ConfirmSignUp,
     ForgotPassword,
+    RequireNewPassword,
     VerifyContact,
     Greetings
 };