change token naming

Filip Hric · Filip Hric · commit 275a42dc69a0 · 2023-01-20T11:58:48.000+01:00
diff --git a/cypress/e2e/login.spec.ts b/cypress/e2e/login.spec.ts
@@ -1,14 +1,14 @@
 describe('Login', () => {
-  
+
   const user = {
     email: 'filip@example.com',
     password: 'Asdf.1234#'
   }
 
   beforeEach(() => {
-    
+
     cy.request('POST', '/api/reset')
-    cy.signupApi({login: false, ...user})
+    cy.signupApi({ login: false, ...user })
 
   });
 
@@ -47,15 +47,15 @@ describe('Login', () => {
     cy.location('pathname')
       .should('eq', '/')
 
-    cy.getCookie('trello_token')
+    cy.getCookie('auth_token')
       .should('exist')
 
     cy.getDataCy('logged-user')
       .click()
 
     cy.getDataCy('notification-message')
       .should('contain.text', 'User was logged out')
-    
+
   });
 
   it('logs in a user (enter)', () => {
@@ -78,20 +78,20 @@ describe('Login', () => {
     cy.location('pathname')
       .should('eq', '/')
 
-    cy.getCookie('trello_token')
+    cy.getCookie('auth_token')
       .should('exist')
 
     cy.getDataCy('logged-user')
       .click()
 
     cy.getDataCy('notification-message')
       .should('contain.text', 'User was logged out')
-    
+
   });
 
   it('shows error on invalid login', () => {
 
-    cy.setCookie('trello_token', 'invalid')
+    cy.setCookie('auth_token', 'invalid')
 
     cy.visit('/login')
 
diff --git a/cypress/e2e/signup.spec.ts b/cypress/e2e/signup.spec.ts
@@ -25,7 +25,7 @@ describe('Signup', () => {
     cy.location('pathname')
       .should('eq', '/')
 
-    cy.getCookie('trello_token')
+    cy.getCookie('auth_token')
       .should('exist')
 
   });
@@ -48,7 +48,7 @@ describe('Signup', () => {
     cy.location('pathname')
       .should('eq', '/')
 
-    cy.getCookie('trello_token')
+    cy.getCookie('auth_token')
       .should('exist')
 
   });
diff --git a/cypress/support/commands/googleLogin.ts b/cypress/support/commands/googleLogin.ts
@@ -1,4 +1,4 @@
-export {}
+export { }
 declare global {
   namespace Cypress {
     interface Chainable {
@@ -14,9 +14,9 @@ declare global {
  *
  */
 
-export const googleLogin = function(this: any): Cypress.Chainable<any> {
+export const googleLogin = function (this: any): Cypress.Chainable<any> {
 
-return cy.request({
+  return cy.request({
     method: 'POST',
     url: 'https://www.googleapis.com/oauth2/v4/token',
     body: {
@@ -27,9 +27,9 @@ return cy.request({
     },
   }).then(({ body }) => {
     const { id_token } = body
-      cy.request('POST', '/api/login', { jwt: id_token })
-        .then( ({ body: { accessToken } }) => {
-          cy.setCookie('trello_token', accessToken)
-        })
+    cy.request('POST', '/api/login', { jwt: id_token })
+      .then(({ body: { accessToken } }) => {
+        cy.setCookie('auth_token', accessToken)
+      })
   })
 }
diff --git a/cypress/support/commands/googleSignup.ts b/cypress/support/commands/googleSignup.ts
@@ -1,4 +1,4 @@
-export {}
+export { }
 declare global {
   namespace Cypress {
     interface Chainable {
@@ -14,9 +14,9 @@ declare global {
  *
  */
 
-export const googleSignup = function(this: any): Cypress.Chainable<any> {
+export const googleSignup = function (this: any): Cypress.Chainable<any> {
 
-return cy.request({
+  return cy.request({
     method: 'POST',
     url: 'https://www.googleapis.com/oauth2/v4/token',
     body: {
@@ -27,9 +27,9 @@ return cy.request({
     },
   }).then(({ body }) => {
     const { id_token } = body
-      cy.request('POST', '/api/signup', { jwt: id_token })
-        .then( ({ body: { accessToken } }) => {
-          cy.setCookie('trello_token', accessToken)
-        })
+    cy.request('POST', '/api/signup', { jwt: id_token })
+      .then(({ body: { accessToken } }) => {
+        cy.setCookie('auth_token', accessToken)
+      })
   })
 }
diff --git a/cypress/support/commands/signupApi.ts b/cypress/support/commands/signupApi.ts
@@ -1,4 +1,4 @@
-export {}
+export { }
 declare global {
   namespace Cypress {
     interface Chainable {
@@ -15,13 +15,13 @@ declare global {
  * @example
  * cy.signupApi({ email: 'filip@example.com', password: 'nbusr123', login: false })
  */
-export const signupApi = function(this: any, { email, password, login = true }: { email: string, password: string, login?: boolean }) {
+export const signupApi = function (this: any, { email, password, login = true }: { email: string, password: string, login?: boolean }) {
 
   cy
     .request('POST', '/api/signup', {
       email, password
     }).then(({ body }) => {
-      if (login) cy.setCookie('trello_token', body.accessToken)
+      if (login) cy.setCookie('auth_token', body.accessToken)
       cy.wrap(body).as('user');
     });
 
diff --git a/src/App.vue b/src/App.vue
@@ -22,17 +22,17 @@ const toggleTools = state.toggleTools;
 const toggleSearch = state.toggleSearch;
 const getCookieValue = (name: string) => document.cookie.match('(^|;)\\s*' + name + '\\s*=\\s*([^;]+)')?.pop();
 
-const trelloToken = getCookieValue('trello_token');
-const trelloTokenValid = trelloToken?.split('.')[1];
+const authToken = getCookieValue('auth_token');
+const authTokenValid = authToken?.split('.')[1];
 
-if (trelloToken && !trelloTokenValid) {
+if (authToken && !authTokenValid) {
   state.showNotification('Invalid authorization', true);
-  document.cookie = 'trello_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+  document.cookie = 'auth_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
 }
 
-if (trelloToken && trelloTokenValid) {
-  axios.defaults.headers.common['Authorization'] = `Bearer ${trelloToken}`;
-  const userData = window.atob(trelloTokenValid);
+if (authToken && authTokenValid) {
+  axios.defaults.headers.common['Authorization'] = `Bearer ${authToken}`;
+  const userData = window.atob(authTokenValid);
   const userId = JSON.parse(userData).sub;
   state.user(userId);
 }
diff --git a/src/components/LoginButton.vue b/src/components/LoginButton.vue
@@ -47,7 +47,7 @@ const { activeUser } = storeToRefs(useStore());
 const logout = function (this: any) {
   activeUser.value.loggedIn = false;
   axios.defaults.headers.common['Authorization'] = '';
-  document.cookie = 'trello_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+  document.cookie = 'auth_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
   showNotification('User was logged out', false);
 };
 </script>
diff --git a/src/store/actions/login.ts b/src/store/actions/login.ts
@@ -8,7 +8,7 @@ export const login = async function (this: any, email: string, password: string)
       const email = data.user.email;
       const id = data.user.id;
       axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-      document.cookie = `trello_token=${token}`;
+      document.cookie = `auth_token=${token}`;
       this.activeUser.id = id;
       this.activeUser.email = email;
       this.activeUser.accessToken = token;
diff --git a/src/store/actions/oauthLogin.ts b/src/store/actions/oauthLogin.ts
@@ -8,14 +8,14 @@ export const oauthLogin = async function (this: any, jwt: string) {
       const email = data.user.email;
       const id = data.user.id;
       axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-      document.cookie = `trello_token=${token}`;
+      document.cookie = `auth_token=${token}`;
       this.activeUser.id = id;
       this.activeUser.email = email;
       this.activeUser.accessToken = token;
       this.user(this.activeUser.id);
     })
     .catch(({ response }) => {
-      document.cookie = 'trello_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+      document.cookie = 'auth_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
       this.showNotification(response.data, true);
     });
 };
diff --git a/src/store/actions/oauthSignup.ts b/src/store/actions/oauthSignup.ts
@@ -8,7 +8,7 @@ export const oauthSignup = async function (this: any, jwt: string) {
       const email = data.user.email;
       const id = data.user.id;
       axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-      document.cookie = `trello_token=${token}`;
+      document.cookie = `auth_token=${token}`;
       this.activeUser.id = id;
       this.activeUser.email = email;
       this.activeUser.accessToken = token;
diff --git a/src/store/actions/resetUsers.ts b/src/store/actions/resetUsers.ts
@@ -5,6 +5,6 @@ export const resetUsers = async function (this: any) {
   this.activeUser.loggedIn = false;
   this.activeUser.email = '';
   axios.defaults.headers.common['Authorization'] = '';
-  document.cookie = 'trello_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+  document.cookie = 'auth_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
   this.showNotification('All users were deleted', false);
 };
diff --git a/src/store/actions/signup.ts b/src/store/actions/signup.ts
@@ -8,7 +8,7 @@ export const signup = async function (this: any, email: string, password: string
       const email = data.user.email;
       const id = data.user.id;
       axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-      document.cookie = `trello_token=${token}`;
+      document.cookie = `auth_token=${token}`;
       this.activeUser.id = id;
       this.activeUser.email = email;
       this.activeUser.accessToken = token;
diff --git a/src/store/actions/user.ts b/src/store/actions/user.ts
@@ -11,6 +11,6 @@ export const user = async function (this: any, id: number) {
     })
     .catch(() => {
       this.showNotification('User is not authorized', true);
-      document.cookie = 'trello_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
+      document.cookie = 'auth_token=;expires=Thu, 01 Jan 1970 00:00:00 GMT';
     });
 };
