@sasjs/adapter 3.10.16 → 3.10.18

package/node/types/Login.d.ts

@@ -4,4 +4,11 @@ export interface LoginOptions {
 export interface LoginResult {
     isLoggedIn: boolean;
     userName: string;
+    userLongName: string;
+}
+export interface LoginResultInternal {
+    isLoggedIn: boolean;
+    userName: string;
+    userLongName: string;
+    loginForm?: any;
 }

package/node/utils/sas9/extractUserLongNameSas9.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Extracts user full name assuming the first word after "title" means log off if not found otherwise in the dictionary
+ * @param response SAS response content
+ * @returns user full name
+ */
+export declare const extractUserLongNameSas9: (response: string) => string;

package/package.json

@@ -3,10 +3,11 @@
   "description": "JavaScript adapter for SAS",
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
-    "preinstall": "node checkNodeVersion",
-    "prebuild": "node checkNodeVersion",
+    "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
+    "preinstall": "npm run nodeVersionMessage",
+    "prebuild": "npm run nodeVersionMessage",
     "build": "rimraf build && rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && rimraf build/src && rimraf node",
-    "package:lib": "npm run build && copyfiles ./package.json ./checkNodeVersion.js build && cd build && npm version \"5.0.0\" && npm pack",
+    "package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
     "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
@@ -78,12 +79,12 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.44.0",
+    "@sasjs/utils": "2.48.2",
     "axios": "0.26.0",
     "axios-cookiejar-support": "1.0.1",
     "form-data": "4.0.0",
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.10.16"
+  "version": "3.10.18"
 }

package/src/auth/AuthManager.ts

@@ -1,13 +1,15 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { LoginOptions, LoginResult } from '../types/Login'
+import { LoginOptions, LoginResult, LoginResultInternal } from '../types/Login'
 import { serialize } from '../utils'
