forked from verdaccio/verdaccio
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
) * fix: login without reload (verdaccio#678) (verdaccio#679) * fix: implements code review suggestions (verdaccio#914) * refactor: adds scope to the app * refactor: handles null value from localstorage for username * refactor: removes text type from <Input /> * refactor: replaces isNull with isNil * refactor: improves makeLogin method * refactor: adds error from api constant * fix: updates error using API_ERROR constant in tests * refactor: updates regex for moduleMapper in jest config
- Loading branch information
1 parent
b3886ac
commit 8ce8547
Showing
28 changed files
with
1,030 additions
and
660 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,165 @@ | ||
import React from 'react'; | ||
import React, {Component} from 'react'; | ||
import isNil from 'lodash/isNil'; | ||
import 'element-theme-default'; | ||
import {i18n} from 'element-react'; | ||
import locale from 'element-react/src/locale/lang/en'; | ||
|
||
import storage from './utils/storage'; | ||
import logo from './utils/logo'; | ||
import {makeLogin, isTokenExpire} from './utils/login'; | ||
|
||
import Header from './components/Header'; | ||
import Footer from './components/Footer'; | ||
import LoginModal from './components/Login'; | ||
|
||
i18n.use(locale); | ||
|
||
import Route from './router'; | ||
|
||
import './styles/main.scss'; | ||
import 'normalize.css'; | ||
|
||
export default class App extends React.Component { | ||
export default class App extends Component { | ||
state = { | ||
error: {}, | ||
logoUrl: '', | ||
user: {}, | ||
scope: (window.VERDACCIO_SCOPE) ? `${window.VERDACCIO_SCOPE}:` : '', | ||
showLoginModal: false, | ||
isUserLoggedIn: false | ||
}; | ||
|
||
constructor(props) { | ||
super(props); | ||
this.handleLogout = this.handleLogout.bind(this); | ||
this.toggleLoginModal = this.toggleLoginModal.bind(this); | ||
this.doLogin = this.doLogin.bind(this); | ||
this.loadLogo = this.loadLogo.bind(this); | ||
this.isUserAlreadyLoggedIn = this.isUserAlreadyLoggedIn.bind(this); | ||
} | ||
|
||
componentDidMount() { | ||
this.loadLogo(); | ||
this.isUserAlreadyLoggedIn(); | ||
} | ||
|
||
isUserAlreadyLoggedIn() { | ||
// checks for token validity | ||
const token = storage.getItem('token'); | ||
const username = storage.getItem('username'); | ||
|
||
if (isTokenExpire(token) || isNil(username)) { | ||
this.handleLogout(); | ||
} else { | ||
this.setState({ | ||
user: {username, token}, | ||
isUserLoggedIn: true | ||
}); | ||
} | ||
} | ||
|
||
async loadLogo() { | ||
const logoUrl = await logo(); | ||
this.setState({logoUrl}); | ||
} | ||
|
||
/** | ||
* Toogles the login modal | ||
* Required by: <LoginModal /> <Header /> | ||
*/ | ||
toggleLoginModal() { | ||
this.setState((prevState) => ({ | ||
showLoginModal: !prevState.showLoginModal, | ||
error: {} | ||
})); | ||
} | ||
|
||
/** | ||
* handles login | ||
* Required by: <Header /> | ||
*/ | ||
async doLogin(usernameValue, passwordValue) { | ||
const {username, token, error} = await makeLogin( | ||
usernameValue, | ||
passwordValue | ||
); | ||
|
||
if (username && token) { | ||
this.setState({ | ||
user: { | ||
username, | ||
token | ||
} | ||
}); | ||
storage.setItem('username', username); | ||
storage.setItem('token', token); | ||
// close login modal after successful login | ||
// set userLoggined to true | ||
this.setState({ | ||
isUserLoggedIn: true, | ||
showLoginModal: false | ||
}); | ||
} | ||
|
||
if (error) { | ||
this.setState({ | ||
user: {}, | ||
error | ||
}); | ||
} | ||
} | ||
|
||
/** | ||
* Logouts user | ||
* Required by: <Header /> | ||
*/ | ||
handleLogout() { | ||
storage.removeItem('username'); | ||
storage.removeItem('token'); | ||
this.setState({ | ||
user: {}, | ||
isUserLoggedIn: false | ||
}); | ||
} | ||
|
||
renderHeader() { | ||
const { | ||
logoUrl, | ||
user, | ||
scope, | ||
} = this.state; | ||
return <Header | ||
logo={logoUrl} | ||
username={user.username} | ||
scope={scope} | ||
toggleLoginModal={this.toggleLoginModal} | ||
handleLogout={this.handleLogout} | ||
/>; | ||
} | ||
|
||
renderLoginModal() { | ||
const { | ||
error, | ||
showLoginModal | ||
} = this.state; | ||
return <LoginModal | ||
visibility={showLoginModal} | ||
error={error} | ||
onChange={this.setUsernameAndPassword} | ||
onCancel={this.toggleLoginModal} | ||
onSubmit={this.doLogin} | ||
/>; | ||
} | ||
|
||
render() { | ||
const {isUserLoggedIn} = this.state; | ||
return ( | ||
<Route /> | ||
<div className="page-full-height"> | ||
{this.renderHeader()} | ||
{this.renderLoginModal()} | ||
<Route isUserLoggedIn={isUserLoggedIn} /> | ||
<Footer /> | ||
</div> | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,5 +41,9 @@ | |
background-color: $saltpan; | ||
} | ||
} | ||
|
||
.usernameField { | ||
margin-right: 10px; | ||
} | ||
} | ||
|
Oops, something went wrong.