domain

2023-11-01 22:56:47 +09:00
parent 9cd4c8a5ab
commit f60f97380f
11 changed files with 490 additions and 147 deletions
--- a/backend/app/api/api_v1/routers/auth.py
+++ b/backend/app/api/api_v1/routers/auth.py
@@ -33,7 +33,7 @@ async def login(
        expires_delta=access_token_expires,
    )

-    return {"access_token": access_token, "token_type": "bearer"}
+    return {"access_token": access_token, "token_type": "bearer","user_name":user.first_name + " " + user.last_name,"user_id" : user.id}


@r.post("/signup")
--- a/backend/app/api/api_v1/routers/platform.py
+++ b/backend/app/api/api_v1/routers/platform.py
@@ -140,19 +140,18 @@ async def flow_delete(
    return delete_flow(db, flowid)

@r.get(
-    "/domain/{userid}",
+    "/domains/{tenantid}",
    response_model=List[Domain],
    response_model_exclude_none=True,
 )
 async def domain_details(
    request: Request,
-    userid: str,
+    tenantid:str,
    db=Depends(get_db),
 ):
-    domains = get_domain(db, userid)
+    domains = get_domains(db,tenantid)
    return domains

-
@r.post("/domain", response_model=Domain, response_model_exclude_none=True)
 async def domain_create(
    request: Request,
@@ -174,16 +173,79 @@ async def domain_edit(


@r.delete(
-    "/domain/{userid}/{id}", response_model=Domain, response_model_exclude_none=True
+    "/domain/{id}", response_model=Domain, response_model_exclude_none=True
 )
 async def domain_delete(
    request: Request,
-    userid: int,
    id: int,
    db=Depends(get_db),
 ):

-    return delete_domain(db, userid,id)
+    return delete_domain(db,id)
+
+@r.get(
+    "/domain/{userid}",
+    response_model=List[Domain],
+    response_model_exclude_none=True,
+)
+async def userdomain_details(
+    request: Request,
+    userid: str,
+    db=Depends(get_db),
+):
+    domains = get_domain(db, userid)
+    return domains
+
+@r.post(
+    "/domain/{userid}",
+    response_model_exclude_none=True,
+)
+async def create_userdomain(
+    request: Request,
+    userid: int,
+    domainids:list,
+    db=Depends(get_db),
+):
+    domain = add_userdomain(db, userid,domainids)
+    return domain
+
+@r.delete(
+    "/domain/{domainid}/{userid}", response_model_exclude_none=True
+)
+async def userdomain_delete(
+    request: Request,
+    domainid:int,
+    userid: int,
+    db=Depends(get_db),
+):
+    return delete_userdomain(db, userid,domainid)
+
+
+@r.get(
+    "/activedomain/{userid}",
+    response_model=Domain,
+    response_model_exclude_none=True,
+)
+async def get_useractivedomain(
+    request: Request,
+    userid: int,
+    db=Depends(get_db),
+):
+    domain = get_activedomain(db, userid)
+    return domain
+
+@r.put(
+    "/activedomain/{userid}/{domainid}",
+    response_model_exclude_none=True,
+)
+async def update_activeuserdomain(
+    request: Request,
+    userid: int,
+    domainid:int,
+    db=Depends(get_db),
+):
+    domain = active_userdomain(db, userid,domainid)
+    return domain


@r.get(
--- a/backend/app/db/crud.py
+++ b/backend/app/db/crud.py
@@ -1,5 +1,6 @@
 from fastapi import HTTPException, status
 from sqlalchemy.orm import Session
+from sqlalchemy import and_
 import typing as t

 from . import models, schemas
@@ -182,8 +183,8 @@ def get_flows_by_app(db: Session, appid: str):
    return flows

 def create_domain(db: Session, domain: schemas.DomainBase):
-    db_domain = models.UserDomain(
-        userid=domain.userid,
+    db_domain = models.Domain(
+        tenantid = domain.tenantid,
        name=domain.name,
        url=domain.url,
        kintoneuser=domain.kintoneuser,
@@ -194,9 +195,9 @@ def create_domain(db: Session, domain: schemas.DomainBase):
    db.refresh(db_domain)
    return db_domain

-def delete_domain(db: Session, userid: int,id: int):
-    db_domain = db.query(models.UserDomain).get(id)
-    if not db_domain or db_domain.userid != userid:
+def delete_domain(db: Session,id: int):
+    db_domain = db.query(models.Domain).get(id)
+    if not db_domain:
        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
    db.delete(db_domain)
    db.commit()
@@ -206,8 +207,8 @@ def delete_domain(db: Session, userid: int,id: int):
 def edit_domain(
    db: Session, domain: schemas.DomainBase
 ) -> schemas.Domain:
-    db_domain = db.query(models.UserDomain).get(domain.id)
-    if not db_domain or db_domain.userid != domain.userid:
+    db_domain = db.query(models.Domain).get(domain.id)
+    if not db_domain:
        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
    update_data = domain.dict(exclude_unset=True)

@@ -220,8 +221,52 @@ def edit_domain(
    db.refresh(db_domain)
    return db_domain

+def add_userdomain(db: Session, userid:int,domainids:list):
+    for domainid in domainids:
+        db_domain = models.UserDomain(
+            userid = userid,
+            domainid = domainid
+        )
+        db.add(db_domain)
+    db.commit()
+    db.refresh(db_domain)
+    return db_domain
+
+def delete_userdomain(db: Session, userid: int,domainid: int):
+    db_domain = db.query(models.UserDomain).filter(and_(models.UserDomain.userid == userid,models.UserDomain.domainid == domainid)).first()
+    if not db_domain:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    db.delete(db_domain)
+    db.commit()
+    return db_domain
+
+def active_userdomain(db: Session, userid: int,domainid: int):
+    db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
+    if not db_userdomains:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    for domain in db_userdomains:
+        if domain.domainid == domainid:
+            domain.active = True
+        else:
+            domain.active = False
+        db.add(domain)
+    db.commit()
+    return db_userdomains
+
+def get_activedomain(db: Session, userid: int):
+    db_domain = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(and_(models.UserDomain.userid == userid,models.UserDomain.active == True)).first()
+    if not db_domain:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    return db_domain
+
 def get_domain(db: Session, userid: str):
-    domains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
+    domains = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(models.UserDomain.userid == userid).all()
+    if not domains:
+        raise HTTPException(status_code=404, detail="Data not found")
+    return domains
+
+def get_domains(db: Session,tenantid:str):
+    domains = db.query(models.Domain).filter(models.Domain.tenantid == tenantid ).all()
    if not domains:
        raise HTTPException(status_code=404, detail="Data not found")
    return domains
--- a/backend/app/db/models.py
+++ b/backend/app/db/models.py
@@ -50,14 +50,30 @@ class Flow(Base):
    name = Column(String(200))   
    content = Column(String)  

-class UserDomain(Base):
-    __tablename__ = "userdomain"
+class Tenant(Base):
+    __tablename__ = "tenant"

-    userid = Column(Integer,ForeignKey("user.id"))
+    tenantid =  Column(String(100), index=True, nullable=False)
+    name = Column(String(200)) 
+    licence  = Column(String(200)) 
+    startdate = Column(DateTime)
+    enddate = Column(DateTime) 
+
+class Domain(Base):
+    __tablename__ = "domain"
+
+    tenantid =  Column(String(100), index=True, nullable=False)
    name = Column(String(100), nullable=False)   
    url = Column(String(200), nullable=False)
    kintoneuser = Column(String(100), nullable=False)
    kintonepwd = Column(String(100), nullable=False)
+
+
+class UserDomain(Base):
+    __tablename__ = "userdomain"
+
+    userid = Column(Integer,ForeignKey("user.id"))
+    domainid = Column(Integer,ForeignKey("domain.id"))
    active = Column(Boolean, default=False)

 class Event(Base):
--- a/backend/app/db/schemas.py
+++ b/backend/app/db/schemas.py
@@ -106,21 +106,19 @@ class Flow(Base):

 class DomainBase(BaseModel):
    id: int
-    userid: int 
+    tenantid: str
    name: str 
    url: str
    kintoneuser: str 
    kintonepwd: str 
-    active:bool = False

 class Domain(Base):
    id: int
-    userid: str 
+    tenantid: str
    name: str 
    url: str
    kintoneuser: str 
    kintonepwd: str 
-    active:bool

    class Config:
        orm_mode = True
--- a/frontend/src/components/DomainSelect.vue
+++ b/frontend/src/components/DomainSelect.vue
@@ -0,0 +1,42 @@
+<template>
+  <div class="q-pa-md">
+    <q-table :title="name+'一覧'" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+  </div>
+</template>
+<script>
+import { ref,onMounted,reactive } from 'vue'
+import { api } from 'boot/axios';
+
+export default {
+  name: 'DomainSelect',
+  props: {
+    name: String,
+    type: String
+  },
+  setup() {
+  const columns = [
+  { name: 'id'},
+  { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true},
+  { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true },
+  { name: 'url', label: 'URL', field: 'url', sortable: true },
+  { name: 'kintoneuser', label: 'アカウント', field: 'kintoneuser' }
+  ]
+  const rows = reactive([])
+    onMounted( () => {
+      api.get(`http://127.0.0.1:8000/api/domains/testtenant`).then(res =>{
+         res.data.forEach((item) =>
+        {
+          rows.push({id:item.id,tenantid:item.tenantid,name:item.name,url:item.url,kintoneuser:item.kintoneuser});
+        }
+        )
+      });
+      });
+    return {
+      columns,
+      rows,
+      selected: ref([]),
+    }
+  },
+
+}
+</script>
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -14,6 +14,14 @@
          Kintone App Builder
          <q-badge align="top" outline>V{{ env.version }}</q-badge>
        </q-toolbar-title>
+
+      <q-btn color="blue" size="sm" @click="authStore.userdomain()">
+        {{ authStore.domain }}
+      </q-btn>
+      <q-chip>
+
+        {{ authStore.name }}
+      </q-chip>
        <q-btn flat round dense icon="logout" @click="authStore.logout()"/>
      </q-toolbar>

--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="q-pa-md">
+    <q-table
+      title="Treats"
+      :rows="rows"
+      :columns="columns"
+      row-key="id"
+      selection="single"
+      :filter="filter"
+      :loading="loading"
+      v-model:selected="selected"
+    >
+
+      <template v-slot:top>
+        <q-btn color="primary" :disable="loading" label="新規" @click="addRow" />
+        <q-btn class="q-ml-sm" color="primary" :disable="loading" label="編集" @click="editRow" />
+        <q-btn class="q-ml-sm" color="primary" :disable="loading" label="削除" @click="removeRow" />
+        <q-space />
+        <q-input borderless dense debounce="300" color="primary" v-model="filter">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+
+    </q-table>
+
+    <q-dialog :model-value="show" persistent>
+      <q-card style="min-width: 400px">
+        <q-card-section>
+          <div class="text-h6">Kintone Account</div>
+        </q-card-section>
+
+        <q-card-section class="q-pt-none">
+          <q-form class="q-gutter-md">
+            <q-input filled v-model="tenantid" label="Tenant" hint="Tenant ID" lazy-rules
+              :rules="[val => val && val.length > 0 || 'Please type something']" />
+
+            <q-input filled v-model="name" label="Your name *" hint="Kintone envirment name" lazy-rules
+              :rules="[val => val && val.length > 0 || 'Please type something']" />
+
+            <q-input filled type="url" v-model="url" label="Kintone url" hint="Kintone domain address" lazy-rules
+              :rules="[val => val && val.length > 0, isDomain || 'Please type something']" />
+
+            <q-input filled v-model="kintoneuser" label="Login user " hint="Kintone user name" lazy-rules
+              :rules="[val => val && val.length > 0 || 'Please type something']" />
+
+            <q-input v-model="kintonepwd" filled :type="isPwd ? 'password' : 'text'" hint="Password with toggle"
+              label="User password">
+              <template v-slot:append>
+                <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer" @click="isPwd = !isPwd" />
+              </template>
+            </q-input>
+          </q-form>
+        </q-card-section>
+        <q-card-actions align="right" class="text-primary">
+          <q-btn label="Save" type="submit" color="primary" @click="onSubmit"/>
+          <q-btn label="Cancel" type="cancel" color="primary" flat class="q-ml-sm" @click="closeDg()"/>
+        </q-card-actions>
+      </q-card>
+
+    </q-dialog>
+
+    <q-dialog v-model="confirm" persistent>
+      <q-card>
+        <q-card-section class="row items-center">
+          <q-avatar icon="confirm" color="primary" text-color="white" />
+          <span class="q-ml-sm">削除してもよろしいですか？</span>
+        </q-card-section>
+
+        <q-card-actions align="right">
+          <q-btn flat label="Cancel" color="primary" v-close-popup />
+          <q-btn flat label="OK" color="primary" v-close-popup @click = "deleteDomain()"/>
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref,onMounted, reactive} from 'vue';
+import { useQuasar } from 'quasar'
+import { api } from 'boot/axios';
+
+const columns = [
+  { name: 'id'},
+  {
+    name: 'tenantid',
+    required: true,
+    label: 'Tenant',
+    align: 'left',
+    field: row => row.tenantid,
+    format: val => `${val}`,
+    sortable: true
+  },
+  { name: 'name', align: 'center', label: 'Name', field: 'name', sortable: true },
+  { name: 'url', align: 'left',label: 'URL', field: 'url', sortable: true },
+  { name: 'user', label: 'Account', field: 'user' },
+  { name: 'password', label: 'Password', field: 'password' }
+]
+
+
+  const loading = ref(false)
+  const filter = ref('')
+  const rows = reactive([])
+  const show = ref(false);
+  const confirm = ref(false);
+  const selected = ref([])
+  const tenantid = ref('')
+  const name = ref('')
+  const url =ref('')
+  const isPwd =ref(true)
+  const kintoneuser =ref('')
+  const kintonepwd =ref('')
+
+  const $q = useQuasar()
+
+  let editId = ref(0);
+
+    const getDomain = () => {
+      loading.value = true;
+      api.get(`http://127.0.0.1:8000/api/domains/testtenant`).then(res => {
+        rows.length = 0;
+        res.data.forEach((item) => {
+          rows.push({ id:item.id,tenantid: item.tenantid,name: item.name, url: item.url, user: item.kintoneuser, password: item.kintonepwd });
+        }
+        )
+  }).finally(()=>{ loading.value = false; });
+
+}
+onMounted(() => {
+  getDomain();
+})
+
+
+
+      // emulate fetching data from server
+      const addRow = () => {
+        editId.value
+        show.value = true;
+      }
+
+      const removeRow = () => {
+        //loading.value = true
+        confirm.value = true;
+        let row = JSON.parse(JSON.stringify(selected.value[0]));
+        if(selected.value.length === 0)
+        {
+          return;
+        }
+        editId.value = row.id;
+      }
+
+      const deleteDomain = () => {
+        api.delete(`http://127.0.0.1:8000/api/domain/`+ editId.value).then(() =>{
+                  getDomain();
+                })
+        editId.value = 0;
+        selected.value=[];
+      };
+
+    const editRow = () => {
+        if(selected.value.length === 0)
+        {
+          return;
+        }
+        let row = JSON.parse(JSON.stringify(selected.value[0]));
+        editId.value = row.id;
+        tenantid.value = row.tenantid;
+        name.value = row.name;
+        url.value = row.url;
+        kintoneuser.value = row.user;
+        kintonepwd.value = row.password;
+        isPwd.value = true;
+        show.value = true;
+      };
+    const closeDg = () =>  {
+      show.value = false;
+      onReset();
+    }
+
+    const onSubmit = () => {
+      if(editId.value !== 0)
+      {
+        api.put(`http://127.0.0.1:8000/api/domain`,{
+                'id': editId.value,
+                'tenantid': tenantid.value,
+                'name': name.value,
+                'url': url.value,
+                'kintoneuser': kintoneuser.value,
+                'kintonepwd': kintonepwd.value
+              }).then(() =>{
+                getDomain();
+                closeDg();
+                onReset();
+              })
+      }
+      else
+      {
+        api.post(`http://127.0.0.1:8000/api/domain`,{
+                'id': 0,
+                'tenantid': tenantid.value,
+                'name': name.value,
+                'url': url.value,
+                'kintoneuser': kintoneuser.value,
+                'kintonepwd': kintonepwd.value
+              }).then(() =>{
+                getDomain();
+                closeDg();
+                onReset();
+              })
+      }
+      selected.value=[];
+    }
+
+  const onReset = () => {
+      name.value = '';
+      url.value = '';
+      kintoneuser.value = '';
+      kintonepwd.value ='';
+      isPwd.value = true;
+      editId.value = 0;
+    }
+</script>
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -111,7 +111,7 @@ export default {
     <q-table grid grid-header title="Domain" selection="single" :rows="rows" :columns="columns"   v-model:selected="selected" row-key="name" :filter="filter" hide-header>
      <template v-slot:top>
        <div class="q-pa-md q-gutter-sm">
-        <q-btn color="primary" size="sm" label=" 新規 " @click="newDomain()" dense />
+        <q-btn color="primary" label="追加" @click="newDomain()" dense />
      </div>
        <q-space />
        <q-input borderless dense debounce="300" v-model="filter" placeholder="Search">
@@ -125,21 +125,24 @@ export default {
          <q-card>
            <q-card-section>
              <div class="q-table__grid-item-row">
-                <div class="q-table__grid-item-title">Name</div>
+                <div class="q-table__grid-item-title">Domain</div>
                <div class="q-table__grid-item-value">{{ props.row.name }}</div>
              </div>
              <div class="q-table__grid-item-row">
-                <div class="q-table__grid-item-title">Domain</div>
+                <div class="q-table__grid-item-title">URL</div>
                <div class="q-table__grid-item-value">{{ props.row.url }}</div>
              </div>
              <div class="q-table__grid-item-row">
                <div class="q-table__grid-item-title">Account</div>
                <div class="q-table__grid-item-value">{{ props.row.kintoneuser }}</div>
              </div>
+              <div class="q-table__grid-item-row">
+                <div class="q-table__grid-item-value">{{isActive(props.row.id) }}</div>
+              </div>
            </q-card-section>
            <q-separator />
            <q-card-actions align="right">
-              <q-btn flat @click = "editDomain(props.row)">編集</q-btn>
+              <q-btn flat @click = "activeDomain(props.row.id)">有効</q-btn>
              <q-btn flat @click = "deleteConfirm(props.row)">削除</q-btn>
            </q-card-actions>
          </q-card>
@@ -147,40 +150,9 @@ export default {
      </template>
    </q-table>

-    <q-dialog :model-value="show" persistent>
-      <q-card style="min-width: 400px">
-        <q-card-section>
-          <div class="text-h6">Kintone Account</div>
-        </q-card-section>
-
-        <q-card-section class="q-pt-none">
-          <q-form class="q-gutter-md">
-            <q-input filled v-model="name" label="Your name *" hint="Kintone envirment name" lazy-rules
-              :rules="[val => val && val.length > 0 || 'Please type something']" />
-
-            <q-input filled type="url" v-model="url" label="Kintone url" hint="Kintone domain address" lazy-rules
-              :rules="[val => val && val.length > 0, isDomain || 'Please type something']" />
-
-            <q-input filled v-model="kintoneuser" label="Login user " hint="Kintone user name" lazy-rules
-              :rules="[val => val && val.length > 0 || 'Please type something']" />
-
-            <q-input v-model="kintonepwd" filled :type="isPwd ? 'password' : 'text'" hint="Password with toggle"
-              label="User password">
-              <template v-slot:append>
-                <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer" @click="isPwd = !isPwd" />
-              </template>
-            </q-input>
-
-            <q-toggle v-model="active" label="Active Domain" />
-          </q-form>
-        </q-card-section>
-        <q-card-actions align="right" class="text-primary">
-          <q-btn label="Save" type="submit" color="primary" @click="onSubmit"/>
-          <q-btn label="Cancel" type="cancel" color="primary" flat class="q-ml-sm" @click="closeDg()"/>
-        </q-card-actions>
-      </q-card>
-
-    </q-dialog>
+    <show-dialog v-model:visible="show" name="ドメイン" @close="closeDg">
+        <domain-select ref="domainDg" name="ドメイン" type="multiple"></domain-select>
+    </show-dialog>

    <q-dialog v-model="confirm" persistent>
      <q-card>
@@ -201,23 +173,23 @@ export default {
 <script setup lang="ts">
 import { useQuasar } from 'quasar'
 import { ref, onMounted, reactive } from 'vue'
-import { api } from 'boot/axios';
+import ShowDialog from 'components/ShowDialog.vue';
+import DomainSelect from 'components/DomainSelect.vue';
+import { useAuthStore } from 'stores/useAuthStore';

+const authStore = useAuthStore();
+import { api } from 'boot/axios';

 const $q = useQuasar()

+const domainDg = ref();
 const selected = ref([])
-const name = ref('')
-const active = ref(false)
-const isPwd =ref(true)
-const url =ref('')
-const kintoneuser =ref('')
-const kintonepwd =ref('')

 const show = ref(false);
 const confirm = ref(false)

 let editId = ref(0);
+let activedomainid = ref(0);

 const columns = [
 { name: 'id'},
@@ -231,25 +203,29 @@ const columns = [
  },
  { name: 'url', align: 'center', label: 'Domain', field: 'url', sortable: true },
  { name: 'kintoneuser', label: 'User', field: 'kintoneuser', sortable: true },
-  { name: 'kintonepwd' }
+  { name: 'kintonepwd' },
+  { name: 'active', field: 'active'}
 ]

 const rows = reactive([])

+const isActive = (id:number) =>{
+  if(id == activedomainid.value)
+    return "Active";
+  else
+    return "Inactive";
+}
+
 const newDomain = () => {
  editId.value = 0;
  show.value = true;
 };

-const editDomain = (row:object) => {
-  editId.value = row.id;
-  name.value = row.name;
-  url.value = row.url;
-  kintoneuser.value = row.kintoneuser;
-  kintonepwd.value = row.kintonepwd;
-  isPwd.value = true;
-  active.value = false;
-  show.value = true;
+
+const activeDomain = (id:number) => {
+  api.put(`http://127.0.0.1:8000/api/activedomain/1/`+ id).then(() =>{
+            getDomain();
+          })
 };

 const deleteConfirm = (row:object) => {
@@ -258,21 +234,33 @@ const deleteConfirm = (row:object) => {
 };

 const deleteDomain = () => {
-  api.delete(`http://127.0.0.1:8000/api/domain/1/`+ editId.value).then(() =>{
+  api.delete(`http://127.0.0.1:8000/api/domain/`+ editId.value+'/1').then(() =>{
            getDomain();
          })
  editId.value = 0;
 };

-const closeDg = () => {
-  show.value = false;
-  onReset();
+const closeDg = (val:string) => {
+  if (val == 'OK') {
+    let dodmainids =[];
+    let domains = JSON.parse(JSON.stringify(domainDg.value.selected));
+    for(var key in domains)
+    {
+      dodmainids.push(domains[key].id);
+    }
+    api.post(`http://127.0.0.1:8000/api/domain/1`, dodmainids).then(() =>{getDomain();});
+  }
+
 };
 const getDomain = () => {
+  api.get(`http://127.0.0.1:8000/api/activedomain/1`).then(res => {
+    activedomainid.value = res.data.id;
+    authStore.changedomain(res.data.name);
+  });
  api.get(`http://127.0.0.1:8000/api/domain/1`).then(res => {
    rows.length = 0;
    res.data.forEach((item) => {
-      rows.push({ id:item.id,name: item.name, url: item.url, kintoneuser: item.kintoneuser, kintonepwd: item.kintonepwd });
+      rows.push({ id:item.id,name: item.name, url: item.url, kintoneuser: item.kintoneuser, kintonepwd: item.kintonepwd});
    }
    )
  });
@@ -286,68 +274,6 @@ const isDomain = (val) =>{
      //  return (domainPattern.test(val) || '無効なURL')
      return true;
    };
-
-const onSubmit = () =>{
-  if(editId.value !== 0)
-  {
-    api.put(`http://127.0.0.1:8000/api/domain`,{
-            'id': editId.value,
-            'userid': 1,
-            'name': name.value,
-            'url': url.value,
-            'kintoneuser': kintoneuser.value,
-            'kintonepwd': kintonepwd.value,
-            'active': active.value
-          }).then(() =>{
-            getDomain();
-            closeDg();
-            onReset();
-          })
-  }
-  else
-  {
-    api.post(`http://127.0.0.1:8000/api/domain`,{
-            'id': 0,
-            'userid': 1,
-            'name': name.value,
-            'url': url.value,
-            'kintoneuser': kintoneuser.value,
-            'kintonepwd': kintonepwd.value,
-            'active': active.value
-          }).then(() =>{
-            getDomain();
-            closeDg();
-            onReset();
-          })
-    }
-  // if (accept.value !== true) {
-  //   $q.notify({
-  //     color: 'red-5',
-  //     textColor: 'white',
-  //     icon: 'warning',
-  //     message: 'You need to accept the license and terms first'
-  //   })
-  // }
-  // else {
-  //   $q.notify({
-  //     color: 'green-4',
-  //     textColor: 'white',
-  //     icon: 'cloud_done',
-  //     message: 'Submitted'
-  //   })
-  // }
-};
-
-const onReset = () => {
-  name.value = '';
-  url.value = '';
-  kintoneuser.value = '';
-  kintonepwd.value ='';
-  isPwd.value = true;
-  active.value = false;
-  editId.value = 0;
-}
-
 </script>


--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -19,7 +19,8 @@ const routes: RouteRecordRaw[] = [
      { path: 'flowEditor2', component: () => import('pages/FlowChart.vue') },
      { path: 'flowChart2', component: () => import('pages/FlowEditorPage2.vue') },
      { path: 'right', component: () => import('pages/testRight.vue') },
-      { path: 'domain', component: () => import('pages/UserDomain.vue') }
+      { path: 'domain', component: () => import('pages/TenantDomain.vue') },
+      { path: 'userdomain', component: () => import('pages/UserDomain.vue') }
    ],
  },
  // Always leave this as last one,
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -7,6 +7,9 @@ export const useAuthStore = defineStore({
    id: 'auth',
    state: () => ({
        token: localStorage.getItem('token'),
+        id:localStorage.getItem('id'),
+        name:localStorage.getItem('name'),
+        domain:localStorage.getItem('domain'),
        returnUrl: ''
    }),
    actions: {
@@ -18,7 +21,14 @@ export const useAuthStore = defineStore({
              const result = await api.post(`http://127.0.0.1:8000/api/token`,params);
              console.info(result);
              this.token =result.data.access_token;
+              this.id = result.data.user_id;
+              this.name = result.data.user_name;
              localStorage.setItem('token', result.data.access_token);
+              localStorage.setItem('id', result.data.user_id);
+              localStorage.setItem('name', result.data.user_name);
+              const activedomain = await api.get(`http://127.0.0.1:8000/api/activedomain/`+this.id);
+              this.domain = activedomain.data.name;
+              localStorage.setItem('domain', activedomain.data.name);
              Router.push(this.returnUrl || '/');
              return true;
          }catch(e)
@@ -30,7 +40,17 @@ export const useAuthStore = defineStore({
        logout() {
            this.token = null;
            localStorage.removeItem('token');
+            localStorage.removeItem('id');
+            localStorage.removeItem('name');
+            localStorage.removeItem('domain');
            Router.push('/login');
+        },
+       userdomain() {
+        Router.push('/userdomain');
+       },
+       changedomain(domain:string){
+        this.domain = domain;
+        localStorage.setItem('domain', domain);
       }
    }
 });