Skip to content

Commit

Permalink
cleanup code
Browse files Browse the repository at this point in the history
  • Loading branch information
datalek committed Jul 27, 2015
1 parent e626715 commit 2b148ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 24 deletions.
19 changes: 4 additions & 15 deletions app/controllers/security/rest/RestCredentialsAuthController.scala
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
package controllers.security.rest

import utils.responses.rest._
import services.UserService
import scala.concurrent.Future
import play.api.mvc._
import play.api.libs.json._
import play.api.libs.concurrent.Execution.Implicits._

import com.mohiva.play.silhouette.api._
import com.mohiva.play.silhouette.api.exceptions.ConfigurationException
import com.mohiva.play.silhouette.api.services.AuthInfoService
import com.mohiva.play.silhouette.api.util.PasswordHasher
import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
import com.mohiva.play.silhouette.impl.authenticators.JWTAuthenticator
import com.mohiva.play.silhouette.impl.exceptions.IdentityNotFoundException
import com.mohiva.play.silhouette.api.Silhouette
import com.mohiva.play.silhouette.api.util.Credentials

import modules.cake.HeaderEnvironmentModule

import scala.concurrent.{ Future }

import security.models._
import models.users.User

Expand All @@ -28,18 +19,16 @@ import models.users.User
*/
class RestCredentialsAuthController extends Silhouette[User, JWTAuthenticator]
with HeaderEnvironmentModule {

/**
*
*/

// implicit format for transform json <==> Credential
implicit val restCredentialFormat = security.formatters.json.CredentialFormat.restFormat

/**
* Authenticates a user against the credentials provider.
*
* receive json like this:
* {
* "identifier": "...",
* "identifier": "...",
* "password": "..."
* }
*
Expand Down
12 changes: 3 additions & 9 deletions app/controllers/security/rest/RestSignUpController.scala
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
package controllers.security.rest

import utils.responses.rest._
import services.UserService
import play.api.mvc._
import play.api.libs.json._
import play.api.libs.concurrent.Execution.Implicits._
import com.mohiva.play.silhouette.api._
import com.mohiva.play.silhouette.api.services.AuthInfoService
import com.mohiva.play.silhouette.api.util.PasswordHasher
import com.mohiva.play.silhouette.impl.authenticators.JWTAuthenticator
import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
import com.mohiva.play.silhouette.impl.authenticators.JWTAuthenticator
import com.mohiva.play.silhouette.api.Silhouette
import modules.cake.{ HeaderEnvironmentModule, AvatarServiceModule }
import scala.concurrent.Future

import utils.responses.rest._
import security.models._
import models.users._

Expand All @@ -36,8 +30,8 @@ class RestSignUpController extends Silhouette[User, JWTAuthenticator]
*
* receive call with json like this:
* {
* "password": "",
* "identifier": "",
* "password": "",
* "identifier": "",
* "firstName": "",
* "lastName": "",
* "fullName": ""
Expand Down

0 comments on commit 2b148ac

Please sign in to comment.