Merge branch 'master' into patch-1

1 files changed, 55 insertions, 36 deletions

diff --git a/apps/oauth2/src/App.vue b/apps/oauth2/src/App.vue
index 58ea4b819a6..9f720be796e 100644
--- a/apps/oauth2/src/App.vue
+++ b/apps/oauth2/src/App.vue
@@ -22,89 +22,108 @@
 <template>
 	<div id="oauth2" class="section">
 		<h2>{{ t('oauth2', 'OAuth 2.0 clients') }}</h2>
-		<p class="settings-hint">{{ t('oauth2', 'OAuth 2.0 allows external services to request access to {instanceName}.', { instanceName: OC.theme.name}) }}</p>
-		<table class="grid" v-if="clients.length > 0">
+		<p class="settings-hint">
+			{{ t('oauth2', 'OAuth 2.0 allows external services to request access to {instanceName}.', { instanceName: OC.theme.name}) }}
+		</p>
+		<table v-if="clients.length > 0" class="grid">
 			<thead>
 				<tr>
-					<th id="headerName" scope="col">{{ t('oauth2', 'Name') }}</th>
-					<th id="headerRedirectUri" scope="col">{{ t('oauth2', 'Redirection URI') }}</th>
-					<th id="headerClientIdentifier" scope="col">{{ t('oauth2', 'Client Identifier') }}</th>
-					<th id="headerSecret" scope="col">{{ t('oauth2', 'Secret') }}</th>
-					<th id="headerRemove">&nbsp;</th>
+					<th id="headerName" scope="col">
+						{{ t('oauth2', 'Name') }}
+					</th>
+					<th id="headerRedirectUri" scope="col">
+						{{ t('oauth2', 'Redirection URI') }}
+					</th>
+					<th id="headerClientIdentifier" scope="col">
+						{{ t('oauth2', 'Client Identifier') }}
+					</th>
+					<th id="headerSecret" scope="col">
+						{{ t('oauth2', 'Secret') }}
+					</th>
+					<th id="headerRemove">
+&nbsp;
+					</th>
 				</tr>
 			</thead>
 			<tbody>
 				<OAuthItem v-for="client in clients"
 					:key="client.id"
 					:client="client"
-					@delete="deleteClient"
-				/>
+					@delete="deleteClient" />
 			</tbody>
 		</table>
 
-		<br/>
+		<br>
 		<h3>{{ t('oauth2', 'Add client') }}</h3>
-		<span v-if="newClient.error" class="msg error">{{newClient.errorMsg}}</span>
+		<span v-if="newClient.error" class="msg error">{{ newClient.errorMsg }}</span>
 		<form @submit.prevent="addClient">
-			<input type="text" id="name" name="name" :placeholder="t('oauth2', 'Name')" v-model="newClient.name">
-			<input type="url" id="redirectUri" name="redirectUri" :placeholder="t('oauth2', 'Redirection URI')" v-model="newClient.redirectUri">
+			<input id="name"
+				v-model="newClient.name"
+				type="text"
+				name="name"
+				:placeholder="t('oauth2', 'Name')">
+			<input id="redirectUri"
+				v-model="newClient.redirectUri"
+				type="url"
+				name="redirectUri"
+				:placeholder="t('oauth2', 'Redirection URI')">
 			<input type="submit" class="button" :value="t('oauth2', 'Add')">
 		</form>
 	</div>
 </template>
 
 <script>
-import Axios from 'nextcloud-axios'
-import OAuthItem from './components/OAuthItem';
+import axios from '@nextcloud/axios'
+import OAuthItem from './components/OAuthItem'
+import { generateUrl } from '@nextcloud/router'
 
 export default {
 	name: 'App',
 	components: {
 		OAuthItem
 	},
+	props: {
+		clients: {
+			type: Array,
+			required: true
+		}
+	},
 	data: function() {
 		return {
-			clients: [],
 			newClient: {
 				name: '',
 				redirectUri: '',
 				errorMsg: '',
 				error: false
 			}
-		};
-	},
-	beforeMount: function() {
-		Axios.get(OC.generateUrl('apps/oauth2/clients'))
-			.then((response) => {
-			this.clients = response.data;
-		});
+		}
 	},
 	methods: {
 		deleteClient(id) {
-			Axios.delete(OC.generateUrl('apps/oauth2/clients/{id}', {id: id}))
+			axios.delete(generateUrl('apps/oauth2/clients/{id}', { id: id }))
 				.then((response) => {
-					this.clients = this.clients.filter(client => client.id !== id);
-				});
+					this.clients = this.clients.filter(client => client.id !== id)
+				})
 		},
 		addClient() {
-			this.newClient.error = false;
+			this.newClient.error = false
 
-			Axios.post(
-				OC.generateUrl('apps/oauth2/clients'),
+			axios.post(
+				generateUrl('apps/oauth2/clients'),
 				{
 					name: this.newClient.name,
 					redirectUri: this.newClient.redirectUri
 				}
 			).then(response => {
-				this.clients.push(response.data);
+				this.clients.push(response.data)
 
-				this.newClient.name = '';
-				this.newClient.redirectUri = '';
+				this.newClient.name = ''
+				this.newClient.redirectUri = ''
 			}).catch(reason => {
-				this.newClient.error = true;
-				this.newClient.errorMsg = reason.response.data.message;
-			});
+				this.newClient.error = true
+				this.newClient.errorMsg = reason.response.data.message
+			})
 		}
-	},
+	}
 }
 </script>