From cc8e89936f2fd13bebd9308e342606128b36cbb1 Mon Sep 17 00:00:00 2001 From: Everett Sochowski Date: Tue, 11 Jun 2013 16:07:44 +0200 Subject: [PATCH] Remove dependency on api-side models when displaying list of authorised accounts --- .../main/scala/code/snippet/AccountsOverview.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/MavLift/src/main/scala/code/snippet/AccountsOverview.scala b/MavLift/src/main/scala/code/snippet/AccountsOverview.scala index fcf0a143..fb8a4d87 100644 --- a/MavLift/src/main/scala/code/snippet/AccountsOverview.scala +++ b/MavLift/src/main/scala/code/snippet/AccountsOverview.scala @@ -34,8 +34,6 @@ package code.snippet import net.liftweb.util.Helpers._ import net.liftweb.common.Full -import code.model.dataAccess.OBPUser -import code.model.{User, BankAccount, Public, Owner, Board, Authorities, Team, OurNetwork} import net.liftweb.http.SHtml import scala.xml.Text import net.liftweb.http.js.JsCmds.Noop @@ -49,6 +47,7 @@ import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JBool import net.liftweb.common.Loggable import code.lib.ObpAPI +import code.lib.OAuthClient class AccountsOverview extends Loggable { @@ -105,7 +104,7 @@ class AccountsOverview extends Loggable { } def authorisedAccounts = { - def loggedInSnippet(user: User) = { + def loggedInSnippet = { ".accountList" #> privateAccountJsons.map{case (bankId, accountJson) => { //TODO: It might be nice to ensure that the same view is picked each time the page loads @@ -127,10 +126,8 @@ class AccountsOverview extends Loggable { ".accountList" #> SHtml.span(Text("You don't have access to any authorised account"), Noop,("id","accountsMsg")) } - OBPUser.currentUser match { - case Full(u) => loggedInSnippet(u) - case _ => loggedOutSnippet - } + if(OAuthClient.loggedInAt(OAuthClient.defaultProvider)) loggedInSnippet //TODO: Support multiple providers + else loggedOutSnippet } } \ No newline at end of file