From 815de49549b35aa9d255de6b05c2beb2d153f37f Mon Sep 17 00:00:00 2001
From: john gravois <jgravois@esri.com>
Date: Wed, 7 Nov 2018 11:23:30 -0800
Subject: [PATCH] fix(:bug:): ensure fix session.portal url when cred.server
 contains sharing/rest

AFFECTS PACKAGES:
@esri/arcgis-rest-auth
---
 packages/arcgis-rest-auth/src/UserSession.ts  |  4 +-
 .../arcgis-rest-auth/test/UserSession.test.ts | 38 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/arcgis-rest-auth/src/UserSession.ts b/packages/arcgis-rest-auth/src/UserSession.ts
index adf42c326c..02d5604f09 100644
--- a/packages/arcgis-rest-auth/src/UserSession.ts
+++ b/packages/arcgis-rest-auth/src/UserSession.ts
@@ -580,7 +580,9 @@ export class UserSession implements IAuthenticationManager {
    */
   static fromCredential(credential: ICredential) {
     return new UserSession({
-      portal: credential.server + `/sharing/rest`,
+      portal: credential.server.includes("sharing/rest")
+        ? credential.server
+        : credential.server + `/sharing/rest`,
       ssl: credential.ssl,
       token: credential.token,
       username: credential.userId,
diff --git a/packages/arcgis-rest-auth/test/UserSession.test.ts b/packages/arcgis-rest-auth/test/UserSession.test.ts
index a5dbf373e5..80c56350e2 100644
--- a/packages/arcgis-rest-auth/test/UserSession.test.ts
+++ b/packages/arcgis-rest-auth/test/UserSession.test.ts
@@ -961,21 +961,21 @@ describe("UserSession", () => {
       userId: "jsmith"
     };
 
-    it("should create a credential object from a session", () => {
-      const session = new UserSession({
-        clientId: "clientId",
-        redirectUri: "https://example-app.com/redirect-uri",
-        token: "token",
-        ssl: false,
-        tokenExpires: TOMORROW,
-        refreshToken: "refreshToken",
-        refreshTokenExpires: TOMORROW,
-        refreshTokenTTL: 1440,
-        username: "jsmith",
-        password: "123456"
-      });
+    const MOCK_USER_SESSION = new UserSession({
+      clientId: "clientId",
+      redirectUri: "https://example-app.com/redirect-uri",
+      token: "token",
+      ssl: false,
+      tokenExpires: TOMORROW,
+      refreshToken: "refreshToken",
+      refreshTokenExpires: TOMORROW,
+      refreshTokenTTL: 1440,
+      username: "jsmith",
+      password: "123456"
+    });
 
-      const creds = session.toCredential();
+    it("should create a credential object from a session", () => {
+      const creds = MOCK_USER_SESSION.toCredential();
       expect(creds.userId).toEqual("jsmith");
       expect(creds.server).toEqual("https://www.arcgis.com/sharing/rest");
       expect(creds.ssl).toEqual(false);
@@ -991,5 +991,15 @@ describe("UserSession", () => {
       expect(session.token).toEqual("token");
       expect(session.tokenExpires).toEqual(new Date(TOMORROW));
     });
+
+    it("should create a UserSession from a credential that came from a UserSession", () => {
+      const creds = MOCK_USER_SESSION.toCredential();
+      const credSession = UserSession.fromCredential(creds);
+      expect(credSession.username).toEqual("jsmith");
+      expect(credSession.portal).toEqual("https://www.arcgis.com/sharing/rest");
+      expect(credSession.ssl).toEqual(false);
+      expect(credSession.token).toEqual("token");
+      expect(credSession.tokenExpires).toEqual(new Date(TOMORROW));
+    });
   });
 });