Add volume mount to docker
diff --git a/custos-demo-gateway/Dockerfile b/custos-demo-gateway/Dockerfile
index 079efea..dd23c75 100644
--- a/custos-demo-gateway/Dockerfile
+++ b/custos-demo-gateway/Dockerfile
@@ -10,8 +10,6 @@
FROM nginx:stable-alpine as production-stage
COPY --from=build-stage /app/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY privkey.pem /etc/nginx/privkey.pem
-COPY fullchain.pem /etc/nginx/fullchain.pem
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
EXPOSE 8080 443
diff --git a/custos-demo-gateway/src/components/admin-portal/ListTenants.vue b/custos-demo-gateway/src/components/admin-portal/ListTenants.vue
index e67bfa0..02e8e30 100644
--- a/custos-demo-gateway/src/components/admin-portal/ListTenants.vue
+++ b/custos-demo-gateway/src/components/admin-portal/ListTenants.vue
@@ -223,8 +223,10 @@
this.custosSec = config.value('clientSec')
this.isAdminUser = await this.$store.dispatch('identity/isLoggedUserHasAdminAccess')
this.currentUserName = await this.$store.dispatch('identity/getCurrentUserName')
+ let accessToken = await this.$store.getters['identity/getAccessToken']
+
let data = {
- offset: 0, limit: 1, client_id: this.custosId, client_sec: this.custosSec,
+ offset: 0, limit: 1, usertoken:accessToken,
username: this.currentUserName
}
let resp = await this.$store.dispatch('user/users', data)
@@ -272,7 +274,7 @@
onRowSelected: function (items) {
if (items != null && items.length > 0) {
- console.log(items[0].client_name)
+
this.view_tenant = true
this.selectedTenant = items[0];
}
diff --git a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
index d6e20d8..6e548b2 100644
--- a/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
+++ b/custos-demo-gateway/src/components/admin-portal/NewTenant.vue
@@ -586,7 +586,6 @@
let logo_uri = this.$v.form.tab2.logo_uri.$model;
let comment = this.$v.form.tab2.comment.$model;
let application_type = this.$v.form.tab2.application_type.$model;
- console.log(application_type);
let scopeString = '';
for (var i = 0; i < scope.length; i++) {
scopeString += scope[i] + " "
diff --git a/custos-demo-gateway/src/components/landing/TenantLogin.vue b/custos-demo-gateway/src/components/landing/TenantLogin.vue
index 9b90438..eda8877 100644
--- a/custos-demo-gateway/src/components/landing/TenantLogin.vue
+++ b/custos-demo-gateway/src/components/landing/TenantLogin.vue
@@ -98,7 +98,6 @@
let tokenResp = await this.$store.dispatch('identity/authenticateTenantAdmin', params)
if (tokenResp) {
let resp = await this.$store.dispatch('identity/isAuthenticated', data)
- console.log(resp)
if (resp) {
let data = {
diff --git a/custos-demo-gateway/src/components/workspace/Groups.vue b/custos-demo-gateway/src/components/workspace/Groups.vue
index 8e81609..1ccaad4 100644
--- a/custos-demo-gateway/src/components/workspace/Groups.vue
+++ b/custos-demo-gateway/src/components/workspace/Groups.vue
@@ -294,7 +294,7 @@
this.selectedId = this.selectedItem[0].id
this.selectedName = this.selectedItem[0].name
this.selectedDescription = this.selectedItem[0].description
- this.selectedOwnerId = this.selectedItem[0].ownerId
+ this.selectedOwnerId = this.selectedItem[0].owner_id
let data = {
client_id: this.custosId,
@@ -391,7 +391,8 @@
if (addToGroup) {
- if (gr.ownerId != this.currentUser) {
+
+ if (gr.owner_id != this.currentUser) {
let data = {
client_id: this.custosId,
client_sec: this.custosSec,
@@ -664,18 +665,18 @@
async loadGroups(data) {
+ let grs = []
if (this.isAdminUser) {
- this.groupItems = await this.$store.dispatch('group/loadAllGroups', data)
+ grs = await this.$store.dispatch('group/loadAllGroups', data)
} else {
- let grs = []
grs = await this.$store.dispatch('group/getAllGroupsOfUser', data)
- let groups = []
- grs.forEach(gr => {
- gr.ownerId = gr.owner_id
- groups.push(gr)
- })
- this.groupItems = groups
}
+ let groups = []
+ grs.forEach(gr => {
+ gr.ownerId = gr.owner_id
+ groups.push(gr)
+ })
+ this.groupItems = groups
},
async goToWorkspace() {
diff --git a/custos-demo-gateway/src/router.js b/custos-demo-gateway/src/router.js
index 4228153..e735cae 100644
--- a/custos-demo-gateway/src/router.js
+++ b/custos-demo-gateway/src/router.js
@@ -145,7 +145,6 @@
client_id: auth.getClientId(),
client_sec: auth.getClientSec()
}
- console.log(data)
}
if (await store.dispatch('identity/isAuthenticated', data) == true) {
// You can use store variable here to access globalError or commit mutation
diff --git a/custos-demo-gateway/src/store/modules/identity.store.js b/custos-demo-gateway/src/store/modules/identity.store.js
index c818f8b..37f5da1 100644
--- a/custos-demo-gateway/src/store/modules/identity.store.js
+++ b/custos-demo-gateway/src/store/modules/identity.store.js
@@ -43,7 +43,7 @@
refresh_token: auth.getRefreshToken()
}
await identity_management.logout(dat)
- commit('CLEAR_AUTH_TOKEN', data)
+ await commit('CLEAR_AUTH_TOKEN', data)
},
// eslint-disable-next-line no-unused-vars
@@ -91,7 +91,7 @@
refresh_token: auth.getRefreshToken()
}
await identity_management.logout(dat)
- commit('RESET_TENANT_CACHED_TOKENS', data)
+ await commit('RESET_TENANT_CACHED_TOKENS', data)
},
// eslint-disable-next-line no-unused-vars
@@ -177,8 +177,9 @@
return auth.isLoggedIn()
},
+ // eslint-disable-next-line no-unused-vars
getAccessToken(state) {
- return state.accessToken;
+ return auth.getAccessToken()
},
diff --git a/custos-demo-gateway/src/store/modules/secret.store.js b/custos-demo-gateway/src/store/modules/secret.store.js
index 68897cf..3a808df 100644
--- a/custos-demo-gateway/src/store/modules/secret.store.js
+++ b/custos-demo-gateway/src/store/modules/secret.store.js
@@ -64,7 +64,7 @@
accessible_tokens: data.accessible_tokens
}
}
- console.log(dat)
+
let response = await secret_management.getAllCredentials(dat)
return response.data.metadata
},
