From b417686bcff3d4794e04a2d0d0b8f7ee796a5c3e Mon Sep 17 00:00:00 2001
From: Everett Sochowski <everett@tesobe.com>
Date: Tue, 11 Jun 2013 11:35:06 +0200
Subject: [PATCH] Update urls to fit with revised v1.2 url scheme

---
 MavLift/src/main/scala/code/lib/ObpAPI.scala | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/MavLift/src/main/scala/code/lib/ObpAPI.scala b/MavLift/src/main/scala/code/lib/ObpAPI.scala
index 4a661f7f..11b2e3cc 100644
--- a/MavLift/src/main/scala/code/lib/ObpAPI.scala
+++ b/MavLift/src/main/scala/code/lib/ObpAPI.scala
@@ -57,20 +57,20 @@ object ObpAPI {
       fromDate.map(f => Header("obp_from_date", dateFormat.format(f))).toList ::: toDate.map(t => Header("obp_to_date", dateFormat.format(t))).toList :::
       sortDirection.map(s => Header("obp_sort_direction", s.value)).toList ::: Nil
     
-    ObpGet("/banks/" + bankId + "/accounts/" + accountId + "/" + viewId +
+    ObpGet("/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/" + urlEncode(viewId) +
               "/transactions", headers).flatMap(x => x.extractOpt[TransactionsJson])
   }
   
   def publicAccounts(bankId : String) : Box[BarebonesAccountsJson] = {
-    ObpGet("/banks/" + bankId + "/accounts/public").flatMap(_.extractOpt[BarebonesAccountsJson])
+    ObpGet("/banks/" + urlEncode(bankId) + "/accounts/public").flatMap(_.extractOpt[BarebonesAccountsJson])
   }
   
   def privateAccounts(bankId : String) : Box[BarebonesAccountsJson] = {
-    ObpGet("/banks/" + bankId + "/accounts/private").flatMap(_.extractOpt[BarebonesAccountsJson])
+    ObpGet("/banks/" + urlEncode(bankId) + "/accounts/private").flatMap(_.extractOpt[BarebonesAccountsJson])
   }
   
   def account(bankId: String, accountId: String, viewId: String) : Box[AccountJson] = {
-    ObpGet("/banks/" + bankId + "/accounts/" + accountId + "/" + viewId + "/account").flatMap(x => x.extractOpt[AccountJson])
+    ObpGet("/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/" + urlEncode(viewId) + "/account").flatMap(x => x.extractOpt[AccountJson])
   }
   
    /**
@@ -81,30 +81,31 @@ object ObpAPI {
     
     val addCommentJson = ("value" -> comment)
     
-    val addCommentUrl = "/banks/" + bankId + "/accounts/" + accountId + "/" + viewId + "/transactions/" + transactionId + "/metadata/comments"
+    val addCommentUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/" + urlEncode(viewId) +
+      "/transactions/" + urlEncode(transactionId) + "/metadata/comments"
     
     ObpPost(addCommentUrl, addCommentJson).flatMap(_.extractOpt[TransactionCommentJson])
   }
   
   def addPermission(bankId: String, accountId: String, userId : String, viewId: String) = {
-    val grantPermissionUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/users/" + urlEncode(userId) + "/views/" + urlEncode(viewId)
+    val grantPermissionUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/permissions/" + urlEncode(userId) + "/views/" + urlEncode(viewId)
     ObpPost(grantPermissionUrl, new JObject(Nil))
   }
   
   def addPermissions(bankId: String, accountId: String, userId: String, viewIds : List[String]) : Box[JValue] = {
-    val addPermissionsUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/users/" + urlEncode(userId) + "/views"
+    val addPermissionsUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/permissions/" + urlEncode(userId) + "/views"
     val json = ("views" -> viewIds)
     
     ObpPost(addPermissionsUrl, json)
   }
   
   def removePermission(bankId: String, accountId: String, userId : String, viewId: String) = {
-    val removePermissionUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/users/" + urlEncode(userId) + "/views/" + urlEncode(viewId)
+    val removePermissionUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/permissions/" + urlEncode(userId) + "/views/" + urlEncode(viewId)
     ObpDelete(removePermissionUrl)
   }
   
   def removeAllPermissions(bankId: String, accountId: String, userId: String) = {
-    val removeAllPermissionsUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/users/" + urlEncode(userId) + "/views"
+    val removeAllPermissionsUrl = "/banks/" + urlEncode(bankId) + "/accounts/" + urlEncode(accountId) + "/permissions/" + urlEncode(userId) + "/views"
     ObpDelete(removeAllPermissionsUrl)
   }