Merge branch 'master' into roman/plugins

klizhentas · Oct 14, 2017 · e0b9929 · e0b9929
2 parents 5dbda4f + 97e05b2
commit e0b9929
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/web/dist/app/app.a620be26d7b269646286.js → web/dist/app/app.4a662ad59690ea8b5b60.js b/web/dist/app/app.a620be26d7b269646286.js → web/dist/app/app.4a662ad59690ea8b5b60.js
@@ -4490,7 +4490,7 @@ webpackJsonp([0],[
 	    var auth2faType = _config2.default.getAuth2faType();
 
 	    if (fetchingInvite.isFailed) {
-	      return _react2.default.createElement(_msgPage.ErrorPage, { type: _msgPage.ErrorTypes.EXPIRED_INVITE });
+	      return _react2.default.createElement(_msgPage.ExpiredLink, null);
 	    }
 
 	    if (!invite) {
@@ -4827,7 +4827,7 @@ webpackJsonp([0],[
 	'use strict';
 
 	exports.__esModule = true;
-	exports.AccessDenied = exports.Failed = exports.NotFound = exports.InfoPage = exports.ErrorPage = exports.MSG_ERROR_ACCESS_DENIED = exports.MSG_ERROR_EXPIRED_INVITE_DETAILS = exports.MSG_ERROR_EXPIRED_INVITE = exports.MSG_ERROR_NOT_FOUND_DETAILS = exports.MSG_ERROR_NOT_FOUND = exports.MSG_ERROR_DEFAULT = exports.MSG_ERROR_LOGIN_FAILED = exports.MSG_INFO_LOGIN_SUCCESS = undefined;
+	exports.ExpiredLink = exports.AccessDenied = exports.Failed = exports.NotFound = exports.InfoPage = exports.ErrorPage = exports.MSG_ERROR_ACCESS_DENIED = exports.MSG_ERROR_EXPIRED_INVITE_DETAILS = exports.MSG_ERROR_EXPIRED_INVITE = exports.MSG_ERROR_NOT_FOUND_DETAILS = exports.MSG_ERROR_NOT_FOUND = exports.MSG_ERROR_DEFAULT = exports.MSG_ERROR_LOGIN_FAILED = exports.MSG_INFO_LOGIN_SUCCESS = undefined;
 
 	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /*
 	                                                                                                                                                                                                                                                                  Copyright 2015 Gravitational, Inc.
@@ -5036,6 +5036,7 @@ webpackJsonp([0],[
 	exports.NotFound = NotFound;
 	exports.Failed = Failed;
 	exports.AccessDenied = AccessDenied;
+	exports.ExpiredLink = ExpiredLink;
 
 /***/ }),
 /* 266 */

diff --git a/web/dist/app/styles.a620be26d7b269646286.js → web/dist/app/styles.4a662ad59690ea8b5b60.js b/web/dist/app/styles.a620be26d7b269646286.js → web/dist/app/styles.4a662ad59690ea8b5b60.js
diff --git a/web/dist/app/vendor.a620be26d7b269646286.js → web/dist/app/vendor.4a662ad59690ea8b5b60.js b/web/dist/app/vendor.a620be26d7b269646286.js → web/dist/app/vendor.4a662ad59690ea8b5b60.js
diff --git a/web/dist/index.html b/web/dist/index.html
@@ -11,5 +11,5 @@
   <link rel="shortcut icon" href="/web/app/favicon.ico"><link href="/web/app/vendor.042b9c25b63ae69f1746fe9c6d227b47.css" rel="stylesheet"></head>
   <body class="grv">
     <div id="app"></div>        
-  <script type="text/javascript" src="/web/app/vendor.a620be26d7b269646286.js"></script><script type="text/javascript" src="/web/app/styles.a620be26d7b269646286.js"></script><script type="text/javascript" src="/web/app/app.a620be26d7b269646286.js"></script></body>
+  <script type="text/javascript" src="/web/app/vendor.4a662ad59690ea8b5b60.js"></script><script type="text/javascript" src="/web/app/styles.4a662ad59690ea8b5b60.js"></script><script type="text/javascript" src="/web/app/app.4a662ad59690ea8b5b60.js"></script></body>
 </html>
diff --git a/web/src/app/components/msgPage.jsx b/web/src/app/components/msgPage.jsx
@@ -134,5 +134,6 @@ export {
   InfoPage,
   NotFound,
   Failed,
-  AccessDenied    
+  AccessDenied,
+  ExpiredLink
 };
diff --git a/web/src/app/components/user/invite.jsx b/web/src/app/components/user/invite.jsx
@@ -22,7 +22,7 @@ import cfg from 'app/config';
 import actions from 'app/flux/user/actions';
 import getters from 'app/flux/user/getters';
 import { Auth2faTypeEnum } from 'app/services/enums';
-import { ErrorPage, ErrorTypes } from './../msgPage';
+import { ExpiredLink } from './../msgPage';
 import { TeleportLogo } from './../icons.jsx';
 import GoogleAuthInfo from './googleAuthLogo';
 import { ErrorMessage } from './items';
@@ -46,11 +46,11 @@ export class Invite extends React.Component {
   }
 
   render() {
-    let {fetchingInvite, invite, attemp} = this.props;                
-    let auth2faType = cfg.getAuth2faType();
+    const { fetchingInvite, invite, attemp } = this.props;                
+    const auth2faType = cfg.getAuth2faType();
 
     if(fetchingInvite.isFailed){
-      return <ErrorPage type={ErrorTypes.EXPIRED_INVITE}/>
+      return <ExpiredLink/>
     }
 
     if(!invite) {
@@ -235,8 +235,8 @@ export class InviteInputForm extends React.Component {
   }
 
   render() {            
-    let { isFailed, message } = this.props.attemp;        
-    let $error = isFailed ? <ErrorMessage message={message} /> : null;
+    const { isFailed, message } = this.props.attemp;        
+    const $error = isFailed ? <ErrorMessage message={message} /> : null;
     return (
       <form ref="form" className="grv-invite-input-form">
         <h3> Get started with Teleport </h3>
@@ -286,7 +286,7 @@ const Invite2faData = ({auth2faType, qr}) => {
 }
 
 const InviteFooter = ({auth2faType}) => {
-  let $googleHint = auth2faType === Auth2faTypeEnum.OTP ? <GoogleAuthInfo /> : null;
+  const $googleHint = auth2faType === Auth2faTypeEnum.OTP ? <GoogleAuthInfo /> : null;
   return (
     <div>
       {$googleHint}