Merge pull request #15 from Haventec/develop

Develop
Haventec · May 29, 2019 · 6d84db4 · 6d84db4
2 parents c54621d + 884e489
commit 6d84db4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@haventec/authenticate-web-sdk",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Haventec Authenticate Web SDK",
   "keywords": [],
   "author": "Haventec <support@haventec.com>",

diff --git a/src/api/haventec.authenticate.ts b/src/api/haventec.authenticate.ts
@@ -6,7 +6,8 @@ export class HaventecAuthenticate {
 
     private ht_dataService: HT_DataService;
 
-    constructor() {
+    constructor(username?: string) {
+        this.ht_dataService = new HT_DataService(username);
     }
 
     public initialiseStorage(username: string) {

diff --git a/src/helpers/ht_data.service.ts b/src/helpers/ht_data.service.ts
@@ -9,18 +9,31 @@ import { IHaventecAuthenticateResponseObject } from '../model/haventec.authentic
 
 export class HT_DataService {
 
-    private username: string;
+    private _username: string;
     private username_key: string = 'haventec_username';
     private session_key: string;
     private local_key: string;
 
-    constructor(username: string) {
-        username = username.toLowerCase();
-        this.setUsername(username);
-        let data = this.getData();
-        if (!data.saltBits) {
-            data.saltBits = JSON.stringify(HaventecCommon.generateSalt());
-            this.setData(data);
+    constructor(username?: string) {
+
+        let localUsername = username;
+
+        if ( !localUsername ) {
+            const haventec_username = localStorage.getItem(this.username_key);
+            if ( haventec_username ) {
+                localUsername = haventec_username.toString();
+            }
+        }
+
+        if ( localUsername ) {
+            localUsername = localUsername.toLowerCase().replace(/\"/g, '');
+
+            this.setUsername(localUsername);
+            let data: HT_Data = this.getData();
+            if (!data.saltBits) {
+                data.saltBits = JSON.stringify(HaventecCommon.generateSalt());
+                this.setData(data);
+            }
         }
     }
 
@@ -58,7 +71,7 @@ export class HT_DataService {
     }
 
     public getUsername(): string {
-        return this.username;
+        return this._username;
     }
 
     public getActiveUsernames(): string[] {
@@ -70,11 +83,11 @@ export class HT_DataService {
             .map(key => (<HT_Data>HT_LocalStorage.getItem(key)).username);
     }
 
-    private setUsername(username: string): void {
-        this.username = username;
+    private setUsername(username): void {
+        this._username = username;
         this.session_key = 'ht_' + username + '_sessiondata';
         this.local_key = 'ht_' + username + '_localdata';
-        HT_LocalStorage.setItem(this.username_key, username);
+        localStorage.setItem(this.username_key, username);
     }
 
     public removeUsername(): void {

diff --git a/src/model/error.ts b/src/model/error.ts
@@ -14,4 +14,4 @@ export class HT_Error {
         public errorCode: ErrorCode,
         public message: ErrorMessage){
     }
-}
+}
diff --git a/src/test/HT_Authenticate.spec.ts b/src/test/HT_Authenticate.spec.ts
@@ -6,7 +6,7 @@ import { IHaventecAuthenticateResponseObject } from "../model/haventec.authentic
 
 describe("HT_Authenticate", function () {
 
-    let haventecAuthenticate: HaventecAuthenticate = new HaventecAuthenticate();
+    let haventecAuthenticate: HaventecAuthenticate = new HaventecAuthenticate("username");
 
     beforeAll(() => {
         haventecAuthenticate.initialiseStorage("username");
@@ -19,6 +19,11 @@ describe("HT_Authenticate", function () {
         spyOn(HT_SessionStorage, 'getItem');
     });
 
+    it("calls getAccessToken() without initialisation to ensure this is valid but returns undefined", function () {
+        const haventecAuthenticate2: HaventecAuthenticate = new HaventecAuthenticate();
+        expect(haventecAuthenticate2.getAccessToken()).toBeUndefined();
+    });
+
     it("throws error if user tries to create an object with undefined/null value for username", function () {
         try {
             haventecAuthenticate.initialiseStorage(undefined);
@@ -28,7 +33,7 @@ describe("HT_Authenticate", function () {
         }
     });
 
-    
+
 
     it("calls the associated function in dataservice if updatestorage is called", function () {
         try {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ export class HT_Error { @@
             public errorCode: ErrorCode,
             public message: ErrorMessage){
         }
-    }
+    }