fix: reverted the format of hash param

okTurtles · Jul 25, 2024 · 64c7ff1 · 64c7ff1
1 parent 93d4c32
commit 64c7ff1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/frontend/controller/router.js b/frontend/controller/router.js
@@ -42,7 +42,7 @@ const loginGuard = {
 
 const inviteGuard = {
   guard: (to, from) => {
-    // ex: http://localhost:8000/app/join#groupId=21XWnNRE7vggw4ngGqmQz5D4vAwPYqcREhEkGop2mYZTKVkx8H&secret=5157
+    // ex: http://localhost:8000/app/join#?groupId=21XWnNRE7vggw4ngGqmQz5D4vAwPYqcREhEkGop2mYZTKVkx8H&secret=5157
     return !(to.hash.includes('groupId=') && to.hash.includes('secret='))
   },
   redirect: (to, from) => ({ path: '/' })

diff --git a/frontend/model/contracts/shared/voting/proposals.js b/frontend/model/contracts/shared/voting/proposals.js
@@ -44,7 +44,7 @@ export function notifyAndArchiveProposal ({ state, proposalHash, proposal, contr
 export function buildInvitationUrl (groupId: string, groupName: string, inviteSecret: string, creatorID?: string): string {
   const rootGetters = sbp('state/vuex/getters')
   const creatorUsername = creatorID && rootGetters.usernameFromID(creatorID)
-  return `${location.origin}/app/join#${(new URLSearchParams({
+  return `${location.origin}/app/join#?${(new URLSearchParams({
       groupId: groupId,
       groupName: groupName,
       secret: inviteSecret,

diff --git a/test/cypress/integration/group-proposals.spec.js b/test/cypress/integration/group-proposals.spec.js
@@ -252,6 +252,7 @@ describe('Proposals - Add members', () => {
     cy.getByDT('openAllProposals').click()
     cy.get('[data-test="modal"] > .c-container .c-title').should('contain', 'Archived proposals')
     cy.getByDT('modal').within(() => {
+      // NOTE: this is to wait until all of the 4 proposals are loaded inside the modal
       cy.get('.c-container > .c-header-info .has-text-1').should('contain', '4 proposals')
       assertInvitationLinkFor(2, 'user4')
       assertInvitationLinkFor(1, 'user6')
@@ -389,7 +390,7 @@ describe('Proposals - Add members', () => {
   })
 
   it('an invalid invitation link cannot be used', () => {
-    cy.visit('/app/join#groupId=321&secret=123')
+    cy.visit('/app/join#?groupId=321&secret=123')
     cy.getByDT('pageTitle')
       .invoke('text')
       .should('contain', 'Oh no! This invite is not valid')