luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add readtoken when in readonly mode (#1382)

Browse source
This commit is contained in:
Scott Bishel 2021-10-01 11:29:44 -06:00 committed by GitHub
parent 992ad833d1
commit 35bb3e9024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/app.tsx
View file

@ -158,7 +158,7 @@ const App = React.memo((): JSX.Element => {
<Route path='/change_password'>
<ChangePasswordPage/>
</Route>
<Route path='/shared/:boardId?/:viewId?'>
<Route path='/shared/:boardId?/:viewId?/:cardId?'>
<BoardPage readonly={true}/>
</Route>
<Route
@ -180,7 +180,7 @@ const App = React.memo((): JSX.Element => {
return null
}}
/>
<Route path='/workspace/:workspaceId/shared/:boardId?/:viewId?'>
<Route path='/workspace/:workspaceId/shared/:boardId?/:viewId?/:cardId?'>
<BoardPage readonly={true}/>
</Route>
<Route

5
webapp/src/components/viewMenu.tsx
View file

@ -30,7 +30,10 @@ const ViewMenu = React.memo((props: Props) => {
const match = useRouteMatch()
const showView = useCallback((viewId) => {
const newPath = generatePath(match.path, {...match.params, viewId: viewId || ''})
let newPath = generatePath(match.path, {...match.params, viewId: viewId || ''})
if (props.readonly) {
newPath += `?r=${Utils.getReadToken()}`
}
history.push(newPath)
}, [match, history])

6
webapp/src/components/workspace.tsx
View file

@ -13,6 +13,7 @@ import {getClientConfig, setClientConfig} from '../store/clientConfig'
import wsClient, {WSClient} from '../wsclient'
import {ClientConfig} from '../config/clientConfig'
import {Utils} from '../utils'
import CenterPanel from './centerPanel'
import EmptyCenterPanel from './emptyCenterPanel'
@ -37,7 +38,10 @@ function CenterContent(props: Props) {
const showCard = useCallback((cardId?: string) => {
const params = {...match.params, cardId}
const newPath = generatePath(match.path, params)
let newPath = generatePath(match.path, params)
if (props.readonly) {
newPath += `?r=${Utils.getReadToken()}`
}
history.push(newPath)
}, [match, history])

10
webapp/src/octoClient.ts
View file

@ -41,12 +41,6 @@ class OctoClient {
localStorage.setItem('focalboardSessionId', value)
}
private readToken(): string {
const queryString = new URLSearchParams(window.location.search)
const readToken = queryString.get('r') || ''
return readToken
}
constructor(serverUrl?: string, public workspaceId = '0') {
this.serverUrl = serverUrl
}
@ -168,7 +162,7 @@ class OctoClient {
async getSubtree(rootId?: string, levels = 2, workspaceID?: string): Promise<Block[]> {
let path = this.workspacePath(workspaceID) + `/blocks/${encodeURIComponent(rootId || '')}/subtree?l=${levels}`
const readToken = this.readToken()
const readToken = Utils.getReadToken()
if (readToken) {
path += `&read_token=${readToken}`
}
@ -406,7 +400,7 @@ class OctoClient {
async getFileAsDataUrl(rootId: string, fileId: string): Promise<string> {
let path = '/files/workspaces/' + this.workspaceId + '/' + rootId + '/' + fileId
const readToken = this.readToken()
const readToken = Utils.getReadToken()
if (readToken) {
path += `?read_token=${readToken}`
}

6
webapp/src/utils.ts
View file

@ -504,6 +504,12 @@ class Utils {
static isDesktop(): boolean {
return Utils.isDesktopApp() && Utils.isVersionGreaterThanOrEqualTo(Utils.getDesktopVersion(), '5.0.0')
}
static getReadToken(): string {
const queryString = new URLSearchParams(window.location.search)
const readToken = queryString.get('r') || ''
return readToken
}
}
export {Utils}