1 files changed, 8 insertions, 6 deletions

diff --git a/app/controllers/api_account_list.go b/app/controllers/api_account_list.go
index 28b64c1..4835d0c 100644
--- a/app/controllers/api_account_list.go
+++ b/app/controllers/api_account_list.go
@@ -4,10 +4,10 @@ import (
         "context"
         "net/http"
 
+        "code.crute.us/mcrute/cloud-identity-broker/app"
         "code.crute.us/mcrute/cloud-identity-broker/app/middleware"
         "code.crute.us/mcrute/cloud-identity-broker/app/models"
 
-        glecho "code.crute.us/mcrute/golib/echo"
         "code.crute.us/mcrute/golib/echo/controller"
         "github.com/labstack/echo/v4"
 )
@@ -25,15 +25,17 @@ type jsonAccount struct {
 }
 
 func jsonAccountFromAccount(c echo.Context, a *models.Account) *jsonAccount {
+        u := app.AppURL{}
+
         return &jsonAccount{
                 AccountNumber:        a.AccountNumber,
                 ShortName:            a.ShortName,
                 Name:                 a.Name,
-                SelfUrl:              glecho.URLFor(c, "/api/account", a.ShortName).String(),
-                ConsoleUrl:           glecho.URLFor(c, "/api/account", a.ShortName, "console").String(),
-                ConsoleRedirectUrl:   glecho.URLFor(c, "/api/account", a.ShortName, "console").Query("redirect", "1").String(),
-                CredentialsUrl:       glecho.URLFor(c, "/api/account", a.ShortName, "credentials").String(),
-                GlobalCredentialsUrl: glecho.URLFor(c, "/api/account", a.ShortName, "credentials/global").String(),
+                SelfUrl:              u.Account(c, "aws", &a.ShortName),
+                ConsoleUrl:           u.AccountConsole(c, "aws", a.ShortName, false),
+                ConsoleRedirectUrl:   u.AccountConsole(c, "aws", a.ShortName, true),
+                CredentialsUrl:       u.AccountCredentials(c, "aws", a.ShortName, ""),
+                GlobalCredentialsUrl: u.AccountCredentials(c, "aws", a.ShortName, "global"),
         }
 }