+import { extractUserLongNameSas9 } from '../utils/sas9/extractUserLongNameSas9'
 import { openWebPage } from './openWebPage'
 import { verifySas9Login } from './verifySas9Login'
 import { verifySasViyaLogin } from './verifySasViyaLogin'
 
 export class AuthManager {
   public userName = ''
+  public userLongName = ''
   private loginUrl: string
   private logoutUrl: string
   private redirectedLoginUrl = `/SASLogon/home`
@@ -33,15 +35,19 @@ export class AuthManager {
   public async redirectedLogIn({
     onLoggedOut
   }: LoginOptions): Promise<LoginResult> {
-    const { isLoggedIn: isLoggedInAlready, userName: currentSessionUsername } =
-      await this.fetchUserName()
+    const {
+      isLoggedIn: isLoggedInAlready,
+      userName: currentSessionUserName,
+      userLongName: currentSessionUserLongName
+    } = await this.fetchUserName()
 
     if (isLoggedInAlready) {
       await this.loginCallback()
 
       return {
         isLoggedIn: true,
-        userName: currentSessionUsername
+        userName: currentSessionUserName,
+        userLongName: currentSessionUserLongName
       }
     }
 
@@ -56,7 +62,7 @@ export class AuthManager {
     )
 
     if (!loginPopup) {
-      return { isLoggedIn: false, userName: '' }
+      return { isLoggedIn: false, userName: '', userLongName: '' }
     }
 
     const { isLoggedIn } =
@@ -71,14 +77,14 @@ export class AuthManager {
         await this.performCASSecurityCheck()
       }
 
-      const { userName } = await this.fetchUserName()
+      const { userName, userLongName } = await this.fetchUserName()
 
       await this.loginCallback()
 
-      return { isLoggedIn: true, userName }
+      return { isLoggedIn: true, userName, userLongName }
     }
 
-    return { isLoggedIn: false, userName: '' }
+    return { isLoggedIn: false, userName: '', userLongName: '' }
   }
 
   /**
@@ -93,27 +99,26 @@ export class AuthManager {
       username,
       password
     }
+    this.userName = ''
+    this.userLongName = ''
 
     let {
       isLoggedIn: isLoggedInAlready,
       loginForm,
-      userName: currentSessionUsername
+      userLongName: currentSessionUserLongName
     } = await this.checkSession()
 
     if (isLoggedInAlready) {
-      if (currentSessionUsername === loginParams.username) {
-        await this.loginCallback()
-
-        this.userName = currentSessionUsername!
-        return {
-          isLoggedIn: true,
-          userName: this.userName
-        }
-      } else {
-        await this.logOut()
-        loginForm = await this.getNewLoginForm()
+      await this.loginCallback()
+
+      this.userName = loginParams.username
+      this.userLongName = currentSessionUserLongName
+      return {
+        isLoggedIn: true,
+        userName: this.userName,
+        userLongName: this.userLongName
       }
-    } else this.userName = ''
+    }
 
     let loginResponse = await this.sendLoginRequest(loginForm, loginParams)
 
@@ -128,10 +133,7 @@ export class AuthManager {
 
       const res = await this.checkSession()
       isLoggedIn = res.isLoggedIn
-
-      if (isLoggedIn) this.userName = res.userName
-    } else {
-      this.userName = loginParams.username
+      this.userLongName = res.userLongName
     }
 
     if (isLoggedIn) {
@@ -140,11 +142,13 @@ export class AuthManager {
       }
 
       this.loginCallback()
-    } else this.userName = ''
+      this.userName = loginParams.username
+    }
 
     return {
       isLoggedIn,
-      userName: this.userName
+      userName: this.userName,
+      userLongName: this.userLongName
     }
   }
 
@@ -195,15 +199,12 @@ export class AuthManager {
    * Checks whether a session is active, or login is required.
    * @returns - a promise which resolves with an object containing three values
    *  - a boolean `isLoggedIn`
-   *  - a string `userName` and
+   *  - a string `userName`,
+   *  - a string `userFullName` and
    *  - a form `loginForm` if not loggedin.
    */
-  public async checkSession(): Promise<{
-    isLoggedIn: boolean
-    userName: string
-    loginForm?: any
-  }> {
-    const { isLoggedIn, userName } = await this.fetchUserName()
+  public async checkSession(): Promise<LoginResultInternal> {
+    const { isLoggedIn, userName, userLongName } = await this.fetchUserName()
     let loginForm = null
 
     if (!isLoggedIn) {
@@ -216,7 +217,8 @@ export class AuthManager {
 
     return Promise.resolve({
       isLoggedIn,
-      userName: userName.toLowerCase(),
+      userName,
+      userLongName,
       loginForm
     })
   }
@@ -245,10 +247,7 @@ export class AuthManager {
     return await this.getLoginForm(formResponse)
   }
 
-  private async fetchUserName(): Promise<{
-    isLoggedIn: boolean
-    userName: string
-  }> {
+  private async fetchUserName(): Promise<LoginResult> {
     const url =
       this.serverType === ServerType.SasViya
         ? `${this.serverUrl}/identities/users/@currentUser`
@@ -263,15 +262,19 @@ export class AuthManager {
       })
 
     const isLoggedIn = loginResponse !== 'authErr'
-    const userName = isLoggedIn ? this.extractUserName(loginResponse) : ''
 
     if (!isLoggedIn) {
       //We will logout to make sure cookies are removed and login form is presented
       //Residue can happen in case of session expiration
       await this.logOut()
+      return { isLoggedIn, userName: '', userLongName: '' }
     }
 
-    return { isLoggedIn, userName }
+    return {
+      isLoggedIn,
+      userName: this.extractUserName(loginResponse),
+      userLongName: this.extractUserLongName(loginResponse)
+    }
   }
 
   private extractUserName = (response: any): string => {
@@ -280,18 +283,27 @@ export class AuthManager {
         return response?.id
 
       case ServerType.Sas9:
-        const matched = response?.match(/"title":"Log Off [0-1a-zA-Z ]*"/)
-        const username = matched?.[0].slice(17, -1)
+        return ''
+
+      case ServerType.Sasjs:
+        return response?.username
+
+      default:
+        console.error('Server Type not found in extractUserName function')
+        return ''
+    }
+  }
 
-        if (!username.includes(' ')) return username
+  private extractUserLongName = (response: any): string => {
+    switch (this.serverType) {
+      case ServerType.SasViya:
+        return response?.name
 
-        return username
-          .split(' ')
-          .map((name: string) => name.slice(0, 3).toLowerCase())
-          .join('')
+      case ServerType.Sas9:
+        return extractUserLongNameSas9(response)
 
       case ServerType.Sasjs:
-        return response?.username
+        return response?.displayName
 
       default:
         console.error('Server Type not found in extractUserName function')

package/src/types/Login.ts

@@ -5,4 +5,11 @@ export interface LoginOptions {
 export interface LoginResult {
   isLoggedIn: boolean
   userName: string
+  userLongName: string
+}
+export interface LoginResultInternal {
+  isLoggedIn: boolean
+  userName: string
+  userLongName: string
+  loginForm?: any
 }

package/src/utils/sas9/extractUserLongNameSas9.ts

@@ -0,0 +1,31 @@
+/**
+ * Dictionary should contain only languages in SAS where `logout` text
+ * is represented with more then one word
+ */
+const dictionary = ['Log Off']
+
+/**
+ * Extracts user full name assuming the first word after "title" means log off if not found otherwise in the dictionary
+ * @param response SAS response content
+ * @returns user full name
+ */
+export const extractUserLongNameSas9 = (response: string) => {
+  const regex = /"title":\s?".*?"/
+
+  const matched = response?.match(regex)
+  let fullName = matched?.[0].split(':')[1].trim()
+  let breakIndex = fullName?.indexOf(' ')
+
+  if (!fullName) return 'unknown'
+
+  dictionary.map((logoutWord) => {
+    const index = fullName?.indexOf(logoutWord) || -1
+
+    if (index > -1) {
+      breakIndex = index + logoutWord.length
+    }
+  })
+
+  //Cut only name
+  return fullName.slice(breakIndex, -1).trim()
+}

package/types/Login.d.ts

@@ -4,4 +4,11 @@ export interface LoginOptions {
 export interface LoginResult {
     isLoggedIn: boolean;
     userName: string;
+    userLongName: string;
+}
+export interface LoginResultInternal {
+    isLoggedIn: boolean;
+    userName: string;
+    userLongName: string;
+    loginForm?: any;
 }

package/utils/sas9/extractUserLongNameSas9.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Extracts user full name assuming the first word after "title" means log off if not found otherwise in the dictionary
+ * @param response SAS response content
+ * @returns user full name
+ */
+export declare const extractUserLongNameSas9: (response: string) => string;

package/utils/spec/extractUserLongNameSas9.spec.d.ts

@@ -0,0 +1 @@
+export {};