a
/
agola-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #28 from sgotti/register_login_show_no_remote_sources 

register/login: display if there are no remote sources
This commit is contained in:
Simone Gotti 2020-02-14 14:04:57 +01:00 committed by GitHub
parent 4038ec5c2a 6eba09aa5a
commit 6ce37574cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/Login.vue
View File

@ -8,6 +8,19 @@
<span class="block sm:inline">{{ error }}</span>
</div>
<div>
<div
v-if="!hasRemoteSources"
class="mb-10 bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
>
No remote sources defined
</div>
<div
v-else-if="!hasLoginRemoteSources"
class="mb-10 bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
>
No remote sources enabled for login
</div>
<div v-else>
<div
class="my-6 flex justify-center items-center"
v-for="rs in remotesources"
@ -26,7 +39,10 @@
<button
class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
@click="doLogin(null, null, rs.name)"
>Login with {{rs.name}}</button>
>
Login with {{ rs.name }}
</button>
</div>
</div>
</div>
</div>
@ -58,6 +74,22 @@ export default {
remotesources: null
};
},
computed: {
hasRemoteSources() {
if (this.remotesources) {
return this.remotesources.length > 0;
}
return false;
},
hasLoginRemoteSources() {
for (let rs of this.remotesources) {
if (rs.login_enabled) {
return true;
}
}
return false;
}
},
methods: {
async fetchRemoteSources() {
let { data, error } = await fetchRemoteSources();

48
src/views/Register.vue
View File

@ -12,10 +12,29 @@
<RegisterForm
:remote-username="registeruser.remote_user_info.LoginName"
:username="registeruser.remote_user_info.LoginName"
v-on:login="doRegister(registeruser.remote_source_name, $event.username, registeruser.remote_source_login_name, registeruser.remote_source_login_password)"
v-on:login="
doRegister(
registeruser.remote_source_name,
$event.username,
registeruser.remote_source_login_name,
registeruser.remote_source_login_password
)
"
/>
</div>
</div>
<div
v-else-if="!hasRemoteSources"
class="mb-10 bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
>
No remote sources defined
</div>
<div
v-else-if="!hasRegisterRemoteSources"
class="mb-10 bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
>
No remote sources enabled for registration
</div>
<div v-else>
<div
class="my-6 flex justify-center items-center"
@ -35,7 +54,9 @@
<button
class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
@click="doAuthorize(rs.name)"
>Register with {{rs.name}}</button>
>
Register with {{ rs.name }}
</button>
</div>
</div>
</div>
@ -68,7 +89,22 @@ export default {
};
},
computed: {
...mapGetters(["registeruser"])
...mapGetters(["registeruser"]),
hasRemoteSources() {
if (this.remotesources) {
return this.remotesources.length > 0;
}
return false;
},
hasRegisterRemoteSources() {
for (let rs of this.remotesources) {
if (rs.registration_enabled) {
return true;
}
}
return false;
}
},
methods: {
async fetchRemoteSources() {
@ -81,14 +117,16 @@ export default {
},
async doAuthorize(remotesourcename, username, password) {
let u = authorizeurl();
let res = await (await fetch(u, {
let res = await (
await fetch(u, {
method: "POST",
body: JSON.stringify({
remote_source_name: remotesourcename,
login_name: username,
password: password
})
})).json();
})
).json();
if (res.oauth2_redirect) {
window.location = res.oauth2_redirect;