2 files changed, 12 insertions, 12 deletions

diff --git a/client/angular/users/models/token.ts b/client/angular/users/models/token.ts
index 906bf501b..b7872e74a 100644
--- a/client/angular/users/models/token.ts
+++ b/client/angular/users/models/token.ts
@@ -3,6 +3,14 @@ export class Token {
   refresh_token: string;
   token_type: string;
 
+  static load(): Token {
+    return new Token({
+      access_token: localStorage.getItem('access_token'),
+      refresh_token: localStorage.getItem('refresh_token'),
+      token_type: localStorage.getItem('token_type')
+    });
+  }
+
   constructor (hash?: any) {
     if (hash) {
       this.access_token = hash.access_token;
@@ -15,14 +23,6 @@ export class Token {
     }
   }
 
-  static load(): Token {
-    return new Token({
-      access_token: localStorage.getItem('access_token'),
-      refresh_token: localStorage.getItem('refresh_token'),
-      token_type: localStorage.getItem('token_type')
-    });
-  }
-
   save():void {
     localStorage.setItem('access_token', this.access_token);
     localStorage.setItem('refresh_token', this.refresh_token);
diff --git a/client/angular/users/models/user.ts b/client/angular/users/models/user.ts
index 2c56a6132..3367e3bb5 100644
--- a/client/angular/users/models/user.ts
+++ b/client/angular/users/models/user.ts
@@ -4,15 +4,15 @@ export class User {
   username: string;
   token: Token;
 
+  static load(): User {
+    return new User(localStorage.getItem('username'), Token.load());
+  }
+
   constructor (username: string, hash_token: any) {
     this.username = username;
     this.token = new Token(hash_token);
   }
 
-  static load(): User {
-    return new User(localStorage.getItem('username'), Token.load());
-  }
-
   save(): void {
     localStorage.setItem('username', this.username);
     this.token.save();