Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	public/routes/home.js
#	public/style/style.css
#	public/style/style.less

mong_usr.js

@@ -1,12 +1,10 @@
 db.users.insert([
     // author,OHMNEWS2019
-    {"_id":"author","name":"Test Author","type":"author","roles":["user","author"],"hash":"sha256","salt":"cy5CkPrplcEze6o4psURhw==","pwd":"Gc8ozlxjEGITkS+fW9tz2xLROzws44s04EOCWuP04qE=","abos":["wichtig","th"],"bookmarks":["th"],},
+    {"_id":"author","name":"Test Author","type":"author","roles":{"user":true,"author":true},"hash":"sha256","salt":"cy5CkPrplcEze6o4psURhw==","pwd":"Gc8ozlxjEGITkS+fW9tz2xLROzws44s04EOCWuP04qE=","abos":["wichtig","th"],"bookmarks":["th"],},
     // admin,oZuse1
-    {"_id":"admin","name":"Test Admin","type":"admin","roles":["user","author","admin"],"hash":"sha256","salt":"PoIUHbDp7tP34ji31iQ0zw==","pwd":"mJpIfIksYs6LJJwYRBemFKqR6TacsSl2E0ZtpO1GMuk=","abos":["wichtig","th"],"bookmarks":["wichtig"],},
+    {"_id":"admin","name":"Test Admin","type":"admin","roles":{"user":true,"author":true,"admin":true},"hash":"sha256","salt":"PoIUHbDp7tP34ji31iQ0zw==","pwd":"mJpIfIksYs6LJJwYRBemFKqR6TacsSl2E0ZtpO1GMuk=","abos":["wichtig","th"],"bookmarks":["wichtig"],},
 ])
 
-db.users.insert({"name":"mustermannmax", "roles":["user"],"abos":[],"bookmarks":[]})
-
 //var c = require('./server/crypto.js'),
 //    e = {"_id":"writer","hash":"sha256"};
 //c.fillLocalAuth(e,"pwd");

public/index.html

@@ -95,28 +95,17 @@
         <div class="om-content">
             <div id=xxx></div>
             <nav-router></nav-router>
-            <router-view :key="auth.user"></router-view>
+            <router-view :key="vueRender.key"></router-view>
         </div>
     </div>
 
     <script>
-
         new Vue({
             router,
             el: '#api',
-            components: {
-                // Locally registered components
-            },
             data: {
                 // Locally registered variables
-                auth: auth,
+                vueRender : vueRender,
-            },
-
-            computed:{
-                // Methods to change data appearance, does cache results
-            },
-            methods: {
-                // Methods to change data content, run always again
             },
         });
 	</script>

public/routes/auth.js

