From 26c3107750ef53243e26dd326b731a7fbebfbe3a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 15 Jan 2021 15:39:51 +0100
Subject: [PATCH 01/14] setup for switch iser role as admin

---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/schema/resolvers/users.js         | 24 +++++++++++++++++++
 backend/src/schema/types/type/User.gql        |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index f4f8c654b..734931df2 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -149,6 +149,7 @@ export default shield(
       pinPost: isAdmin,
       unpinPost: isAdmin,
       UpdateDonations: isAdmin,
+      switchUserRole: isAdmin,
     },
     User: {
       email: or(isMyOwn, isAdmin),
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index e276968e5..789ca2a37 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -244,6 +244,30 @@ export default {
         session.close()
       }
     },
+    switchUserRole: async (object, args, context, resolveInfo) => {
+      const { role, id } = args
+
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const switchUserRoleResponse = await transaction.run(
+          `
+            MATCH (user:User {id: $id})
+            SET user.role = $role
+            SET user.updatedAt = toString(datetime())
+            RETURN user {.*}
+          `,
+          { id, role },
+        )
+        const [user] = switchUserRoleResponse.records.map((record) => record.get('user'))
+        return user
+      })
+      try {
+        const user = await writeTxResultPromise
+        return user
+      } finally {
+        session.close()
+      }
+    },
   },
   User: {
     email: async (parent, params, context, resolveInfo) => {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index e6e7191c5..17115c5ab 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -212,4 +212,6 @@ type Mutation {
   unmuteUser(id: ID!): User
   blockUser(id: ID!): User
   unblockUser(id: ID!): User
+
+  switchUserRole(role: UserGroup!, id: ID!): User
 }

From 78ed32fa4bc79be87d1a9c698df5dc1947799cc4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 15 Jan 2021 15:39:51 +0100
Subject: [PATCH 02/14] setup for switch iser role as admin

---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/schema/resolvers/users.js         | 24 +++++++++++++++++++
 backend/src/schema/types/type/User.gql        |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index f4f8c654b..734931df2 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -149,6 +149,7 @@ export default shield(
       pinPost: isAdmin,
       unpinPost: isAdmin,
       UpdateDonations: isAdmin,
+      switchUserRole: isAdmin,
     },
     User: {
       email: or(isMyOwn, isAdmin),
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index e276968e5..789ca2a37 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -244,6 +244,30 @@ export default {
         session.close()
       }
     },
+    switchUserRole: async (object, args, context, resolveInfo) => {
+      const { role, id } = args
+
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const switchUserRoleResponse = await transaction.run(
+          `
+            MATCH (user:User {id: $id})
+            SET user.role = $role
+            SET user.updatedAt = toString(datetime())
+            RETURN user {.*}
+          `,
+          { id, role },
+        )
+        const [user] = switchUserRoleResponse.records.map((record) => record.get('user'))
+        return user
+      })
+      try {
+        const user = await writeTxResultPromise
+        return user
+      } finally {
+        session.close()
+      }
+    },
   },
   User: {
     email: async (parent, params, context, resolveInfo) => {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index e6e7191c5..17115c5ab 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -212,4 +212,6 @@ type Mutation {
   unmuteUser(id: ID!): User
   blockUser(id: ID!): User
   unblockUser(id: ID!): User
+
+  switchUserRole(role: UserGroup!, id: ID!): User
 }

From 190f9ba322eb1eddc9f052a6707bf1acfb1c09c3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 15 Jan 2021 15:39:51 +0100
Subject: [PATCH 03/14] setup for switch iser role as admin

---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/schema/resolvers/users.js         | 24 +++++++++++++++++++
 backend/src/schema/types/type/User.gql        |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index f4f8c654b..734931df2 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -149,6 +149,7 @@ export default shield(
       pinPost: isAdmin,
       unpinPost: isAdmin,
       UpdateDonations: isAdmin,
+      switchUserRole: isAdmin,
     },
     User: {
       email: or(isMyOwn, isAdmin),
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index e276968e5..789ca2a37 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -244,6 +244,30 @@ export default {
         session.close()
       }
     },
+    switchUserRole: async (object, args, context, resolveInfo) => {
+      const { role, id } = args
+
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const switchUserRoleResponse = await transaction.run(
+          `
+            MATCH (user:User {id: $id})
+            SET user.role = $role
+            SET user.updatedAt = toString(datetime())
+            RETURN user {.*}
+          `,
+          { id, role },
+        )
+        const [user] = switchUserRoleResponse.records.map((record) => record.get('user'))
+        return user
+      })
+      try {
+        const user = await writeTxResultPromise
+        return user
+      } finally {
+        session.close()
+      }
+    },
   },
   User: {
     email: async (parent, params, context, resolveInfo) => {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index e6e7191c5..17115c5ab 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -212,4 +212,6 @@ type Mutation {
   unmuteUser(id: ID!): User
   blockUser(id: ID!): User
   unblockUser(id: ID!): User
+
+  switchUserRole(role: UserGroup!, id: ID!): User
 }

From d5e227a38ad1882dd2f1b0c9b818b4610252e824 Mon Sep 17 00:00:00 2001
From: narendra chandra <tippanamadhusudan@gmail.com>
Date: Sun, 24 Jan 2021 21:07:45 -0500
Subject: [PATCH 04/14] Added user role change feature

---
 webapp/graphql/admin/Roles.js | 25 +++++++++++++++++++++++++
 webapp/pages/admin/users.vue  | 29 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 webapp/graphql/admin/Roles.js

diff --git a/webapp/graphql/admin/Roles.js b/webapp/graphql/admin/Roles.js
new file mode 100644
index 000000000..4542708f3
--- /dev/null
+++ b/webapp/graphql/admin/Roles.js
@@ -0,0 +1,25 @@
+import gql from 'graphql-tag'
+
+export const FetchAllRoles = gql`
+  query {
+    __type(name: "UserGroup") {
+      name
+      enumValues {
+        name
+      }
+    }
+  }
+`
+
+export const updateUserRole = (role, id) => {
+  return gql`
+        mutation {
+            switchUserRole(role: ${role}, id: "${id}" ) {
+                name
+                role
+                id
+                updatedAt
+                email
+            }
+        }`
+}
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 3d9a4f660..1b761770f 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -48,6 +48,23 @@
         <template #createdAt="scope">
           {{ scope.row.createdAt | dateTime }}
         </template>
+
+        <template slot="role" slot-scope="scope">
+          <ApolloQuery :query="FetchAllRoles">
+            <template v-slot="{ result: { data } }">
+              <template v-if="data">
+                <select
+                  :value="`${scope.row.role}`"
+                  v-on:change="changeUserRole(scope.row.id, $event)"
+                >
+                  <option v-for="value in data.__type.enumValues" :key="value.name">
+                    {{ value.name }}
+                  </option>
+                </select>
+              </template>
+            </template>
+          </ApolloQuery>
+        </template>
       </ds-table>
       <pagination-buttons :hasNext="hasNext" :hasPrevious="hasPrevious" @next="next" @back="back" />
     </base-card>
@@ -62,6 +79,7 @@ import gql from 'graphql-tag'
 import { isEmail } from 'validator'
 import normalizeEmail from '~/components/utils/NormalizeEmail'
 import PaginationButtons from '~/components/_new/generic/PaginationButtons/PaginationButtons'
+import { FetchAllRoles, updateUserRole } from '~/graphql/admin/Roles'
 
 export default {
   components: {
@@ -77,6 +95,7 @@ export default {
       hasNext: false,
       email: null,
       filter: null,
+      FetchAllRoles,
       form: {
         formData: {
           query: '',
@@ -174,6 +193,16 @@ export default {
         }
       }
     },
+    changeUserRole(id, event) {
+      const newRole = event.target.value
+      // this.role = '';
+      // const id = this.User[0].id;
+      this.$apollo
+        .mutate({
+          mutation: updateUserRole(newRole, id),
+        })
+        .catch((error) => this.$toast.error(error.message))
+    },
   },
 }
 </script>

From 0af45c015624a5cee700aa43dc0095e5afb750b4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 29 Jan 2021 14:16:42 +0100
Subject: [PATCH 05/14] change role as admin tests added. current user cannot
 change own role

---
 backend/src/schema/resolvers/users.js      |  1 +
 backend/src/schema/resolvers/users.spec.js | 80 ++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 789ca2a37..55094f088 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -247,6 +247,7 @@ export default {
     switchUserRole: async (object, args, context, resolveInfo) => {
       const { role, id } = args
 
+      if (context.user.id === id) throw new Error('you-cannot-change-your-own-role')
       const session = context.driver.session()
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const switchUserRoleResponse = await transaction.run(
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index cce45ae6e..df0958342 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -45,6 +45,18 @@ const deleteUserMutation = gql`
   }
 `
 
+const switchUserRoleMutation = gql`
+  mutation($role: UserGroup!, $id: ID!) {
+    switchUserRole(role: $role, id: $id) {
+      name
+      role
+      id
+      updatedAt
+      email
+    }
+  }
+`
+
 beforeAll(() => {
   const { server } = createServer({
     context: () => {
@@ -458,3 +470,71 @@ describe('Delete a User as admin', () => {
     })
   })
 })
+
+describe('switch user role', () => {
+  beforeEach(async () => {
+    user = await Factory.build('user', {
+      id: 'user',
+      role: 'user',
+    })
+    admin = await Factory.build('user', {
+      role: 'admin',
+      id: 'admin',
+    })
+  })
+
+  describe('as simple user', () => {
+    it('cannot change the role', async () => {
+      authenticatedUser = await user.toJson()
+      variables = {
+        id: 'user',
+        role: 'admin',
+      }
+      await expect(mutate({ mutation: switchUserRoleMutation, variables })).resolves.toEqual(
+        expect.objectContaining({
+          errors: [
+            expect.objectContaining({
+              message: 'Not Authorised!',
+            }),
+          ],
+        }),
+      )
+    })
+  })
+
+  describe('as admin', () => {
+    it('changes the role of other user', async () => {
+      authenticatedUser = await admin.toJson()
+      variables = {
+        id: 'user',
+        role: 'moderator',
+      }
+      await expect(mutate({ mutation: switchUserRoleMutation, variables })).resolves.toEqual(
+        expect.objectContaining({
+          data: {
+            switchUserRole: expect.objectContaining({
+              role: 'moderator',
+            }),
+          },
+        }),
+      )
+    })
+
+    it('cannot change own role', async () => {
+      authenticatedUser = await admin.toJson()
+      variables = {
+        id: 'admin',
+        role: 'moderator',
+      }
+      await expect(mutate({ mutation: switchUserRoleMutation, variables })).resolves.toEqual(
+        expect.objectContaining({
+          errors: [
+            expect.objectContaining({
+              message: 'you-cannot-change-your-own-role',
+            }),
+          ],
+        }),
+      )
+    })
+  })
+})

From 4920a902c452b18c0862423519c57405a8ffa7e3 Mon Sep 17 00:00:00 2001
From: narendra chandra <tippanamadhusudan@gmail.com>
Date: Sat, 6 Feb 2021 17:12:24 -0500
Subject: [PATCH 06/14] User cannot change their own role

---
 webapp/pages/admin/users.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 1b761770f..082ffde0d 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -49,7 +49,7 @@
           {{ scope.row.createdAt | dateTime }}
         </template>
 
-        <template slot="role" slot-scope="scope">
+        <template slot="role" slot-scope="scope" v-if="scope.row.email != currentUser.email">
           <ApolloQuery :query="FetchAllRoles">
             <template v-slot="{ result: { data } }">
               <template v-if="data">
@@ -75,6 +75,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import gql from 'graphql-tag'
 import { isEmail } from 'validator'
 import normalizeEmail from '~/components/utils/NormalizeEmail'
@@ -107,6 +108,9 @@ export default {
     hasPrevious() {
       return this.offset > 0
     },
+    ...mapGetters({
+      currentUser: 'auth/user',
+    }),
     fields() {
       return {
         index: this.$t('admin.users.table.columns.number'),
@@ -194,14 +198,16 @@ export default {
       }
     },
     changeUserRole(id, event) {
-      const newRole = event.target.value
-      // this.role = '';
-      // const id = this.User[0].id;
+      const newRole = event.target.value;
       this.$apollo
         .mutate({
           mutation: updateUserRole(newRole, id),
         })
-        .catch((error) => this.$toast.error(error.message))
+        .catch((error) => {
+            console.log(error.message);
+            this.$toast.error(error.message)
+          }
+        )
     },
   },
 }

From ce23692922848f5815dc72af38581e643295e2c3 Mon Sep 17 00:00:00 2001
From: narendra chandra <tippanamadhusudan@gmail.com>
Date: Sat, 6 Feb 2021 17:34:17 -0500
Subject: [PATCH 07/14] User cannot change their role

---
 webapp/pages/admin/users.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 082ffde0d..9683addb5 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -202,6 +202,7 @@ export default {
       this.$apollo
         .mutate({
           mutation: updateUserRole(newRole, id),
+          variables: { role: newRole, id}
         })
         .catch((error) => {
             console.log(error.message);

From c39e7224dc8e34a9296b7e40319ba088b96eed26 Mon Sep 17 00:00:00 2001
From: narendra chandra <tippanamadhusudan@gmail.com>
Date: Sat, 6 Feb 2021 17:45:21 -0500
Subject: [PATCH 08/14] User cannot change their own role

---
 webapp/pages/admin/users.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 9683addb5..43aba99e6 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -198,17 +198,16 @@ export default {
       }
     },
     changeUserRole(id, event) {
-      const newRole = event.target.value;
+      const newRole = event.target.value
       this.$apollo
         .mutate({
           mutation: updateUserRole(newRole, id),
-          variables: { role: newRole, id}
+          variables: { role: newRole, id },
         })
         .catch((error) => {
-            console.log(error.message);
-            this.$toast.error(error.message)
-          }
-        )
+          console.log(error.message)
+          this.$toast.error(error.message)
+        })
     },
   },
 }

From 7571361b92afd1b1cc458b1bcacc79b98704dd20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 8 Feb 2021 10:01:51 +0100
Subject: [PATCH 09/14] Fix linting by deleting console.log

---
 webapp/pages/admin/users.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 43aba99e6..5cd025a97 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -205,7 +205,6 @@ export default {
           variables: { role: newRole, id },
         })
         .catch((error) => {
-          console.log(error.message)
           this.$toast.error(error.message)
         })
     },

From 9ef42940ae79dc93bc868727308bc4f7d9815688 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 8 Feb 2021 18:43:12 +0100
Subject: [PATCH 10/14] change user roles: fixed mutation parameters, added
 success toast

---
 webapp/graphql/admin/Roles.js | 19 ++++++++++---------
 webapp/locales/de.json        |  1 +
 webapp/locales/en.json        |  1 +
 webapp/pages/admin/users.vue  |  7 ++++++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/webapp/graphql/admin/Roles.js b/webapp/graphql/admin/Roles.js
index 4542708f3..22e0b8fff 100644
--- a/webapp/graphql/admin/Roles.js
+++ b/webapp/graphql/admin/Roles.js
@@ -13,13 +13,14 @@ export const FetchAllRoles = gql`
 
 export const updateUserRole = (role, id) => {
   return gql`
-        mutation {
-            switchUserRole(role: ${role}, id: "${id}" ) {
-                name
-                role
-                id
-                updatedAt
-                email
-            }
-        }`
+    mutation($role: UserGroup!, $id: ID!) {
+      switchUserRole(role: $role, id: $id) {
+        name
+        role
+        id
+        updatedAt
+        email
+      }
+    }
+  `
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 4d34757d8..9ef86a7d4 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -63,6 +63,7 @@
         "placeholder": "E-Mail, Name oder Beschreibung"
       },
       "name": "Benutzer",
+      "roleChanged": "Rolle erfolgreich geändert!",
       "table": {
         "columns": {
           "createdAt": "Erstellt am",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index afb767c14..3c2af7556 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -63,6 +63,7 @@
         "placeholder": "e-mail, name or description"
       },
       "name": "Users",
+      "roleChanged": "Role changed successfully!",
       "table": {
         "columns": {
           "createdAt": "Created at",
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 5cd025a97..17562cf7f 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -49,11 +49,12 @@
           {{ scope.row.createdAt | dateTime }}
         </template>
 
-        <template slot="role" slot-scope="scope" v-if="scope.row.email != currentUser.email">
+        <template slot="role" slot-scope="scope">
           <ApolloQuery :query="FetchAllRoles">
             <template v-slot="{ result: { data } }">
               <template v-if="data">
                 <select
+                  v-if="scope.row.id !== currentUser.id"
                   :value="`${scope.row.role}`"
                   v-on:change="changeUserRole(scope.row.id, $event)"
                 >
@@ -61,6 +62,7 @@
                     {{ value.name }}
                   </option>
                 </select>
+                <ds-text v-else>{{ scope.row.role }}</ds-text>
               </template>
             </template>
           </ApolloQuery>
@@ -204,6 +206,9 @@ export default {
           mutation: updateUserRole(newRole, id),
           variables: { role: newRole, id },
         })
+        .then(({ data }) => {
+          this.$toast.success(this.$t('admin.users.roleChanged'))
+        })
         .catch((error) => {
           this.$toast.error(error.message)
         })

From c528269cb2972e6ea937d31ba22d0e11168141f2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 9 Feb 2021 12:27:32 +0100
Subject: [PATCH 11/14] change user roles is working, test fails

---
 webapp/graphql/admin/Roles.js    | 16 ++++---
 webapp/pages/admin/users.spec.js | 82 +++++++++++++++++++++++++++++++-
 webapp/pages/admin/users.vue     | 40 +++++++++-------
 3 files changed, 112 insertions(+), 26 deletions(-)

diff --git a/webapp/graphql/admin/Roles.js b/webapp/graphql/admin/Roles.js
index 22e0b8fff..531961656 100644
--- a/webapp/graphql/admin/Roles.js
+++ b/webapp/graphql/admin/Roles.js
@@ -1,15 +1,17 @@
 import gql from 'graphql-tag'
 
-export const FetchAllRoles = gql`
-  query {
-    __type(name: "UserGroup") {
-      name
-      enumValues {
+export const FetchAllRoles = () => {
+  return gql`
+    query {
+      __type(name: "UserGroup") {
         name
+        enumValues {
+          name
+        }
       }
     }
-  }
-`
+  `
+}
 
 export const updateUserRole = (role, id) => {
   return gql`
diff --git a/webapp/pages/admin/users.spec.js b/webapp/pages/admin/users.spec.js
index 37d155b92..459ffaa28 100644
--- a/webapp/pages/admin/users.spec.js
+++ b/webapp/pages/admin/users.spec.js
@@ -1,27 +1,57 @@
-import { mount } from '@vue/test-utils'
+import { config, mount } from '@vue/test-utils'
+import Vuex from 'vuex'
 import Users from './users.vue'
 
 const localVue = global.localVue
+config.stubs['nuxt-link'] = '<span><slot /></span>'
 
 describe('Users', () => {
   let wrapper
   let Wrapper
   let mocks
+  let getters
 
   beforeEach(() => {
     mocks = {
       $t: jest.fn(),
       $apollo: {
         loading: false,
+        mutate: jest
+          .fn()
+          .mockRejectedValue({ message: 'Ouch!' })
+          .mockResolvedValue({
+            data: {
+              switchUserRole: {
+                id: 'user',
+                email: 'user@example.org',
+                name: 'User',
+                role: 'moderator',
+                slug: 'user',
+              },
+            },
+          }),
+      },
+      $toast: {
+        error: jest.fn(),
+        success: jest.fn(),
       },
     }
   })
 
   describe('mount', () => {
+    getters = {
+      'auth/isAdmin': () => true,
+      'auth/user': () => {
+        return { id: 'admin' }
+      },
+    }
+
     Wrapper = () => {
+      const store = new Vuex.Store({ getters })
       return mount(Users, {
         mocks,
         localVue,
+        store,
       })
     }
 
@@ -69,5 +99,55 @@ describe('Users', () => {
         })
       })
     })
+
+    describe('change roles', () => {
+      beforeAll(() => {
+        wrapper = Wrapper()
+        wrapper.setData({
+          User: [
+            {
+              id: 'admin',
+              email: 'admin@example.org',
+              name: 'Admin',
+              role: 'admin',
+              slug: 'admin',
+            },
+            {
+              id: 'user',
+              email: 'user@example.org',
+              name: 'User',
+              role: 'user',
+              slug: 'user',
+            },
+          ],
+          userRoles: ['user', 'moderator', 'admin'],
+        })
+      })
+
+      it('cannot change own role', () => {
+        const adminRow = wrapper.findAll('tr').at(1)
+        expect(adminRow.find('select').exists()).toBe(false)
+      })
+
+      it('changes the role of another user', async () => {
+        jest.useFakeTimers()
+
+        // console.log(wrapper.html())
+
+        const userRow = wrapper.findAll('tr').at(2)
+        await userRow.findAll('option').at(2).setSelected()
+
+        jest.runAllTimers()
+
+        await wrapper.vm.$nextTick()
+        await wrapper.vm.$nextTick()
+        await wrapper.vm.$nextTick()
+        await wrapper.vm.$nextTick()
+
+        await mocks.$apollo.mutate
+        // await expect(mocks.$apollo.mutate).toHaveBeenCalled()
+        await expect(mocks.$toast.success).toHaveBeenCalled()
+      })
+    })
   })
 })
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 17562cf7f..e8b4cfdf5 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -50,22 +50,18 @@
         </template>
 
         <template slot="role" slot-scope="scope">
-          <ApolloQuery :query="FetchAllRoles">
-            <template v-slot="{ result: { data } }">
-              <template v-if="data">
-                <select
-                  v-if="scope.row.id !== currentUser.id"
-                  :value="`${scope.row.role}`"
-                  v-on:change="changeUserRole(scope.row.id, $event)"
-                >
-                  <option v-for="value in data.__type.enumValues" :key="value.name">
-                    {{ value.name }}
-                  </option>
-                </select>
-                <ds-text v-else>{{ scope.row.role }}</ds-text>
-              </template>
-            </template>
-          </ApolloQuery>
+          <template v-if="userRoles">
+            <select
+              v-if="scope.row.id !== currentUser.id"
+              :value="`${scope.row.role}`"
+              v-on:change="changeUserRole(scope.row.id, $event)"
+            >
+              <option v-for="value in userRoles" :key="value">
+                {{ value }}
+              </option>
+            </select>
+            <ds-text v-else>{{ scope.row.role }}</ds-text>
+          </template>
         </template>
       </ds-table>
       <pagination-buttons :hasNext="hasNext" :hasPrevious="hasPrevious" @next="next" @back="back" />
@@ -98,7 +94,7 @@ export default {
       hasNext: false,
       email: null,
       filter: null,
-      FetchAllRoles,
+      userRoles: [],
       form: {
         formData: {
           query: '',
@@ -178,6 +174,14 @@ export default {
         return User.map((u, i) => Object.assign({}, u, { index: this.offset + i }))
       },
     },
+    userRoles: {
+      query() {
+        return FetchAllRoles()
+      },
+      update({ __type }) {
+        return __type.enumValues.map((item) => item.name)
+      },
+    },
   },
   methods: {
     back() {
@@ -203,7 +207,7 @@ export default {
       const newRole = event.target.value
       this.$apollo
         .mutate({
-          mutation: updateUserRole(newRole, id),
+          mutation: updateUserRole(),
           variables: { role: newRole, id },
         })
         .then(({ data }) => {

From 14dfe2ae2cd4a24c06c9229893b33586dfceae4f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 9 Feb 2021 12:50:13 +0100
Subject: [PATCH 12/14] change user role: tests are working

---
 webapp/pages/admin/users.spec.js | 81 +++++++++++++++-----------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/webapp/pages/admin/users.spec.js b/webapp/pages/admin/users.spec.js
index 459ffaa28..7c078fa18 100644
--- a/webapp/pages/admin/users.spec.js
+++ b/webapp/pages/admin/users.spec.js
@@ -8,35 +8,32 @@ config.stubs['nuxt-link'] = '<span><slot /></span>'
 describe('Users', () => {
   let wrapper
   let Wrapper
-  let mocks
   let getters
 
-  beforeEach(() => {
-    mocks = {
-      $t: jest.fn(),
-      $apollo: {
-        loading: false,
-        mutate: jest
-          .fn()
-          .mockRejectedValue({ message: 'Ouch!' })
-          .mockResolvedValue({
-            data: {
-              switchUserRole: {
-                id: 'user',
-                email: 'user@example.org',
-                name: 'User',
-                role: 'moderator',
-                slug: 'user',
-              },
+  const mocks = {
+    $t: jest.fn(),
+    $apollo: {
+      loading: false,
+      mutate: jest
+        .fn()
+        .mockRejectedValue({ message: 'Ouch!' })
+        .mockResolvedValue({
+          data: {
+            switchUserRole: {
+              id: 'user',
+              email: 'user@example.org',
+              name: 'User',
+              role: 'moderator',
+              slug: 'user',
             },
-          }),
-      },
-      $toast: {
-        error: jest.fn(),
-        success: jest.fn(),
-      },
-    }
-  })
+          },
+        }),
+    },
+    $toast: {
+      error: jest.fn(),
+      success: jest.fn(),
+    },
+  }
 
   describe('mount', () => {
     getters = {
@@ -129,24 +126,24 @@ describe('Users', () => {
         expect(adminRow.find('select').exists()).toBe(false)
       })
 
-      it('changes the role of another user', async () => {
-        jest.useFakeTimers()
-
-        // console.log(wrapper.html())
-
+      it('changes the role of another user', () => {
         const userRow = wrapper.findAll('tr').at(2)
-        await userRow.findAll('option').at(2).setSelected()
+        userRow.findAll('option').at(1).setSelected()
+        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
+          expect.objectContaining({
+            variables: {
+              id: 'user',
+              role: 'moderator',
+            },
+          }),
+        )
+        // await expect(mocks.$toast.success).toHaveBeenCalled()
+      })
 
-        jest.runAllTimers()
-
-        await wrapper.vm.$nextTick()
-        await wrapper.vm.$nextTick()
-        await wrapper.vm.$nextTick()
-        await wrapper.vm.$nextTick()
-
-        await mocks.$apollo.mutate
-        // await expect(mocks.$apollo.mutate).toHaveBeenCalled()
-        await expect(mocks.$toast.success).toHaveBeenCalled()
+      it('toasts a success message after role has changed', () => {
+        const userRow = wrapper.findAll('tr').at(2)
+        userRow.findAll('option').at(1).setSelected()
+        expect(mocks.$toast.success).toHaveBeenCalled()
       })
     })
   })

From dd8f32bbd319818ff15dce7f30f6679202b2d408 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 9 Feb 2021 17:51:52 +0100
Subject: [PATCH 13/14] switch user role: removed unecessary comment

---
 webapp/pages/admin/users.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/pages/admin/users.spec.js b/webapp/pages/admin/users.spec.js
index 7c078fa18..e8e624cc1 100644
--- a/webapp/pages/admin/users.spec.js
+++ b/webapp/pages/admin/users.spec.js
@@ -137,7 +137,6 @@ describe('Users', () => {
             },
           }),
         )
-        // await expect(mocks.$toast.success).toHaveBeenCalled()
       })
 
       it('toasts a success message after role has changed', () => {

From 63e62ddb68d18e7eab38b900301bd72d6db8045f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 10 Feb 2021 13:14:45 +0100
Subject: [PATCH 14/14] v 0.6.6

---
 CHANGELOG.md         | 24 ++++++++++++++++++++++--
 backend/package.json |  2 +-
 package.json         |  2 +-
 webapp/package.json  |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b256df9da..e3183e7a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,29 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v0.6.5](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/0.6.4...v0.6.5)
+#### [v0.6.6](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/0.6.5...v0.6.6)
 
-- updated CHANGELOG.md [`9d9075f`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/9d9075f2117b2eb4b607e7d59ab18c7e655c6ea7)
+- feat: Image Cropping Is Optional [`#4199`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4199)
+- publish workflow [`#4195`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4195)
+- change user roles is working, test fails [`c528269`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/c528269cb2972e6ea937d31ba22d0e11168141f2)
+- file upload: refactored [`650e83f`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/650e83f4c250389477933a2e7d21d8245b0ce882)
+- change user role: tests are working [`14dfe2a`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/14dfe2ae2cd4a24c06c9229893b33586dfceae4f)
+
+#### [0.6.5](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/v0.6.4...0.6.5)
+
+> 8 February 2021
+
+- - adjusted changelog to ocelot-social repo [`9603882`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/9603882edebf8967e05abfa94e4e1ebf452d4e24)
+- - first steps towards docker image deployment & github autotagging [`5503216`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/5503216ad4a0230ac533042e4a69806590fc2a5a)
+- - deploy structure image [`a60400b`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/a60400b4fe6f59bbb80e1073db4def3ba205e1a7)
+
+#### [v0.6.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/0.6.4...v0.6.4)
+
+> 9 February 2021
+
+- chore(release): 0.6.4 [`8b7570d`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/8b7570dc35d0ea431f673a711ac051f1e1320acb)
+- change user roles is working, test fails [`8c3310a`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/8c3310abaf87c0e5597fec4f93fb37d27122c9e7)
+- change user role: tests are working [`f10da4b`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/f10da4b09388fe1e2b85abd53f6ffc67c785d4c1)
 
 #### [0.6.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/0.6.3...0.6.4)
 
diff --git a/backend/package.json b/backend/package.json
index 6b9aeb482..0f1ec1f06 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/package.json b/package.json
index 462bfc14b..3510526ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/package.json b/webapp/package.json
index 9ad6a157c..65d21d8f2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",