MythXJS fixed token refresh issue

Consensys · Sep 5, 2019 · 32c14f5 · 32c14f5
1 parent 5eb42e1
commit 32c14f5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/src/apiServices/AnalysesService.ts b/src/apiServices/AnalysesService.ts
@@ -30,8 +30,8 @@ export class AnalysesService {
 
     public async getAnalysesList() {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const result = await getRequest(`${this.API_URL}/analyses`, headers)
 
@@ -43,8 +43,8 @@ export class AnalysesService {
 
     public async getAnalysisStatus(uuid: string) {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const result = await getRequest(`${this.API_URL}/analyses/${uuid}`, headers)
 
@@ -56,8 +56,8 @@ export class AnalysesService {
 
     public async getDetectedIssues(uuid: string) {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const getStatus = await this.getAnalysisStatus(uuid)
             if (getStatus.status === 'Queued' || getStatus.status === 'In progress') {
@@ -82,8 +82,8 @@ export class AnalysesService {
 
     public async submitBytecode(bytecode: string): Promise<SubmitContractRes | void> {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const request = generateBytecodeRequest(bytecode, this.toolName)
 
@@ -97,8 +97,8 @@ export class AnalysesService {
 
     public async submitSourceCode(sourceCode: string, contractName: string): Promise<SubmitContractRes | void> {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const request = generateSourceCodeRequest(sourceCode, contractName, this.toolName)
 
@@ -112,8 +112,8 @@ export class AnalysesService {
 
     public async analyze(options: AnalyzeOptions): Promise<any> {
         try {
-            const { headers, accessToken } = await getHeaders(this.jwtTokens)
-            this.jwtTokens.access = accessToken
+            const { headers, tokens } = await getHeaders(this.jwtTokens)
+            this.jwtTokens = tokens
 
             const request = generateAnalysisRequest(options, this.toolName)
 

diff --git a/src/apiServices/AuthService.ts b/src/apiServices/AuthService.ts
@@ -67,8 +67,8 @@ export class AuthService {
     public async logout() {
         if (this.isUserLoggedIn()) {
             try {
-                const { headers, accessToken } = await getHeaders(this.jwtTokens)
-                this.jwtTokens.access = accessToken
+                const { headers, tokens } = await getHeaders(this.jwtTokens)
+                this.jwtTokens = tokens
 
                 const result = await postRequest(`${this.API_URL}/auth/logout`, {}, headers)
                 this.jwtTokens.access = this.jwtTokens.refresh = ''
@@ -115,8 +115,8 @@ export class AuthService {
     public async getStats(queryString?: string) {
         if (this.isUserLoggedIn()) {
             try {
-                const { headers, accessToken } = await getHeaders(this.jwtTokens)
-                this.jwtTokens.access = accessToken
+                const { headers, tokens } = await getHeaders(this.jwtTokens)
+                this.jwtTokens = tokens
 
                 const result = await getRequest(`${this.API_URL}/stats/users-analyses?${queryString}`, headers)
 
@@ -154,8 +154,8 @@ export class AuthService {
     public async getUsers(queryString: string = '') {
         if (this.isUserLoggedIn()) {
             try {
-                const { headers, accessToken } = await getHeaders(this.jwtTokens)
-                this.jwtTokens.access = accessToken
+                const { headers, tokens } = await getHeaders(this.jwtTokens)
+                this.jwtTokens = tokens
 
                 const result = await getRequest(`${this.API_URL}/users?${queryString}`, headers)
 

diff --git a/src/util/getHeaders.ts b/src/util/getHeaders.ts
@@ -2,11 +2,11 @@ import { validateToken } from './validateToken'
 import { JwtTokensInterface } from '..'
 
 export async function getHeaders(jwtTokens: JwtTokensInterface) {
-    const accessToken = await validateToken(jwtTokens)
+    const tokens = await validateToken(jwtTokens)
     const headers = {
-        Authorization: `Bearer ${accessToken}`,
+        Authorization: `Bearer ${tokens.access}`,
         'Content-Type': 'application/json',
     }
 
-    return { accessToken, headers }
+    return { tokens, headers }
 }
diff --git a/src/util/validateToken.ts b/src/util/validateToken.ts
@@ -11,13 +11,13 @@ interface jwtInterface {
     iat: number
 }
 
-export async function validateToken(tokens: JwtTokensInterface) {
+export async function validateToken(tokens: JwtTokensInterface): Promise<JwtTokensInterface> {
     if (isTokenValid(tokens.access)) {
-        return tokens.access
+        return tokens
     } else {
         // else return refreshed token
         const returnT = (await refreshToken(tokens)) as JwtTokensInterface
-        return returnT.access
+        return returnT
     }
 }