feat(xx): disabled login screen in XX

botpress · Sep 21, 2018 · fb8ddeb · fb8ddeb
1 parent 460892a
commit fb8ddeb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/core/botpress/src/web/components/Authentication/index.jsx b/packages/core/botpress/src/web/components/Authentication/index.jsx
@@ -42,10 +42,12 @@ const ensureAuthenticated = WrappedComponent => {
 
     promptLogin = () => {
       const urlToken = _.get(this.props, 'location.query.token')
+      const pathname = this.context.router.history.location.pathname
 
-      if (location.pathname !== '/login' && !urlToken) {
-        this.context.router.history.push('/login?returnTo=' + this.context.router.history.location.pathname)
+      if (pathname !== '/login' && !urlToken) {
+        this.context.router.history.push('/login?returnTo=' + pathname)
       }
+
       window.botpressWebChat && window.botpressWebChat.sendEvent({ type: 'hide' })
     }
 

diff --git a/packages/core/botpress/src/web/views/Login/index.jsx b/packages/core/botpress/src/web/views/Login/index.jsx
@@ -7,6 +7,7 @@ import classnames from 'classnames'
 
 import styles from './style.scss'
 import { login } from '~/util/Auth'
+import { parseBotId } from '~/util'
 
 export default class LoginPage extends Component {
   static contextTypes = {
@@ -30,6 +31,13 @@ export default class LoginPage extends Component {
   componentDidMount() {
     const app = document.getElementById('app')
     app.className = classnames(app.className, 'bp-body-login')
+
+    if (window.BOTPRESS_XX) {
+      const botId = parseBotId()
+      const returnTo = this.props.location.query.returnTo || '/'
+      const finalDestination = `/studio/${botId}${returnTo}`
+      location.replace('/admin/login?returnTo=' + finalDestination)
+    }
   }
 
   handlePasswordChange = event => {
@@ -126,6 +134,10 @@ export default class LoginPage extends Component {
   }
 
   render() {
+    if (window.BOTPRESS_XX) {
+      return null // Authenticate using the /admin panel
+    }
+
     const hasChangedPassword = !!this.props.location.query.reset
     const hasAnError = !!this.state.error