@@ -122,6 +122,8 @@ Vue.component('login-panel', {
             function successful_login(resData) {
                 fillAuthState(resData);
 //                updateUserInDB();
+                auth.abos = [];
+                auth.bookmarks = [];
 				console.info("Correct credentials");
                 this.closeLoginPanel;
 
@@ -150,6 +152,7 @@ Vue.component('login-panel', {
             function successful_login(res) {
 				console.info("Re-Auth: Correct credentials");
                 this.closeLoginPanel;
+                vueForceRender();
 
 				//console.log(res);
                 router.push('/home')
@@ -163,10 +166,5 @@ Vue.component('login-panel', {
 				console.log(err);
 			}
 		},
-        logout: function() {
-            clearAuthState();
-            $.ajax({ url: "api/logout", method: "POST" });
-            this.closeLoginPanel;
-        },
     },
 });

public/routes/bookmark.js

@@ -36,7 +36,21 @@ const BookmarkRouter = {
 
         },
         getMessages: function(){
-            var _usrid = "5d360f06b8f3ce67d12ccc92";
+            var arr = auth.bookmarks;
+            console.log("arr: "+arr+" auth.bookmarks: "+auth.bookmarks);
+            _messagelist.splice(0, _messagelist.length);
+            _messagelist.push.apply(_messagelist, arr);
+            for (var e in arr) {
+                if (!_messages[arr[e]]) {
+                    //arr[e] =arr[e].replace(/\[/g, '').replace(/\"/g, '').replace(/\]/g, '')
+                    console.log("getinsertmessage: "+ arr[e]);
+                    get_insert_message(arr[e]);
+                }
+            }
+
+
+
+            /*var _usrid = auth.user;
             $.ajax({
                 url: "api/usr/id/" + _usrid,
                 method: "GET"
@@ -59,7 +73,7 @@ const BookmarkRouter = {
 			function have_error(err) {
 				console.log("error: " + err.responseText);
 				console.log(err);
-			}
+			}*/
         }
     },
     mounted: function (){

public/routes/home.js

@@ -8,6 +8,7 @@ const HomeRouter = {
         v-for="id in messagelist.slice().reverse()"
         :key="id"
         :msg="messages[id] || {}"
+		:isBookmark="bookmarkArray[id]"
     ></MsgCard>
 </div>
 </div>`,
@@ -16,7 +17,8 @@ const HomeRouter = {
             messagelist: _messagelist,
             messages: _messages,
 			isSearchActiv: _isSearchActiv,
-			isSubscripeButtonActiv: _isSubscripeButtonActiv
+			isSubscripeButtonActiv: _isSubscripeButtonActiv,
+            bookmarkArray: auth.bookmarks,
         };
     },
     methods: {
@@ -48,6 +50,7 @@ const HomeRouter = {
 
 			}
 		}
+
     },
     mounted: function () {
         this.list_messages();

public/routes/initGlobals.js

@@ -16,6 +16,17 @@ var auth = {},
     _isSearchActiv = false,
 	_isSubscripeButtonActiv = true,
     data = [],
-    search_data = []
+    search_data = [],
 
+    // Vue Rerender Key
+    vueRender = { key:0 };
 
+const authorRole = 'author';
+
+// Global Functions
+function vueForceRender() {
+    if (vueRender.key >= 10) {
+        vueRender.key = 0;
+    }
+    vueRender.key++;
+}

public/routes/msgCard.js

@@ -1,5 +1,6 @@
 Vue.component('MsgCard', {
-    template: `<div class="om-card card">
+    template: `
+        <div class="om-card card">
             <h6 class="msg-head">
                 <b>{{ msg.subject }}</b>
                 <div id="msgid" >{{msg._id}}</div>
@@ -8,29 +9,43 @@ Vue.component('MsgCard', {
             {{ msg.message }}<br>
             <a v-for="tag in msg.tag" @click="filterForTag(tag)">#{{ tag }} </a>
             <br>
-				</p>
+            <div class="om-card-footer">
-                <div class="om-card-footer"> <div class="om-user-line">
+                <div class="om-user-line">
                     <i class="material-icons">account_circle</i>
-                Erstellt von {{ msg.user }}</div>
+                    Erstellt von {{ msg.user }}
-                <i class="material-icons" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
+                </div>
-                <i class="material-icons" @click="myFilter(msg._id)" v-else="isActive">bookmark</i>
+                <i id="bockmark-not-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
-                </div></div>`,
+                <i id="bockmark-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-else>bookmark</i>
-    props: ['msg'],
+            </div>
+        </div>`,
+    props: ['msg', 'isBookmark'],
 
     data: function () {
         return {
-            isActive: false,
+            isActive: this.isBookmark,
+            isActive_: 0,
+            msgid: this.msg._id,
+            bookmarkArray: auth.bookmarks,
         };
     },
 
     methods: {
         myFilter: function (_messageid) {
             //var _messageid = $("#msgid").text();
+            if (this.isActive == true) {
+                var index = this.bookmarkArray.indexOf(_messageid);
 
-            var _bookmark = auth.bookmarks;
+                if (index > -1) {
-            _bookmark.push(_messageid);
+                    this.bookmarkArray.splice(index, 1);
-            console.log("msgid"+_bookmark);
+                }
-            var _userid = "5d360f06b8f3ce67d12ccc92";
+                this.isActive = false;
+            } else {
+                console.log("_messsageid: "+_messageid+" bookmarks: "+this.bookmarkArray);
+                this.bookmarkArray.push(_messageid);
+                this.isActive =true;
+            }
+            /*console.log("msgid"+_bookmark);
+            var _userid = auth.user;
             this.isActive = !this.isActive;
             if(this.isActive){
                 $.ajax({
@@ -50,11 +65,25 @@ Vue.component('MsgCard', {
                     console.log("error: " + err.responseText);
                     console.log(err);
                 }
-            }
+            }*/
         },
         filterForTag: function (tag) {
             console.log("link: " + tag);
             searching(tag);
         },
+        isBookmarkActive: function (msgid) {
+            //console.log("isBookmarkActive(): " + msgid);
+            if (this.bookmarkArray.indexOf(msgid) > -1) {
+                // $("#bockmark-not-active").css("visibility","hidden");
+                // $("#bockmark-active").css("visibility","visible");
+                this.isActive = true;
+                //console.log("isBookmarkActive(): " + this.isActive);
+                this.isActive_ = 1;
+
+            }
+        }
+    },
+    beforeMount: function () {
+        //this.isBookmarkActive();
     }
 });

public/routes/navRoutes.js

@@ -11,7 +11,7 @@ Vue.component('nav-router', {
                                 <i class="material-icons">search</i>
                             </router-link>
 
-                            <router-link to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
+                            <router-link v-if="isAuthor" to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
                                 <i class="material-icons">add_circle</i>
                             </router-link>
 
@@ -37,7 +37,7 @@ Vue.component('nav-router', {
                                         <i class="material-icons">search</i> Search
                                     </router-link></li>
 
-                                    <li><router-link to="/createMessage">
+                                    <li><router-link v-if="isAuthor" to="/createMessage">
                                         <i class="material-icons">add_circle</i> Create Message
                                     </router-link></li>
 
@@ -53,6 +53,20 @@ Vue.component('nav-router', {
                         </div>
                     </div>
                 </div>`,
+    data: function() {
+        return {
+            isAuthor: this.isAuthorCheck(),
+        };
+    },
+    methods: {
+        isAuthorCheck: function() {
+            console.info(auth.roles.author === authorRole);
+            return (auth.roles.author === authorRole);
+        },
+    },
+    updated: function() {
+        this.isAuthorChecked();
+    }
 });
 
 const routes = [

public/routes/profilCard.js

@@ -18,15 +18,15 @@ Vue.component('profil-card', {
             <hr class="first">
 
             <div class="btnprofil">
-                <button @click="isCardModalActive = true"><b>Abonniert: <br/>{{ abo }}</b> <br/></button>
+                <button @click="isCardModalActive = true"><b>Abonniert: <br/>{{ abos }}</b> <br/></button>
-                <button @click="$router.push('/bookmark')"><b>Gespeichert:<br/> {{ saved }}</b><br/></button>
+                <button @click="$router.push('/bookmark')"><b>Gespeichert:<br/> {{ bookmarks }}</b><br/></button>
             </div>
 
             <section>
                 <b-modal :active.sync="isCardModalActive" :width="600" scroll="keep">
                     <div class="card">
                         <header class="modal-card-head">
-                            <p class="modal-card-title">Abonnierte Kanäle</p>
+                            <p class="modal-card-title">Abonnierte Tags</p>
                         </header>
                         <div class="card-content">
                             <div class="content">
@@ -51,8 +51,8 @@ Vue.component('profil-card', {
     data: function () {
         return {
             auth: auth,
-            abo: 7,
+            abos: auth.abos ? auth.abos.length : '-',
-            saved: 3,
+            bookmarks: auth.bookmarks ? auth.bookmarks.length : '-',
             isCardModalActive: false,
         };
     },
@@ -75,6 +75,7 @@ Vue.component('profil-card', {
         logout: function() {
             clearAuthState();
             $.ajax({ url: "api/logout", method: "POST" });
+            vueForceRender();
             router.push('/profil');
         },
     }

public/style/style.css

@@ -241,10 +241,15 @@ button.clearButton {
     float: right;
   }
 }
+<<<<<<< HEAD
 #subscribe-btn {
   float: right;
   visibility: hidden;
 }
 #escape-search-link {
   visibility: hidden;
+=======
+#bockmark-not-active {
+  visibility: visible;
+>>>>>>> origin/developer
 }

public/style/style.less

@@ -291,4 +291,10 @@ button.clearButton{
 }
 #escape-search-link{
 	visibility: hidden;
+
+#bockmark-not-active{
+    visibility: visible;
+}
+#bockmark-active{
+    //visibility: hidden;
 }

server/authorization.js

@@ -12,6 +12,16 @@ const ldap   = require ('./ldap_ohm'),
 const serverVisibleSession = { user: true, name: true, type: true, mail: true, roles: true, gender: true, deactivated: true, host: true };
 const clientVisibleSession = { user: true, name: true, type: true, mail: true, roles: true, gender: true };
 
+// Return user role, query from found.mail
+function getUserRole(found) {
+    var roles = "user";
+    var mail = found.mail;
+    if (!/\d/.test(mail)) {
+        // Mail contains no number
+        roles += ',"author"';
+    }
+    return roles;
+}
 
 // Fill in session object
 function fillSession (req, user, roles, cb) {
@@ -22,7 +32,7 @@ function fillSession (req, user, roles, cb) {
         req.session.regenerate (function (err) {
             if (user !== undefined && ! err) {
                 common.shallowCopy (user, serverVisibleSession, {roles: true}, req.session);
-                console.info(req.session);
+//                console.info(req.session);
                 if (user._id) {
                     req.session.user = user._id;
                 }
@@ -37,7 +47,7 @@ function fillSession (req, user, roles, cb) {
 
 // Save found user into DB, if not already exists
 function saveFoundToDB(found, cb) {
-    console.info(found);
+//    console.info(found);
     Users.findById(found.user)
         .exec(function(err, result){
         if (err) {
@@ -52,15 +62,15 @@ function saveFoundToDB(found, cb) {
                 mail: found.mail,
                 type: found.type,
                 gender: found.gender,
-//                abos: '',
+                abos: '',
-//                bookmarks: '',
+                bookmarks: '',
-                roles: 'user',
+                roles: getUserRole(found),
             }, function(err, done) {
                 if (err) {
                     console.error("User creation: Failed");
                     console.error(err);
                 } else {
-                    console.info("New User created!");
+                    console.info("User created: "+ found.user);
                 }
                 if (done == null) {
                     console.error("Can not create user.");
@@ -158,7 +168,7 @@ const authorization = {
                     console.error(err);
                 }
             });
-            console.info(req.session);
+//            console.info(req.session);
             return res.json ({});
         });
     },