From 0667d92d2a746383620ed34abe20e16c2a5b64be Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 21 May 2019 19:24:48 +0000
Subject: [PATCH] Replace deprecated login API

---
 src/api/__mocks__/login.js | 2 +-
 src/api/login.js           | 4 ++--
 src/permission.js          | 2 +-
 src/store/modules/user.js  | 6 +++---
 src/views/users/index.vue  | 7 ++++++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/api/__mocks__/login.js b/src/api/__mocks__/login.js
index 9f1bfeb1..a94fae9b 100644
--- a/src/api/__mocks__/login.js
+++ b/src/api/__mocks__/login.js
@@ -42,7 +42,7 @@ export function getUserInfo(token, authHost) {
     'statuses_count': 0,
     'cover_photo': '',
     'hide_follows': false,
-    'pleroma': { 'confirmation_pending': false, 'deactivated': false, 'tags': ['force_nsfw'] },
+    'pleroma': { 'confirmation_pending': false, 'deactivated': false, 'tags': ['force_nsfw'], 'is_admin': true },
     'profile_image_url_original': '',
     'created_at': 'Fri Mar 01 15:15:19 +0000 2019',
     'fields': [],
diff --git a/src/api/login.js b/src/api/login.js
index adaabd54..d5ef3b38 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -32,8 +32,8 @@ export async function loginByUsername(username, password, authHost) {
 export function getUserInfo(token, authHost) {
   return request({
     baseURL: baseName(authHost),
-    url: '/api/account/verify_credentials',
-    method: 'post',
+    url: '/api/v1/accounts/verify_credentials',
+    method: 'get',
     headers: token ? { 'Authorization': `Bearer ${token}` } : {}
   })
 }
diff --git a/src/permission.js b/src/permission.js
index 1439b1b9..7dbf3c47 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,7 +26,7 @@ export const beforeEachRoute = (to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         store.dispatch('GetUserInfo').then(res => {
-          const roles = res.data.rights.admin ? ['admin'] : []
+          const roles = res.data.pleroma.is_admin ? ['admin'] : []
           store.dispatch('GenerateRoutes', { roles }).then(() => {
             router.addRoutes(store.getters.addRouters)
             next({ ...to, replace: true })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8c282e71..2a81fcb4 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -77,15 +77,15 @@ const user = {
             reject('Verification failed, please login again.')
           }
 
-          if (data.rights && data.rights.admin) {
+          if (data.pleroma && data.pleroma.is_admin) {
             commit('SET_ROLES', ['admin'])
           } else {
             reject('getInfo: roles must be a non-null array!')
           }
 
-          commit('SET_NAME', data.name)
+          commit('SET_NAME', data.username)
           commit('SET_ID', data.id)
-          commit('SET_AVATAR', data.profile_image_url)
+          commit('SET_AVATAR', data.avatar)
           commit('SET_INTRODUCTION', '')
           resolve(response)
         }).catch(error => {
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index f2691581..4a186ae3 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -3,7 +3,7 @@
     <h1>{{ $t('users.users') }}</h1>
     <div class="search-container">
       <users-filter/>
-      <el-input :placeholder="$t('users.search')" class="search" @input="handleDebounceSearchInput"/>
+      <el-input :placeholder="$t('users.search')" v-model="search" class="search" @input="handleDebounceSearchInput"/>
     </div>
     <el-table v-loading="loading" :data="users" style="width: 100%">
       <el-table-column :min-width="width" :label="$t('users.id')" prop="id" />
@@ -124,6 +124,11 @@ export default {
   components: {
     UsersFilter
   },
+  data() {
+    return {
+      search: ''
+    }
+  },
   computed: {
     loading() {
       return this.$store.state.users.loading