document API account info and logout

manohar9999 · Jul 21, 2014 · 93ea6b0 · 93ea6b0
1 parent 6cce033
commit 93ea6b0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/app/controllers/Account.scala b/app/controllers/Account.scala
@@ -35,6 +35,16 @@ object Account extends LilaController {
       Ok(html.account.passwd(me, forms.passwd)).fuccess
   }
 
+  def info = Auth { implicit ctx =>
+    me =>
+      negotiate(
+        html = notFound,
+        api = apiVersion => fuccess {
+          Ok(Env.user.jsonView me me) as JSON
+        }
+      )
+  }
+
   def passwdApply = AuthBody { implicit ctx =>
     me =>
       implicit val req = ctx.body

diff --git a/app/controllers/Auth.scala b/app/controllers/Auth.scala
@@ -48,7 +48,12 @@ object Auth extends LilaController {
   }
 
   def logout = Open { implicit ctx =>
-    gotoLogoutSucceeded(ctx.req) fuccess
+    implicit val req = ctx.req
+    req.session get "sessionId" foreach lila.security.Store.delete
+    negotiate(
+      html = fuccess(Redirect(routes.Lobby.home)),
+      api = apiVersion => fuccess(Ok("ok") as JSON)
+    ) map (_ withCookies LilaCookie.newSession)
   }
 
   def signup = Open { implicit ctx =>
@@ -92,12 +97,4 @@ object Auth extends LilaController {
         )
       }
   }
-
-  private def gotoLogoutSucceeded(implicit req: RequestHeader) = {
-    req.session get "sessionId" foreach lila.security.Store.delete
-    logoutSucceeded(req) withCookies LilaCookie.newSession
-  }
-
-  private def logoutSucceeded(req: RequestHeader): Result =
-    Redirect(routes.Lobby.home)
 }
diff --git a/conf/routes b/conf/routes
@@ -52,6 +52,7 @@ GET   /account/close                   controllers.Account.close
 POST  /account/closeConfirm            controllers.Account.closeConfirm
 GET   /account/profile                 controllers.Account.profile
 POST  /account/profile                 controllers.Account.profileApply
+GET   /account/info                    controllers.Account.info
 
 # Site
 GET   /socket             controllers.Main.websocket

diff --git a/doc/mobile-api.md b/doc/mobile-api.md
@@ -206,6 +206,25 @@ Set-Cookie: lila2="3b5cc8c80f0af258a31dc4fd1b5381cabe7388c7-sessionId=80q7V5stkK
 }
 ```
 
+## Account info
+
+Requires authentication.
+
+```sh
+http GET en.l.org/account/info
+```
+
+Response: `200` OK
+See `user` object in `Login` section, above.
+
+## Logout
+
+```sh
+http GET en.l.org/logout
+```
+
+Response: `200` OK
+
 # WEBSOCKET
 
 ## Unique `clientId`