diff options
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | src/js/App.vue | 7 | ||||
| -rw-r--r-- | src/js/components/Base/UserDiv.vue | 2 | ||||
| -rw-r--r-- | src/js/components/Comments/CommentAdd.vue | 3 | ||||
| -rw-r--r-- | src/js/components/VoteTable/VoteList.vue | 4 | ||||
| -rw-r--r-- | src/js/components/VoteTable/VoteTable.vue | 8 | ||||
| -rw-r--r-- | src/js/main.js | 10 | ||||
| -rw-r--r-- | src/js/store/modules/acl.js | 3 | ||||
| -rw-r--r-- | src/js/store/modules/polls.js | 3 | ||||
| -rw-r--r-- | src/js/views/NotFound.vue | 2 | ||||
| -rw-r--r-- | src/js/views/Vote.vue | 4 |
11 files changed, 22 insertions, 25 deletions
diff --git a/package.json b/package.json index ed9a5143..6411d8ba 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "stylelint:fix": "stylelint src --fix" }, "dependencies": { + "@nextcloud/auth": "^1.2.3", "@nextcloud/axios": "^1.3.1", "@nextcloud/event-bus": "^1.1.4", "@nextcloud/router": "^1.0.0", diff --git a/src/js/App.vue b/src/js/App.vue index cf84597b..0b9fa872 100644 --- a/src/js/App.vue +++ b/src/js/App.vue @@ -22,7 +22,7 @@ <template> <Content app-name="polls"> - <Navigation v-if="OC.currentUser" /> + <Navigation v-if="getCurrentUser" /> <router-view /> <SideBar v-if="sideBarOpen && $store.state.poll.id" :active="activeTab" /> </Content> @@ -32,6 +32,7 @@ import Navigation from './components/Navigation/Navigation' import { Content } from '@nextcloud/vue' import SideBar from './components/SideBar/SideBar' +import { getCurrentUser } from '@nextcloud/auth' import { subscribe, unsubscribe } from '@nextcloud/event-bus' export default { @@ -66,7 +67,7 @@ export default { }) - if (OC.currentUser) { + if (getCurrentUser) { this.updatePolls() subscribe('update-polls', () => { this.updatePolls() @@ -81,7 +82,7 @@ export default { methods: { updatePolls() { - if (OC.currentUser) { + if (getCurrentUser) { this.$store.dispatch('loadPolls') .then(() => { diff --git a/src/js/components/Base/UserDiv.vue b/src/js/components/Base/UserDiv.vue index ff1d529e..35438d0b 100644 --- a/src/js/components/Base/UserDiv.vue +++ b/src/js/components/Base/UserDiv.vue @@ -23,7 +23,7 @@ <template> <div class="user-row" :class="type"> <Avatar :disable-menu="disableMenu" :menu-position="menuPosition" :user="userId" - :is-guest="!Boolean(OC.currentUser)" + :is-guest="!Boolean(getCurrentUser)" :display-name="displayName" :is-no-user="isNoUser" /> diff --git a/src/js/components/Comments/CommentAdd.vue b/src/js/components/Comments/CommentAdd.vue index e1125db5..99dbc610 100644 --- a/src/js/components/Comments/CommentAdd.vue +++ b/src/js/components/Comments/CommentAdd.vue @@ -51,9 +51,6 @@ export default { acl: state => state.acl, }), - currentUser() { - return this.$store.state.acl.userId - }, }, methods: { diff --git a/src/js/components/VoteTable/VoteList.vue b/src/js/components/VoteTable/VoteList.vue index bc925415..37d19b19 100644 --- a/src/js/components/VoteTable/VoteList.vue +++ b/src/js/components/VoteTable/VoteList.vue @@ -73,10 +73,6 @@ export default { 'expired', ]), - currentUser() { - return this.acl.userId - }, - noOptions() { return (this.sortedOptions.length === 0) }, diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue index 7df576a7..71e0b9de 100644 --- a/src/js/components/VoteTable/VoteTable.vue +++ b/src/js/components/VoteTable/VoteTable.vue @@ -31,11 +31,11 @@ :poll-type="poll.type" /> </div> - <div v-for="(participant) in participants" :key="participant.userId" :class="{currentuser: (participant.userId === currentUser) }"> + <div v-for="(participant) in participants" :key="participant.userId" :class="{currentuser: (participant.userId === acl.userId) }"> <UserDiv :key="participant.userId" class="vote-table__user-column" :disable-menu="true" - :class="{currentuser: (participant.userId === currentUser) }" + :class="{currentuser: (participant.userId === acl.userId) }" :user-id="participant.userId" :display-name="participant.displayName"> <Actions v-if="acl.allowEdit" class="action"> @@ -100,10 +100,6 @@ export default { 'sortedOptions', 'participants', ]), - - currentUser() { - return this.acl.userId - }, }, methods: { diff --git a/src/js/main.js b/src/js/main.js index df910ba9..6c527967 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -27,20 +27,23 @@ import axios from '@nextcloud/axios' import App from './App' import store from './store' import router from './router' -import { linkTo } from '@nextcloud/router' import ClickOutside from 'v-click-outside' import VueClipboard from 'vue-clipboard2' import moment from 'moment' import Fragment from 'vue-fragment' +import { getRequestToken, getCurrentUser } from '@nextcloud/auth' +import { generateFilePath } from '@nextcloud/router' import { Tooltip } from '@nextcloud/vue' import UserDiv from './components/Base/UserDiv' import ButtonDiv from './components/Base/ButtonDiv' /* eslint-disable-next-line camelcase, no-undef */ -__webpack_nonce__ = btoa(OC.requestToken) +__webpack_nonce__ = btoa(getRequestToken()) +// __webpack_nonce__ = btoa(OC.requestToken) /* eslint-disable-next-line camelcase, no-undef */ -__webpack_public_path__ = linkTo('polls', 'js/') +__webpack_public_path__ = generateFilePath('polls', '', 'js/') +// __webpack_public_path__ = linkTo('polls', 'js/') Vue.config.debug = process.env.NODE_ENV !== 'production' Vue.config.devTools = process.env.NODE_ENV !== 'production' @@ -53,6 +56,7 @@ Vue.prototype.n = n Vue.prototype.$http = axios Vue.prototype.OC = OC Vue.prototype.OCA = OCA +Vue.prototype.getCurrentUser = getCurrentUser Vue.component('UserDiv', UserDiv) Vue.component('ButtonDiv', ButtonDiv) diff --git a/src/js/store/modules/acl.js b/src/js/store/modules/acl.js index f9641a57..33da7534 100644 --- a/src/js/store/modules/acl.js +++ b/src/js/store/modules/acl.js @@ -22,10 +22,11 @@ */ import axios from '@nextcloud/axios' +import { getCurrentUser } from '@nextcloud/auth' const defaultAcl = () => { return { - userId: OC.getCurrentUser().uid, + userId: getCurrentUser, pollId: null, token: null, isOwner: false, diff --git a/src/js/store/modules/polls.js b/src/js/store/modules/polls.js index 516d7d72..a01ef2c7 100644 --- a/src/js/store/modules/polls.js +++ b/src/js/store/modules/polls.js @@ -22,6 +22,7 @@ */ import axios from '@nextcloud/axios' +import { getCurrentUser } from '@nextcloud/auth' const state = { list: [], @@ -42,7 +43,7 @@ const getters = { if (filterId === 'all') { return state.list.filter(poll => (!poll.deleted)) } else if (filterId === 'my') { - return state.list.filter(poll => (poll.owner === OC.getCurrentUser().uid && !poll.deleted)) + return state.list.filter(poll => (poll.owner === getCurrentUser && !poll.deleted)) } else if (filterId === 'relevant') { return state.list.filter(poll => (( poll.userHasVoted diff --git a/src/js/views/NotFound.vue b/src/js/views/NotFound.vue index 7df03bd8..d530fa21 100644 --- a/src/js/views/NotFound.vue +++ b/src/js/views/NotFound.vue @@ -26,7 +26,7 @@ <div id="emptycontent-icon" class="icon-search" /> <h2>{{ t('polls', 'The poll does not exist') }}</h2> - <p v-if="OC.currentUser" class="emptycontent-additional"> + <p v-if="getCurrentUser" class="emptycontent-additional"> {{ t('polls', 'Enter a poll or start a new one.') }} </p> <button v-else @click="gotoLogin()"> diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue index 9c456b97..6c7566e3 100644 --- a/src/js/views/Vote.vue +++ b/src/js/views/Vote.vue @@ -42,7 +42,7 @@ </h2> <PollInformation /> - <VoteHeaderPublic v-if="!OC.currentUser" /> + <VoteHeaderPublic v-if="getCurrentUser" /> <h3 class="description"> {{ poll.description ? poll.description : t('polls', 'No description provided') }} @@ -62,7 +62,7 @@ </div> </div> - <Subscription v-if="OC.currentUser" /> + <Subscription v-if="getCurrentUser" /> <div class="additional"> <ParticipantsList v-if="acl.allowSeeUsernames" /> |