Add user registration

src/App.vue

@@ -36,6 +36,7 @@
               </div>
             </div>
             <div v-else class="navbar-item">
+              <router-link class="button" to="/register">Sign up</router-link>
               <router-link class="button" to="/login">Login</router-link>
             </div>
           </div>

src/components/loginform.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div>
     <div class="field">
@@ -25,7 +24,7 @@
         <button
           @click="$emit('login', { username, password })"
           class="button is-info is-fullwidth"
-        >Login with {{name}}</button>
+        >{{action}} with {{name}}</button>
       </p>
     </div>
   </div>
@@ -36,8 +35,9 @@
 import { apiurl, loginurl, fetch } from "@/util/auth";
 
 export default {
-  name: "Loginform",
+  name: "LoginForm",
   props: {
+    action: String,
     name: String
   },
   data: function() {

src/components/registerform.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <div class="field">
+      <p class="control has-icons-left has-icons-right">
+        <input v-model="username" class="input" type="email" placeholder="Email">
+        <span class="icon is-small is-left">
+          <i class="fas fa-envelope"></i>
+        </span>
+        <span class="icon is-small is-right">
+          <i class="fas fa-check"></i>
+        </span>
+      </p>
+    </div>
+    <div class="field">
+      <p class="control">
+        <button @click="$emit('login', { username })" class="button is-info is-fullwidth">Register</button>
+      </p>
+    </div>
+  </div>
+</template>
+
+
+<script>
+import { apiurl, loginurl, fetch } from "@/util/auth";
+
+export default {
+  name: "RegisterForm",
+  props: {
+    username: String
+  }
+};
+</script>
+
+
+

src/main.js

@@ -21,6 +21,7 @@ new Vue({
     if (user) {
       store.dispatch('setUser', user)
     }
+    store.dispatch("setRegisterUser", null)
   },
   render: h => h(App)
 }).$mount("#app");

src/router.js

@@ -11,6 +11,7 @@ import runs from "./components/runs.vue";
 import run from "./components/run.vue";
 import task from "./components/task.vue";
 import Oauth2 from "./views/Oauth2.vue";
+import Register from "./views/Register.vue";
 import Login from "./views/Login.vue";
 import Logout from "./views/Logout.vue";
 
@@ -19,6 +20,11 @@ Vue.use(VueRouter);
 export default new VueRouter({
   mode: "history",
   routes: [
+    {
+      path: "/register",
+      name: "register",
+      component: Register,
+    },
     {
       path: "/login",
       name: "login",

src/store.js

@@ -5,23 +5,33 @@ Vue.use(Vuex)
 
 const state = {
     user: null,
+    registeruser: null
 }
 
 const getters = {
     user: state => {
         return state.user
+    },
+    registeruser: state => {
+        return state.registeruser
     }
 }
 
 const mutations = {
     setUser(state, user) {
         state.user = user
+    },
+    setRegisterUser(state, user) {
+        state.registeruser = user
     }
 }
 
 const actions = {
     setUser({ commit }, user) {
         commit('setUser', user)
+    },
+    setRegisterUser({ commit }, user) {
+        commit('setRegisterUser', user)
     }
 }
 

src/util/auth.js

@@ -36,11 +36,19 @@ export function loginurl() {
     return new URL(API_URL + "/login");
 }
 
+export function authorizeurl() {
+    return new URL(API_URL + "/authorize");
+}
+
+export function registerurl() {
+    return new URL(API_URL + "/register");
+}
+
 export function oauth2callbackurl() {
     return new URL(API_URL + "/oauth2/callback");
 }
 
-export function fetch(url, init) {
+export async function fetch(url, init) {
     if (init === undefined) {
         init = {}
     }
@@ -52,11 +60,10 @@ export function fetch(url, init) {
         init.headers["Authorization"] = "bearer " + idToken
     }
 
-    return window.fetch(url, init).then(res => {
+    let res = await window.fetch(url, init)
-        if (res.status === 401) {
+    if (res.status === 401) {
-            router.push({ name: "login" })
+        router.push({ name: "login" })
-        } else { return res }
+    } else { return res }
-    })
 }
 
 export function setIdToken(idToken) {

src/views/Login.vue

@@ -2,7 +2,8 @@
   <div>
     <div class="column is-4 is-offset-4">
       <div class="box" v-for="rs in remotesources" v-bind:key="rs.id">
-        <Loginform
+        <LoginForm
+          action="Login"
           :name="rs.name"
           v-if="rs.auth_type == 'password'"
           v-on:login="doLogin(rs.name, $event.username, $event.password)"
@@ -18,13 +19,13 @@
 </template>
 
 <script>
-import Loginform from "@/components/loginform";
+import LoginForm from "@/components/loginform";
 import { apiurl, loginurl, fetch, login, logout } from "@/util/auth";
 
 export default {
   name: "Login",
   components: {
-    Loginform
+    LoginForm
   },
   data: function() {
     return {
@@ -32,35 +33,28 @@ export default {
     };
   },
   methods: {
-    getRemoteSources() {
+    async getRemoteSources() {
-      fetch(apiurl("/remotesources"))
+      let res = await (await fetch(apiurl("/remotesources"))).json();
-        .then(res => res.json())
+      console.log("remote sources result", res);
-        .then(res => {
+      this.remotesources = res;
-          console.log("remote sources result", res);
-          this.remotesources = res;
-        });
     },
-    doLogin(rsName, username, password) {
+    async doLogin(rsName, username, password) {
       let u = loginurl();
-      console.log("u:", u);
+      let res = await (await fetch(u, {
-      fetch(u, {
         method: "POST",
         body: JSON.stringify({
           remote_source_name: rsName,
           login_name: username,
           password: password
         })
-      })
+      })).json();
-        .then(res => res.json())
+      console.log("login result", res);
-        .then(res => {
+      if (res.oauth2_redirect) {
-          console.log("login result", res);
+        window.location = res.oauth2_redirect;
-          if (res.oauth2_redirect) {
+        return;
-            window.location = res.oauth2_redirect;
+      }
-            return;
+      login(res.token, res.user);
-          }
+      this.$router.push({ name: "home" });
-          login(res.token, res.user);
-          this.$router.push({ name: "home" });
-        });
     }
   },
   created: function() {

src/views/Oauth2.vue

@@ -1,11 +1,12 @@
 <template>
   <div>
     <div>{{code}}</div>
+    <div>{{username}}</div>
   </div>
 </template>
 
 <script>
-import { apiurl, oauth2callbackurl, fetch, setUser } from "@/util/auth";
+import { apiurl, oauth2callbackurl, login, fetch } from "@/util/auth";
 
 export default {
   components: {},
@@ -15,23 +16,24 @@ export default {
     return {
       run: null,
       code: this.$route.query.code,
-      polling: null
+      polling: null,
+      username: null
     };
   },
   methods: {
-    doOauth2() {
+    async doOauth2() {
       let u = oauth2callbackurl();
       u.searchParams.append("code", this.$route.query.code);
       u.searchParams.append("state", this.$route.query.state);
-      fetch(u)
+      let res = await (await fetch(u)).json();
-        .then(res => res.json())
+      console.log("oauth2 result", res);
-        .then(res => {
+      if (res.request_type === "loginuser") {
-          console.log("oauth2 result", res);
+        login(res.response.token, res.response.user);
-          if (res.request_type === "loginuser") {
+        this.$router.push("/");
-            this.$root.login(res.response.token, res.response.user);
+      } else if (res.request_type === "authorize") {
-            this.$router.push("/");
+        this.$store.dispatch("setRegisterUser", res.response);
-          }
+        this.$router.push("/register");
-        });
+      }
     }
   },
   created: function() {

src/views/Register.vue

@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div v-if="registeruser" class="column is-4 is-offset-4">
+      <div>{{registeruser.remote_user_info.LoginName}}</div>
+      <RegisterForm
+        :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)"
+      />
+    </div>
+    <div v-else class="column is-4 is-offset-4">
+      <div class="box" v-for="rs in remotesources" v-bind:key="rs.id">
+        <LoginForm
+          action="Register"
+          :name="rs.name"
+          v-if="rs.auth_type == 'password'"
+          v-on:login="doAuthorize(rs.name, $event.username, $event.password)"
+        />
+        <button
+          v-else
+          class="button is-info is-fullwidth"
+          @click="doAuthorize(rs.name)"
+        >Register with {{rs.name}}</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+
+import LoginForm from "@/components/loginform";
+import RegisterForm from "@/components/registerform";
+
+import { apiurl, authorizeurl, registerurl, fetch, logout } from "@/util/auth";
+
+export default {
+  name: "Register",
+  components: {
+    LoginForm,
+    RegisterForm
+  },
+  data: function() {
+    return {
+      remotesources: null
+    };
+  },
+  computed: {
+    ...mapGetters(["registeruser"])
+  },
+  methods: {
+    async getRemoteSources() {
+      let res = await (await fetch(apiurl("/remotesources"))).json();
+      console.log("remote sources result", res);
+      this.remotesources = res;
+    },
+    async doAuthorize(rsName, username, password) {
+      let u = authorizeurl();
+      let res = await (await fetch(u, {
+        method: "POST",
+        body: JSON.stringify({
+          remote_source_name: rsName,
+          login_name: username,
+          password: password
+        })
+      })).json();
+
+      console.log("login result", res);
+      if (res.oauth2_redirect) {
+        window.location = res.oauth2_redirect;
+        return;
+      }
+      this.$store.dispatch("setRegisterUser", {
+        remote_user_info: res.remote_user_info,
+        remote_source_name: res.remote_source_name,
+        remote_source_login_name: username,
+        remote_source_login_password: password
+      });
+    },
+    async doRegister(
+      rsName,
+      username,
+      remote_login_name,
+      remote_login_password
+    ) {
+      let u = registerurl();
+      let res = await (await fetch(u, {
+        method: "POST",
+        body: JSON.stringify({
+          username: username,
+          remote_source_name: rsName,
+          remote_source_login_name: remote_login_name,
+          remote_source_login_password: remote_login_password
+        })
+      })).json();
+
+      console.log("register result", res);
+      if (res.oauth2_redirect) {
+        window.location = res.oauth2_redirect;
+        return;
+      }
+      this.$router.push({ name: "home" });
+    }
+  },
+  created: function() {
+    logout();
+    this.getRemoteSources();
+  }
+};
+</script>
+
+
+