-
@@ -58,7 +58,7 @@
- getGroupBaseUrl() ); responseStream << "/\">Startseite \n"; responseStream << "\t\t\t\t\t"; -#line 24 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp" +#line 24 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp" } responseStream << "\n"; responseStream << "\t\t\t\t\t
- Gruppen \n"; responseStream << "\t\t\t\t\t
- Node Server \n"; responseStream << "\t\t\t\t\t
- Hedera Accounts \n"; responseStream << "\t\t\t\t\t
- Hedera Topics \n"; responseStream << "\t\t\t\t
-
@@ -88,6 +88,10 @@ export default {
default: true,
description: 'Whether sidebar should autoclose on mobile when clicking an item',
},
+ balance: {
+ type: Number,
+ default: 0,
+ },
},
provide() {
return {
@@ -107,3 +111,8 @@ export default {
},
}
+
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 7d950b87d..fa4bf388b 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -2,11 +2,11 @@
// Load Package Details for some default values
// const pkg = require('../../package')
-
const environment = {
NODE_ENV: process.env.NODE_ENV,
DEBUG: process.env.NODE_ENV !== 'production' || false,
PRODUCTION: process.env.NODE_ENV === 'production' || false,
+ ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false',
}
const server = {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0e60a3094..e3868124c 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -5,6 +5,7 @@
"logout":"Abmelden",
"login":"Login",
"signup": "Registrieren",
+ "reset": "Passwort zurücksetzen",
"imprint":"Impressum",
"privacy_policy":"Datenschutzerklärung",
"members_area": "Mitgliedsbereich",
@@ -110,5 +111,9 @@
"submit":"Einreichen",
"hours_report":"Stundenbericht"
}
+ },
+ "reset-password": {
+ "title": "Passwort Zurücksetzen",
+ "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünfitg in der GRADIDO App anmelden kannst."
}
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1dc703f14..521f68f0d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -5,6 +5,7 @@
"logout":"Logout",
"login":"Login",
"signup": "Sign up",
+ "reset": "Reset password",
"imprint":"Legal notice",
"privacy_policy":"Privacy policy",
"members_area": "Member's area",
@@ -110,5 +111,9 @@
"submit":"submit",
"hours_report":"Hourly report"
}
+ },
+ "reset-password": {
+ "title": "Reset Password",
+ "text": "Now you can save a new password to login to the GRADIDO App in the future."
}
}
diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js
index 9b6e350dc..881fecf7d 100755
--- a/frontend/src/plugins/dashboard-plugin.js
+++ b/frontend/src/plugins/dashboard-plugin.js
@@ -37,6 +37,10 @@ import 'vue-good-table/dist/vue-good-table.css'
import VueMoment from 'vue-moment'
+import Loading from 'vue-loading-overlay'
+// import the styles
+import 'vue-loading-overlay/dist/vue-loading.css'
+
Object.keys(rules).forEach((rule) => {
extend(rule, {
...rules[rule], // copies rule configuration
@@ -56,6 +60,7 @@ export default {
Vue.use(VueQrcodeReader)
Vue.use(VueQrcode)
Vue.use(VueFlatPickr)
+ Vue.use(Loading)
configure({
classes: {
valid: 'is-valid',
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index 6671a8de9..189516242 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,11 +1,13 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import routes from './routes'
+import CONFIG from '../config'
Vue.use(VueRouter)
// configure router
const router = new VueRouter({
+ base: '/vue',
routes, // short for routes: routes
linkActiveClass: 'active',
mode: 'history',
@@ -20,4 +22,11 @@ const router = new VueRouter({
},
})
+if (CONFIG.ALLOW_REGISTER) {
+ router.addRoute({
+ path: '/register',
+ component: () => import('../views/Pages/Register.vue'),
+ })
+}
+
export default router
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index adae0be07..cb1e0eeba 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -21,20 +21,20 @@ const routes = [
requiresAuth: true,
},
},
- {
- path: '/profileedit',
- component: () => import('../views/Pages/UserProfileEdit.vue'),
- meta: {
- requiresAuth: true,
- },
- },
- {
- path: '/activity',
- component: () => import('../views/Pages/UserProfileActivity.vue'),
- meta: {
- requiresAuth: true,
- },
- },
+ //{
+ // path: '/profileedit',
+ // component: () => import('../views/Pages/UserProfileEdit.vue'),
+ // meta: {
+ // requiresAuth: true,
+ // },
+ //},
+ //{
+ // path: '/activity',
+ // component: () => import('../views/Pages/UserProfileActivity.vue'),
+ // meta: {
+ // requiresAuth: true,
+ // },
+ //},
{
path: '/transactions',
component: () => import('../views/Pages/UserProfileTransactionList.vue'),
@@ -50,16 +50,12 @@ const routes = [
path: '/thx',
component: () => import('../views/Pages/thx.vue'),
},
- {
- path: '/register',
- component: () => import('../views/Pages/Register.vue'),
- },
{
path: '/password',
component: () => import('../views/Pages/ForgotPassword.vue'),
},
{
- path: '/reset',
+ path: '/reset/:optin',
component: () => import('../views/Pages/ResetPassword.vue'),
},
{ path: '*', component: NotFound },
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 82c2e6992..5c9e1bc1e 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -1,9 +1,32 @@
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
-import communityAPI from '../apis/communityAPI'
import createPersistedState from 'vuex-persistedstate'
+export const mutations = {
+ language: (state, language) => {
+ state.language = language
+ },
+ email: (state, email) => {
+ state.email = email
+ },
+ session_id: (state, session_id) => {
+ state.session_id = session_id
+ },
+}
+
+export const actions = {
+ login: ({ dispatch, commit }, data) => {
+ commit('session_id', data.session_id)
+ commit('email', data.email)
+ },
+ logout: ({ commit, state }) => {
+ commit('session_id', null)
+ commit('email', null)
+ sessionStorage.clear()
+ },
+}
+
export const store = new Vuex.Store({
plugins: [
createPersistedState({
@@ -14,64 +37,10 @@ export const store = new Vuex.Store({
session_id: null,
email: '',
language: 'en',
- user: {
- name: '',
- balance: 0,
- balance_gdt: 0,
- },
modals: false,
- optionAxios: {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- 'Access-Control-Allow-Origin': '*',
- 'Access-Control-Allow-Credentials': 'true',
- },
- },
},
getters: {},
// Syncronous mutation of the state
- mutations: {
- language: (state, language) => {
- state.language = language
- },
- email: (state, email) => {
- state.email = email
- },
- session_id: (state, session_id) => {
- state.session_id = session_id
- },
- user_balance: (state, balance) => {
- state.user.balance = balance / 10000
- },
- user_balance_gdt: (state, balance) => {
- state.user.balance_gdt = balance / 10000
- },
- },
- actions: {
- login: ({ dispatch, commit }, data) => {
- commit('session_id', data.session_id)
- commit('email', data.email)
- },
- passwordReset: (data) => {},
- schoepfen: (data) => {
- // http://localhost/transaction-creations/ajaxCreate
- },
- createUser: ({ commit, dispatch }, data) => {
- commit('session_id', data.session_id)
- commit('email', data.email)
- },
- logout: ({ commit, state }) => {
- commit('session_id', null)
- commit('email', null)
- sessionStorage.clear()
- },
- accountBalance: async ({ commit, dispatch, state }) => {
- const result = await communityAPI.balance(state.session_id)
- if (result.success) {
- commit('user_balance', result.result.data.balance)
- } else {
- //dispatch('logout')
- }
- },
- },
+ mutations,
+ actions,
})
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
new file mode 100644
index 000000000..ccf59dfbf
--- /dev/null
+++ b/frontend/src/store/store.test.js
@@ -0,0 +1,81 @@
+import { mutations, actions } from './store'
+
+const { language, email, session_id } = mutations
+const { login, logout } = actions
+
+describe('Vuex store', () => {
+ describe('mutations', () => {
+ describe('language', () => {
+ it('sets the state of language', () => {
+ const state = { language: 'en' }
+ language(state, 'de')
+ expect(state.language).toEqual('de')
+ })
+ })
+
+ describe('email', () => {
+ it('sets the state of email', () => {
+ const state = { email: 'nobody@knows.tv' }
+ email(state, 'someone@there.is')
+ expect(state.email).toEqual('someone@there.is')
+ })
+ })
+
+ describe('session_id', () => {
+ it('sets the state of session_id', () => {
+ const state = { session_id: null }
+ session_id(state, '1234')
+ expect(state.session_id).toEqual('1234')
+ })
+ })
+ })
+
+ describe('actions', () => {
+ describe('login', () => {
+ const commit = jest.fn()
+ const state = {}
+
+ it('calls two commits', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenCalledTimes(2)
+ })
+
+ it('commits session_id', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenNthCalledWith(1, 'session_id', 1234)
+ })
+
+ it('commits email', () => {
+ login({ commit, state }, { session_id: 1234, email: 'someone@there.is' })
+ expect(commit).toHaveBeenNthCalledWith(2, 'email', 'someone@there.is')
+ })
+ })
+
+ describe('logout', () => {
+ const commit = jest.fn()
+ const state = {}
+
+ it('calls two commits', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenCalledTimes(2)
+ })
+
+ it('commits session_id', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenNthCalledWith(1, 'session_id', null)
+ })
+
+ it('commits email', () => {
+ logout({ commit, state })
+ expect(commit).toHaveBeenNthCalledWith(2, 'email', null)
+ })
+
+ // how can I get this working?
+ it.skip('calls sessionStorage.clear()', () => {
+ logout({ commit, state })
+ const spy = jest.spyOn(sessionStorage, 'clear')
+ expect(spy).toHaveBeenCalledTimes(1)
+ })
+ })
+ })
+})
diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue
index d32fadea2..64e71ab39 100644
--- a/frontend/src/views/KontoOverview/GddSend.vue
+++ b/frontend/src/views/KontoOverview/GddSend.vue
@@ -1,23 +1,23 @@
-
+
-
+
+
- 
+
+ 
+
-
-
- {{ $t('form.cancel') }}
-
-
+
@@ -73,7 +80,7 @@
{{ $t('form.amount') }}
-
+
{{ $t('form.max_gdd_info') }}
@@ -197,9 +204,8 @@ export default {
BIcon,
},
props: {
- row_form: { type: Boolean, default: true },
- row_check: { type: Boolean, default: false },
- row_thx: { type: Boolean, default: false },
+ balance: { type: Number, default: 0 },
+ showTransactionList: { type: Boolean, default: true },
},
data() {
return {
@@ -219,12 +225,16 @@ export default {
auto_sign: true,
},
send: false,
+ row_check: false,
+ row_thx: false,
}
},
computed: {},
methods: {
+ toggle() {
+ this.scan = !this.scan
+ },
async onDecode(decodedString) {
- //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
const arr = JSON.parse(decodedString)
this.form.email = arr[0].email
this.form.amount = arr[0].amount
@@ -234,30 +244,31 @@ export default {
//event.preventDefault()
this.ajaxCreateData.email = this.form.email
this.ajaxCreateData.amount = this.form.amount
- this.ajaxCreateData.target_date = Date.now()
+ const now = new Date(Date.now()).toISOString()
+ this.ajaxCreateData.target_date = now
this.ajaxCreateData.memo = this.form.memo
-
- this.$emit('change-rows', { row_form: false, row_check: true, row_thx: false })
+ this.$emit('toggle-show-list', false)
+ this.row_check = true
+ this.row_thx = false
},
async sendTransaction() {
- this.ajaxCreateData.amount = this.ajaxCreateData.amount * 10000
-
const result = await communityAPI.send(
this.$store.state.session_id,
this.ajaxCreateData.email,
- this.ajaxCreateData.amount,
+ this.ajaxCreateData.amount * 10000,
this.ajaxCreateData.memo,
+ this.ajaxCreateData.target_date,
)
- // console.log(result)
-
if (result.success) {
- // console.log('send success')
-
- this.$emit('change-rows', { row_form: false, row_check: false, row_thx: true })
+ this.$emit('toggle-show-list', false)
+ this.row_check = false
+ this.row_thx = true
+ this.$emit('update-balance', { ammount: this.ajaxCreateData.amount })
} else {
- // console.log('send error')
alert('error')
- this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false })
+ this.$emit('toggle-show-list', true)
+ this.row_check = false
+ this.row_thx = false
}
},
onReset(event) {
@@ -265,15 +276,20 @@ export default {
this.form.email = ''
this.form.amount = ''
this.show = false
+ this.$emit('toggle-show-list', true)
+ this.row_check = false
+ this.row_thx = false
this.$nextTick(() => {
this.show = true
})
- this.$emit('change-rows', { row_form: true, row_check: false, row_thx: false })
},
},
}
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 3b91a9d51..2195db8dd 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -10,7 +10,7 @@
-
+
{{ $store.state.email }}
@@ -41,3 +41,8 @@ export default {
},
}
+
diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/KontoOverview.spec.js
index d2bb8403c..b0385cbc3 100644
--- a/frontend/src/views/Pages/KontoOverview.spec.js
+++ b/frontend/src/views/Pages/KontoOverview.spec.js
@@ -1,26 +1,17 @@
import { shallowMount } from '@vue/test-utils'
import KontoOverview from './KontoOverview'
-import Vuex from 'vuex'
const localVue = global.localVue
describe('KontoOverview', () => {
let wrapper
- let actions = {
- accountBalance: jest.fn(),
- }
-
- let store = new Vuex.Store({
- actions,
- })
-
let mocks = {
$t: jest.fn((t) => t),
}
const Wrapper = () => {
- return shallowMount(KontoOverview, { localVue, store, mocks })
+ return shallowMount(KontoOverview, { localVue, mocks })
}
describe('shallow Mount', () => {
@@ -44,37 +35,34 @@ describe('KontoOverview', () => {
expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy()
})
- it('calls "accountBalance" action from store on creation', () => {
- const spy = jest.spyOn(actions, 'accountBalance')
- expect(spy).toHaveBeenCalled()
- })
-
it('updates transctions data when change-transactions is emitted', async () => {
wrapper.find('gdd-table-stub').vm.$emit('change-transactions', [0, 1])
await wrapper.vm.$nextTick()
expect(wrapper.vm.transactions).toEqual(expect.arrayContaining([0, 1]))
})
- describe('setRows method', () => {
+ describe('updateBalance method', () => {
beforeEach(async () => {
- wrapper.find('gdd-send-stub').vm.$emit('change-rows', {
- row_form: false,
- row_check: true,
- row_thx: true,
+ wrapper.find('gdd-send-stub').vm.$emit('update-balance', {
+ ammount: 42,
})
await wrapper.vm.$nextTick()
})
- it('updates row_form data when change-rows is emitted', () => {
- expect(wrapper.vm.row_form).toBeFalsy()
+ it('emmits updateBalance with correct value', () => {
+ expect(wrapper.emitted('update-balance')).toEqual([[42]])
+ })
+ })
+
+ describe('toggleShowList method', () => {
+ beforeEach(async () => {
+ wrapper.setProps({ showTransactionList: false })
+ wrapper.find('gdd-send-stub').vm.$emit('toggle-show-list', true)
+ await wrapper.vm.$nextTick()
})
- it('updates row_check data when change-rows is emitted', () => {
- expect(wrapper.vm.row_check).toBeTruthy()
- })
-
- it('updates row_thx data when change-rows is emitted', () => {
- expect(wrapper.vm.row_thx).toBeTruthy()
+ it('changes the value of property showTransactionList', () => {
+ expect(wrapper.vm.showTransactionList).toBeTruthy()
})
})
})
diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/KontoOverview.vue
index 10942b7f5..e05a6236d 100644
--- a/frontend/src/views/Pages/KontoOverview.vue
+++ b/frontend/src/views/Pages/KontoOverview.vue
@@ -2,17 +2,21 @@
-
-
+
-
@@ -77,6 +80,8 @@
+
+
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index abfc45d1d..cae6b07f4 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -13,9 +13,11 @@ COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql
# login server db
COPY ./login_server/skeema/ .
RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed -i '1i use gradido_login;' "../b_$f"; done
+COPY ./configs/login_server/setup_db_tables ./gradido_login/insert
RUN cd ./gradido_login/insert && for f in *.sql; do cp -- "$f" "../../c_$f"; sed -i '1i use gradido_login;' "../../c_$f"; done
# community server db
-COPY ./community_server/skeema/ .
+COPY ./community_server/db/skeema/ .
RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done
+COPY ./community_server/db/setup_db_tables ./gradido_community/insert
RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f"; sed -i '1i use gradido_community;' "../../e_$f"; done
diff --git a/mariadb/setup_dbs_different_user.sh b/mariadb/setup_dbs_different_user.sh
index d362a1971..604276ef3 100755
--- a/mariadb/setup_dbs_different_user.sh
+++ b/mariadb/setup_dbs_different_user.sh
@@ -54,7 +54,7 @@ skeema push -p$LOGIN_DB_PASSWD
cd ../../..
# populate db of community-server
-cd community_server/skeema
+cd community_server/db/skeema
sudo cat << EOF > .skeema
[production]
flavor=mariadb:10.3.25
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 4f3aff146..240144cc3 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,5 +1,3 @@
-
-
server {
listen 80 ;
@@ -8,12 +6,10 @@ server {
#include /etc/nginx/common/protect.conf;
#include /etc/nginx/common/protect_add_header.conf;
- #include /etc/nginx/common/ssl.conf;
-
+ #include /etc/nginx/common/ssl.conf;
root /var/www/cakephp/webroot;
- index index.php;
-
+ index index.php;
location ~ \.php$ {
fastcgi_pass community-server:9000;
@@ -23,7 +19,6 @@ server {
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
include fastcgi_params;
-
}
location ~ /\.ht {
@@ -31,65 +26,61 @@ server {
}
location /account {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_cache_bypass $http_upgrade;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header Host $host;
- rewrite /account/(.*) /$1 break;
-
- #proxy_next_upstream error timeout invalid_header http_502 non_idempotent;
- proxy_pass http://login-server:1200;
- proxy_redirect off;
-
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection 'upgrade';
+ proxy_cache_bypass $http_upgrade;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $remote_addr;
+ proxy_set_header Host $host;
+ rewrite /account/(.*) /$1 break;
+ proxy_pass http://login-server:1200;
+ proxy_redirect off;
}
location /login_api {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_cache_bypass $http_upgrade;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $remote_addr;
- proxy_set_header Host $host;
- rewrite /login_api/(.*) /$1 break;
-
- proxy_pass http://login-server:1201;
- proxy_redirect off;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection 'upgrade';
+ proxy_cache_bypass $http_upgrade;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $remote_addr;
+ proxy_set_header Host $host;
+ rewrite /login_api/(.*) /$1 break;
+
+ proxy_pass http://login-server:1201;
+ proxy_redirect off;
}
location / {
- try_files $uri $uri/ /index.php?$args;
+ try_files $uri $uri/ /index.php?$args;
}
location /vue {
-
- location /vue/sockjs-node {
- rewrite /vue/(.*) /$1;
- }
- location ~* \.(png) {
- expires 1d;
- rewrite /vue/(.*) /$1;
- }
-
- #try_files /vue/$uri /vue/$uri/ /index.html;
-
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
- #rewrite /vue/(.*) /$1 break;
+
+ proxy_pass http://frontend:3000;
+ proxy_redirect off;
+ }
- proxy_pass http://frontend:8080;
+ location /sockjs-node {
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection 'upgrade';
+ proxy_set_header X-Forwarded-For $remote_addr;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header Host $host;
+
+ proxy_pass http://frontend:3000;
proxy_redirect off;
}
# access_log /var/log/nginx/access.log main;
-
}
\ No newline at end of file
diff --git a/skeema/Dockerfile b/skeema/Dockerfile
index 8c921ba23..0c754899d 100644
--- a/skeema/Dockerfile
+++ b/skeema/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR ${DOCKER_WORKDIR}
COPY ./skeema/.skeema .
COPY ./login_server/skeema/ .
COPY ./mariadb/.skeema.login ./gradido_login/.skeema
-COPY ./community_server/skeema/ .
+COPY ./community_server/db/skeema/ .
COPY ./mariadb/.skeema.community ./gradido_community/.skeema
-CMD skeema push
\ No newline at end of file
+CMD skeema push --allow-unsafe
\ No newline at end of file
+
+
+
+
+
+
+
+ {{ $t('form.cancel') }}
+
+
+
+
{{ $t('site.login.signin') }}
@@ -82,15 +82,12 @@
{{ $t('site.login.forgot_pwd') }}
-
+
{{ $t('site.login.new_wallet') }}
-
- reset
@@ -98,6 +95,7 @@
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index ad2c10585..0ff92c052 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -1,17 +1,11 @@
const path = require('path')
const dotenv = require('dotenv-webpack')
-function resolveSrc(_path) {
- return path.join(__dirname, _path)
-}
-
-let vue_path = process.env.VUE_PATH
-if (vue_path == undefined) {
- vue_path = '/vue'
-}
-
// vue.config.js
module.exports = {
+ devServer: {
+ port: process.env.PORT || 3000,
+ },
pluginOptions: {
i18n: {
locale: 'de',
@@ -21,12 +15,12 @@ module.exports = {
},
},
lintOnSave: true,
- publicPath: vue_path + '/',
+ publicPath: '/vue',
configureWebpack: {
// Set up all the aliases we use in our app.
resolve: {
alias: {
- assets: resolveSrc('src/assets'),
+ assets: path.join(__dirname, 'src/assets'),
},
},
plugins: [new dotenv()],
@@ -35,5 +29,5 @@ module.exports = {
// Enable CSS source maps.
sourceMap: process.env.NODE_ENV !== 'production',
},
- outputDir: path.resolve(__dirname, './dist' + vue_path),
+ outputDir: path.resolve(__dirname, './dist'),
}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 4d1b90966..44028c65e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -13348,6 +13348,11 @@ vue-loader@^15.7.0:
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"
+vue-loading-overlay@^3.4.2:
+ version "3.4.2"
+ resolved "https://registry.yarnpkg.com/vue-loading-overlay/-/vue-loading-overlay-3.4.2.tgz#34792a83218df1d35dff50121ce9fac2114f1c38"
+ integrity sha512-xcB+NPjl76eA0uggm707x3ZFgrNosZXpynHipyS3K+rrK1NztOV49R1LY+/4ij5W1KYANp7eRI2EIHrxCpmWAw==
+
vue-moment@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"
diff --git a/login_server/.gitignore b/login_server/.gitignore
index dd7d9573a..1d623d885 100644
--- a/login_server/.gitignore
+++ b/login_server/.gitignore
@@ -6,3 +6,5 @@ src/cpsp/*.cpp
src/cpp/proto/
build*/
/skeema/gradido_login/insert/crypto_key.sql
+
+src/LOCALE/messages.pot
diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug
index 6b68c9593..613c3daf4 100644
--- a/login_server/Dockerfile.debug
+++ b/login_server/Dockerfile.debug
@@ -16,34 +16,45 @@ RUN git clone https://github.com/Kitware/CMake.git --branch=v3.19.8 \
&& make install
#########################################################################################################
-# debug build preparation
+# Build debug
#########################################################################################################
-FROM cmake-gcc-9 as build_debug_preparation
-
-USER root
+From gradido/login_dependencies:stage2 as debug
ENV DOCKER_WORKDIR="/code"
-RUN mkdir -p ${DOCKER_WORKDIR}
-WORKDIR ${DOCKER_WORKDIR}
+USER root
+WORKDIR ${DOCKER_WORKDIR}
COPY . .
RUN cd scripts \
&& chmod +x ./prepare_build.sh \
&& ./prepare_build.sh
+RUN ./compile_pot.sh
+RUN ./unix_parse_proto.sh
+
+
#########################################################################################################
# run debug
#########################################################################################################
-FROM build_debug_preparation as login_server_debug
+FROM debug as login_server_debug
ENV DOCKER_WORKDIR="/code"
+#RUN apt-get update && \
+# apt-get install -y --no-install-recommends gdb && \
+# apt-get autoclean && \
+# apt-get autoremove && \
+# apt-get clean && \
+# rm -rf /var/lib/apt/lists/*
+
+VOLUME /var/log/grd_login
+VOLUME /code/src
EXPOSE 1200
EXPOSE 1201
WORKDIR ${DOCKER_WORKDIR}
RUN chmod +x ./scripts/build_and_run.sh
-CMD ./scripts/build_and_run.sh; ./build/bin/Gradido_LoginServer
+CMD ./Dockerfiles/build_and_run.sh; ./build_vol/bin/Gradido_LoginServer
diff --git a/login_server/dependencies/poco b/login_server/dependencies/poco
index b95393dcc..3fc3e5f5b 160000
--- a/login_server/dependencies/poco
+++ b/login_server/dependencies/poco
@@ -1 +1 @@
-Subproject commit b95393dcc3640807838e8323b4e600e54d2e8116
+Subproject commit 3fc3e5f5b8462f7666952b43381383a79b8b5d92
diff --git a/login_server/skeema/gradido_login/groups.sql b/login_server/skeema/gradido_login/groups.sql
index 240c56ba5..9d57a3b2c 100644
--- a/login_server/skeema/gradido_login/groups.sql
+++ b/login_server/skeema/gradido_login/groups.sql
@@ -3,6 +3,7 @@ CREATE TABLE `groups` (
`alias` varchar(190) NOT NULL,
`name` varchar(255) NOT NULL,
`url` varchar(255) NOT NULL,
+ `host` varchar(255) DEFAULT "/",
`home` varchar(255) DEFAULT "/",
`description` text,
PRIMARY KEY (`id`),
diff --git a/login_server/skeema/gradido_login/insert/setup_docker_group.sql b/login_server/skeema/gradido_login/insert/setup_docker_group.sql
deleted file mode 100644
index 53a556758..000000000
--- a/login_server/skeema/gradido_login/insert/setup_docker_group.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `groups` (`id`, `alias`, `name`, `url`, `home`, `description`) VALUES
-(2, 'docker', 'docker gradido group', 'localhost', '/', 'gradido test group for docker and stage2 with blockchain db');
-
-
-
-
diff --git a/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp b/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp
index c83a41564..807889d11 100644
--- a/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp
+++ b/login_server/src/cpp/HTTPInterface/AdminGroupsPage.cpp
@@ -5,10 +5,10 @@
#include "Poco/DeflatingStream.h"
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 7 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
#include "../controller/Group.h"
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 1 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
#include "../ServerConfig.h"
@@ -27,7 +27,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
if (_compressResponse) response.set("Content-Encoding", "gzip");
Poco::Net::HTMLForm form(request, request.stream());
-#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
const char* pageName = "Gruppen";
@@ -46,6 +46,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
alias,
form.get("group-name", ""),
form.get("group-url", ""),
+ form.get("group-host", ""),
form.get("group-home", ""),
form.get("group-desc", "")
);
@@ -58,7 +59,7 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
//auto groups = controller::Group::load("gdd1");
//std::vector> groups;
-#line 3 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 3 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
bool withMaterialIcons = false;
std::ostream& _responseStream = response.send();
@@ -73,20 +74,20 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
responseStream << "\n";
responseStream << "\n";
responseStream << "Gradido Login Server: ";
-#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 11 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
responseStream << ( pageName );
responseStream << " \n";
responseStream << "\n";
-#line 13 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 13 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
if(withMaterialIcons) { responseStream << "\n";
responseStream << "\n";
-#line 15 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 15 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
} responseStream << "\n";
responseStream << "\n";
responseStream << "\n";
@@ -95,29 +96,29 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
responseStream << "\t\t\t \n";
responseStream << " Group::create(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description)
+ Poco::AutoPtr Group::create(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description)
{
- auto db = new model::table::Group(alias, name, url, home, description);
+ auto db = new model::table::Group(alias, name, url, host, home, description);
auto group = new Group(db);
return Poco::AutoPtr(group);
}
@@ -51,25 +51,9 @@ namespace controller {
{
auto db = new model::table::Group();
std::vector group_list;
- // throw an unresolved external symbol error
- //group_list = db->loadAllFromDB();
- // work around for not working call to loadAllFromDB
- auto cm = ConnectionManager::getInstance();
- auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER);
- Poco::Data::Statement select(session);
-
- select << "SELECT id, alias, name, url, home, description FROM " << db->getTableName()
- , Poco::Data::Keywords::into(group_list);
-
- size_t resultCount = 0;
- try {
- resultCount = select.execute();
- }
- catch (Poco::Exception& ex) {
- printf("[Group::listAll] poco exception: %s\n", ex.displayText().data());
- }
- // work around end
+ group_list = db->loadAllFromDB();
+
std::vector> resultVector;
resultVector.reserve(group_list.size());
@@ -94,7 +78,11 @@ namespace controller {
}
}
auto model = getModel();
- return JsonRequest(model->getUrl(), port);
+ std::string request_url = model->getHost();
+ if ("" == request_url) {
+ request_url = model->getUrl();
+ }
+ return JsonRequest(request_url, port);
}
std::string Group::getHost()
diff --git a/login_server/src/cpp/controller/Group.h b/login_server/src/cpp/controller/Group.h
index 3f084acd4..b1061b82c 100644
--- a/login_server/src/cpp/controller/Group.h
+++ b/login_server/src/cpp/controller/Group.h
@@ -16,7 +16,7 @@ namespace controller {
~Group();
- static Poco::AutoPtr create(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description);
+ static Poco::AutoPtr create(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description);
static std::vector> load(const std::string& alias);
static Poco::AutoPtr load(int id);
diff --git a/login_server/src/cpp/lib/JsonRequest.cpp b/login_server/src/cpp/lib/JsonRequest.cpp
index 2af0a2039..c20c69898 100644
--- a/login_server/src/cpp/lib/JsonRequest.cpp
+++ b/login_server/src/cpp/lib/JsonRequest.cpp
@@ -136,6 +136,8 @@ JsonRequestReturn JsonRequest::request(const char* methodName, const Poco::JSON:
}
catch (Poco::Exception& e) {
addError(new ParamError(functionName, "connect error to php server", e.displayText().data()));
+ addError(new ParamError(functionName, "host", mServerHost));
+ addError(new ParamError(functionName, "port", mServerPort));
sendErrorsAsEmail();
return JSON_REQUEST_CONNECT_ERROR;
}
diff --git a/login_server/src/cpp/model/Session.cpp b/login_server/src/cpp/model/Session.cpp
index f7ccc121b..3fbe05a98 100644
--- a/login_server/src/cpp/model/Session.cpp
+++ b/login_server/src/cpp/model/Session.cpp
@@ -738,7 +738,6 @@ UserState Session::loadUser(const std::string& email, const std::string& passwor
}
detectSessionState();
- unlock();
if (0 == mNewUser->getModel()->getGroupId()) {
return USER_NO_GROUP;
}
diff --git a/login_server/src/cpp/model/table/Group.cpp b/login_server/src/cpp/model/table/Group.cpp
index 9e4a6af66..3f9cb696c 100644
--- a/login_server/src/cpp/model/table/Group.cpp
+++ b/login_server/src/cpp/model/table/Group.cpp
@@ -8,15 +8,16 @@ namespace model {
{
}
- Group::Group(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description)
- : mAlias(alias), mName(name), mUrl(url), mHome(home), mDescription(description)
+ Group::Group(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description)
+ : mAlias(alias), mName(name), mUrl(url), mHost(host), mHome(home), mDescription(description)
{
}
Group::Group(GroupTuple tuple)
: ModelBase(tuple.get<0>()),
- mAlias(tuple.get<1>()), mName(tuple.get<2>()), mUrl(tuple.get<3>()), mHome(tuple.get<4>()), mDescription(tuple.get<5>())
+ mAlias(tuple.get<1>()), mName(tuple.get<2>()), mUrl(tuple.get<3>()),
+ mHost(tuple.get<4>()), mHome(tuple.get<5>()), mDescription(tuple.get<6>())
{
}
@@ -32,6 +33,7 @@ namespace model {
ss << "Alias: " << mAlias << std::endl;
ss << "Name: " << mName << std::endl;
ss << "Url: " << mUrl << std::endl;
+ ss << "Host: " << mHost << std::endl;
ss << "Home: " << mHome << std::endl;
ss << "Description:" << mDescription << std::endl;
return ss.str();
@@ -41,9 +43,9 @@ namespace model {
{
Poco::Data::Statement select(session);
- select << "SELECT id, alias, name, url, home, description FROM " << getTableName()
+ select << "SELECT id, alias, name, url, host, home, description FROM " << getTableName()
<< " where " << fieldName << " = ?"
- , into(mID), into(mAlias), into(mName), into(mUrl), into(mHome), into(mDescription);
+ , into(mID), into(mAlias), into(mName), into(mUrl), into(mHost), into(mHome), into(mDescription);
return select;
}
@@ -52,7 +54,7 @@ namespace model {
{
Poco::Data::Statement select(session);
- select << "SELECT id, alias, name, url, home, description FROM " << getTableName();
+ select << "SELECT id, alias, name, url, host, home, description FROM " << getTableName();
return select;
}
@@ -61,7 +63,7 @@ namespace model {
{
Poco::Data::Statement select(session);
// typedef Poco::Tuple, int> UserTuple;
- select << "SELECT id, alias, name, url, home, description FROM " << getTableName()
+ select << "SELECT id, alias, name, url, host, home, description FROM " << getTableName()
<< " where " << fieldName << " LIKE ?";
return select;
@@ -84,8 +86,8 @@ namespace model {
Poco::ScopedLock _lock(mWorkMutex);
insert << "INSERT INTO " << getTableName()
- << " (alias, name, url, home, description) VALUES(?,?,?,?,?)"
- , use(mAlias), use(mName), use(mUrl), use(mHome), use(mDescription);
+ << " (alias, name, url, host, home, description) VALUES(?,?,?,?,?,?)"
+ , use(mAlias), use(mName), use(mUrl), use(mHost), use(mHome), use(mDescription);
return insert;
}
diff --git a/login_server/src/cpp/model/table/Group.h b/login_server/src/cpp/model/table/Group.h
index 5feb8ba14..8e0c56e40 100644
--- a/login_server/src/cpp/model/table/Group.h
+++ b/login_server/src/cpp/model/table/Group.h
@@ -7,13 +7,13 @@
namespace model {
namespace table {
- typedef Poco::Tuple GroupTuple;
+ typedef Poco::Tuple GroupTuple;
class Group : public ModelBase
{
public:
Group();
- Group(const std::string& alias, const std::string& name, const std::string& url, const std::string& home, const std::string& description);
+ Group(const std::string& alias, const std::string& name, const std::string& url, const std::string& host, const std::string& home, const std::string& description);
Group(GroupTuple userTuple);
~Group();
@@ -25,11 +25,13 @@ namespace model {
inline const std::string& getName() const { std::shared_lock _lock(mSharedMutex); return mName; }
inline const std::string& getDescription() const { std::shared_lock _lock(mSharedMutex); return mDescription; }
inline const std::string& getUrl() const { std::shared_lock _lock(mSharedMutex); return mUrl; }
+ inline const std::string& getHost() const { SHARED_LOCK; return mHost; }
inline const std::string& getHome() const { SHARED_LOCK; return mHome; }
inline void setName(const std::string& name) { std::unique_lock _lock(mSharedMutex); mName = name; }
inline void setDescription(const std::string& desc) { std::unique_lock _lock(mSharedMutex); mDescription = desc; }
inline void setUrl(const std::string& url) { std::unique_lock _lock(mSharedMutex); mUrl = url; }
+ inline void setHost(const std::string& host) { UNIQUE_LOCK; mHost = host; }
inline void setHome(const std::string& home) { UNIQUE_LOCK; mHome = home; }
protected:
@@ -42,6 +44,7 @@ namespace model {
std::string mAlias;
std::string mName;
std::string mUrl;
+ std::string mHost;
std::string mHome;
std::string mDescription;
diff --git a/login_server/src/cpp/model/table/PendingTask.cpp b/login_server/src/cpp/model/table/PendingTask.cpp
index 57115ea56..dfaf0c65d 100644
--- a/login_server/src/cpp/model/table/PendingTask.cpp
+++ b/login_server/src/cpp/model/table/PendingTask.cpp
@@ -10,13 +10,13 @@ namespace model
namespace table
{
PendingTask::PendingTask()
- : mUserId(0), mHederaId(0), mTaskTypeId(TASK_TYPE_NONE)
+ : mUserId(0), mHederaId(0), mTaskTypeId(TASK_TYPE_NONE), mChildPendingTaskId(0), mParentPendingTaskId(0)
{
}
PendingTask::PendingTask(int userId, std::string serializedProtoRequest, TaskType type)
: mUserId(userId), mHederaId(0), mRequest((const unsigned char*)serializedProtoRequest.data(), serializedProtoRequest.size()),
- mTaskTypeId(TASK_TYPE_NONE)
+ mTaskTypeId(TASK_TYPE_NONE), mChildPendingTaskId(0), mParentPendingTaskId(0)
{
}
diff --git a/login_server/src/cpp/model/table/User.cpp b/login_server/src/cpp/model/table/User.cpp
index 91cfbf7f1..0a69ac324 100644
--- a/login_server/src/cpp/model/table/User.cpp
+++ b/login_server/src/cpp/model/table/User.cpp
@@ -421,6 +421,7 @@ namespace model {
userObj.set("created", createTimeStamp.raw() / createTimeStamp.resolution());
userObj.set("email_checked", mEmailChecked);
userObj.set("ident_hash", DRMakeStringHash(mEmail.data(), mEmail.size()));
+ userObj.set("language", mLanguageKey);
userObj.set("disabled", mDisabled);
try {
userObj.set("role", UserRole::typeToString(getRole()));
diff --git a/login_server/src/cpsp/adminGroups.cpsp b/login_server/src/cpsp/adminGroups.cpsp
index 64df38205..a894c23ac 100644
--- a/login_server/src/cpsp/adminGroups.cpsp
+++ b/login_server/src/cpsp/adminGroups.cpsp
@@ -25,6 +25,7 @@
alias,
form.get("group-name", ""),
form.get("group-url", ""),
+ form.get("group-host", ""),
form.get("group-home", ""),
form.get("group-desc", "")
);
@@ -50,6 +51,7 @@
@@ -60,6 +62,7 @@
\n";
responseStream << "\t\t\t\t
\n";
@@ -192,15 +198,17 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
+ responseStream << "\t\t\t\n";
+ responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\n";
responseStream << "\t\n";
@@ -212,14 +220,14 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
responseStream << " - \n";
responseStream << "\t\t\t\t\t";
-#line 22 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_large.cpsp"
+#line 22 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\header_large.cpsp"
if(!user.isNull()) { responseStream << "\n";
responseStream << "\t\t\t\t\t\t
";
// end include header_large.cpsp
responseStream << "\n";
-#line 41 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 42 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( getErrorsHtml() );
responseStream << "\n";
responseStream << "
\n";
responseStream << "\t\n";
@@ -140,44 +141,49 @@ void AdminGroupsPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:
responseStream << "\t\t\t\t
\n";
responseStream << "\t\t\t";
-#line 56 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 58 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
for(auto it = groups.begin(); it != groups.end(); it++) {
auto group_model = (*it)->getModel(); responseStream << "\n";
responseStream << "\t\t\t\tName
\n";
responseStream << "\t\t\t\tAlias
\n";
responseStream << "\t\t\t\tUrl
\n";
+ responseStream << "\t\t\t\tHost
\n";
responseStream << "\t\t\t\tHome
\n";
responseStream << "\t\t\t\t";
-#line 54 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 56 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( gettext("Description") );
responseStream << "
\n";
responseStream << "\t\t\t\n";
responseStream << "\t\t\t\t\t
\n";
responseStream << "\t\t\t";
-#line 66 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 69 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
} responseStream << "\n";
responseStream << "\t\t";
-#line 59 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 61 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getID() );
responseStream << "
\n";
responseStream << "\t\t\t\t\t";
-#line 60 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 62 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getName() );
responseStream << "
\n";
responseStream << "\t\t\t\t\t";
-#line 61 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 63 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getAlias() );
responseStream << "
\n";
responseStream << "\t\t\t\t\t";
-#line 62 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 64 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getUrl() );
responseStream << "
\n";
+ responseStream << "\t\t\t\t\t";
+#line 65 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
+ responseStream << ( group_model->getHost() );
+ responseStream << "
\n";
responseStream << "\t\t\t\t\t";
-#line 63 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 66 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getHome() );
responseStream << "
\n";
responseStream << "\t\t\t\t\t";
-#line 64 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminGroups.cpsp"
+#line 67 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\adminGroups.cpsp"
responseStream << ( group_model->getDescription());
responseStream << "
\n";
responseStream << "\t\t\t\t\n";
responseStream << " ";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+#line 6 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp"
responseStream << ( mTimeProfiler.string() );
responseStream << "\n";
responseStream << "
\n";
responseStream << " \n";
responseStream << "
\n";
diff --git a/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp b/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
index d8d0c8e2b..9228c31cb 100644
--- a/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonSendEmail.cpp
@@ -110,7 +110,7 @@ Poco::JSON::Object* JsonSendEmail::handle(Poco::Dynamic::Var params)
{
session = sm->getNewSession();
if (emailType == model::EMAIL_USER_RESET_PASSWORD) {
- auto r = session->sendResetPasswordEmail(receiver_user, false, receiver_user->getGroupBaseUrl());
+ auto r = session->sendResetPasswordEmail(receiver_user, true, receiver_user->getGroupBaseUrl());
if (1 == r) {
return stateWarning("email already sended");
}
diff --git a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp
index 07aa9e1d3..5eba547d0 100644
--- a/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp
@@ -79,6 +79,8 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
USER_DISABLED
*/
auto user_state = session->loadUser(email, password);
+ auto user_model = session->getNewUser()->getModel();
+ Poco::JSON::Array infos;
switch (user_state) {
case USER_EMPTY:
@@ -98,6 +100,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
result->set("state", "disabled");
result->set("msg", "user is disabled");
break;
+ case USER_NO_GROUP:
+ user_model->setGroupId(1);
+ user_model->updateIntoDB("group_id", 1);
+ infos.add("set user.group_id to default group_id = 1");
case USER_NO_PRIVATE_KEY:
case USER_COMPLETE:
case USER_EMAIL_NOT_ACTIVATED:
@@ -105,7 +111,14 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
result->set("user", session->getNewUser()->getJson());
result->set("session_id", session->getHandle());
session->setClientIp(mClientIP);
+ if(infos.size() > 0) {
+ result->set("info", infos);
+ }
return result;
+ default:
+ result->set("state", "error");
+ result->set("msg", "unknown user state");
+ result->set("details", USER_NO_GROUP);
}
sm->releaseSession(session);
diff --git a/login_server/src/cpp/controller/Group.cpp b/login_server/src/cpp/controller/Group.cpp
index 43285abb3..0cf04e39e 100644
--- a/login_server/src/cpp/controller/Group.cpp
+++ b/login_server/src/cpp/controller/Group.cpp
@@ -15,9 +15,9 @@ namespace controller {
}
- Poco::AutoPtrLogin Server in Entwicklung
\n"; responseStream << "Alpha "; -#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp" +#line 10 "F:\\Gradido\\gradido_local\\login_server\\src\\cpsp\\footer.cpsp" responseStream << ( ServerConfig::g_versionString ); responseStream << "
\n"; responseStream << "Name
Alias
Url
+ Host
Home
<%= gettext("Description") %>
<%= group_model->getName() %>
<%= group_model->getAlias() %>
<%= group_model->getUrl() %>
+ <%= group_model->getHost() %>
<%= group_model->getHome() %>
<%= group_model->getDescription()%>