Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

app/controllers/home.js

@@ -63,19 +63,13 @@ class HomeController extends SiteController {
   }
 
   async getHome (req, res, next) {
-    const {
-      announcement: announcementService,
-      feed: feedService,
-      hive: hiveService,
-    } = this.dtp.services;
+    const { announcement: announcementService, hive: hiveService } = this.dtp.services;
     try {
       res.locals.announcements = await announcementService.getLatest(req.user);
 
       res.locals.pagination = this.getPaginationParameters(req, 20);
       res.locals.constellationTimeline = await hiveService.getConstellationTimeline(req.user, res.locals.pagination);
 
-      res.locals.newsfeed = await feedService.getNewsfeed();
-
       res.render('index');
     } catch (error) {
       this.log.error('failed to render home view', { error });

app/controllers/user.js

@@ -33,12 +33,12 @@ class UserController extends SiteController {
     const otpSetup = otpAuthService.middleware('Account', {
       adminRequired: false,
       otpRequired: true,
-      otpRedirectURL: async (req) => { return `/user/${req.user._id}`; },
+      otpRedirectURL: async (req) => { return `/user/${req.user.username}`; },
     });
     const otpMiddleware = otpAuthService.middleware('Account', {
       adminRequired: false,
       otpRequired: false,
-      otpRedirectURL: async (req) => { return `/user/${req.user._id}`; },
+      otpRedirectURL: async (req) => { return `/user/${req.user.username}`; },
     });
 
     router.use(
@@ -60,8 +60,9 @@ class UserController extends SiteController {
       return next();
     }
 
-    router.param('userId', this.populateUser.bind(this));
-    router.param('coreUserId', this.populateCoreUser.bind(this));
+    router.param('username', this.populateUsername.bind(this));
+    router.param('userId', this.populateUserId.bind(this));
+    router.param('coreUserId', this.populateCoreUserId.bind(this));
 
     router.post(
       '/core/:coreUserId/settings',
@@ -131,7 +132,7 @@ class UserController extends SiteController {
       this.getUserSettingsView.bind(this),
     );
     router.get(
-      '/:userId',
+      '/:username',
       limiterService.createMiddleware(limiterService.config.user.getUserProfile),
       authRequired,      
       otpMiddleware,
@@ -147,7 +148,21 @@ class UserController extends SiteController {
     );
   }
 
-  async populateUser (req, res, next, userId) {
+  async populateUsername (req, res, next, username) {
+    const { user: userService } = this.dtp.services;
+    try {
+      res.locals.userProfile = await userService.getPublicProfile('User', username);
+      if (!res.locals.userProfile) {
+        throw new SiteError(404, 'Member not found');
+      }
+      return next();
+    } catch (error) {
+      this.log.error('failed to populate username with public profile', { username, error });
+      return next(error);
+    }
+  }
+
+  async populateUserId (req, res, next, userId) {
     const { user: userService } = this.dtp.services;
     try {
       userId = mongoose.Types.ObjectId(userId);
@@ -163,7 +178,7 @@ class UserController extends SiteController {
     }
   }
 
-  async populateCoreUser (req, res, next, coreUserId) {
+  async populateCoreUserId (req, res, next, coreUserId) {
     const { coreNode: coreNodeService } = this.dtp.services;
     try {
       coreUserId = mongoose.Types.ObjectId(coreUserId);
@@ -203,7 +218,7 @@ class UserController extends SiteController {
         if (error) {
           return next(error);
         }
-        res.redirect(`/user/${res.locals.user._id}`);
+        res.redirect(`/user/${res.locals.user.username}`);
       });
     } catch (error) {
       this.log.error('failed to create new user', { error });

app/services/feed.js

@@ -27,6 +27,17 @@ class FeedService extends SiteService {
     this.jobQueue = await this.getJobQueue('newsroom', this.dtp.config.jobQueues.newsroom);
   }
 
+  middleware (options) {
+    options = Object.assign({ maxEntryCount: 5 }, options);
+    return async (req, res, next) => {
+      if (this.isSystemRoute(req.path)) {
+        return next(); // don't load newsfeeds for non-content routes
+      }
+      res.locals.newsfeed = await this.getNewsfeed({ skip: 0, cpp: options.maxEntryCount });
+      return next();
+    };
+  }
+
   async create (feedDefinition) {
     feedDefinition.url = feedDefinition.url.trim();
     const feedContent = await this.load(feedDefinition.url);

app/services/user.js

@@ -459,7 +459,7 @@ class UserService extends SiteService {
     return user;
   }
 
-  async getPublicProfile (username) {
+  async getPublicProfile (type, username) {
     if (!username || (typeof username !== 'string')) {
       throw new SiteError(406, 'Invalid username');
     }
@@ -469,28 +469,32 @@ class UserService extends SiteService {
       throw new SiteError(406, 'Invalid username');
     }
 
-    /**
-     * Try to resolve the user as a CoreUser
-     */
-    let user = await CoreUser
-      .findOne({ username_lc: username })
-      .select('_id created username username_lc displayName bio picture header core')
-      .populate(this.populateUser)
-      .lean();
-    if (user) {
-      user.type = 'CoreUser';
-    } else {
-      /*
-       * Try to resolve the user as a local User
-       */
-      user = await User
-        .findOne({ username_lc: username })
-        .select('_id created username username_lc displayName bio picture header')
-        .populate(this.populateUser)
-        .lean();
-      if (user) {
-        user.type = 'User';
-      }
+    let user;
+    switch (type) {
+      case 'CoreUser':
+        user = await CoreUser
+          .findOne({ username_lc: username })
+          .select('_id created username username_lc displayName bio picture header core')
+          .populate(this.populateUser)
+          .lean();
+        if (user) {
+          user.type = 'CoreUser';
+        }
+        break;
+
+      case 'User':
+        user = await User
+          .findOne({ username_lc: username })
+          .select('_id created username username_lc displayName bio picture header')
+          .populate(this.populateUser)
+          .lean();
+        if (user) {
+          user.type = 'User';
+        }
+        break;
+
+      default:
+        throw new SiteError(400, 'Invalid user account type');
     }
 
     return user;

app/views/admin/layouts/main.pug

@@ -4,11 +4,6 @@ block vendorcss
 
 block content-container
 
-  block page-header
-    section.uk-section.uk-section-header.uk-section-xsmall
-      .uk-container
-        h1.uk-text-center.uk-margin-remove #{site.name} Admin
-  
   block admin-layout
 
     section.uk-section.uk-section-default.uk-section-small

app/views/components/library.pug

@@ -40,9 +40,9 @@ include section-title
 
   function getUserProfileUrl (user) {
     if (user.core) {
-      return `/user/core/${user._id}`;
+      return `/user/core/${user.username}`;
     }
-    return `/user/${user._id}`;
+    return `/user/${user.username}`;
   }
 
 mixin renderCell (label, value, className)
@@ -60,6 +60,6 @@ mixin renderBackButton (options)
 
 mixin renderUserLink (user)
   if user.coreUserId
-    a(href=`/user/core/${user._id}`)= `${user.username}@${user.core.meta.domainKey}`
+    a(href=`/user/core/${user.username}`)= `${user.username}@${user.core.meta.domainKey}`
   else
-    a(href=`/user/${user._id}`)= user.displayName || user.username
+    a(href=`/user/${user.username}`)= user.displayName || user.username

app/views/components/navbar.pug

@@ -47,7 +47,7 @@ nav(uk-navbar).uk-navbar-container.uk-position-fixed.uk-position-top
             li.uk-nav-heading.uk-text-center= user.displayName || user.username
             li.uk-nav-divider
             li
-              a(href= user.core ? `/user/core/${user._id}` : `/user/${user._id}`)
+              a(href= user.core ? `/user/core/${user.username}` : `/user/${user.username}`)
                 span.nav-item-icon
                   i.fas.fa-user
                 span Profile

app/views/components/off-canvas.pug

@@ -40,7 +40,7 @@ mixin renderMenuItem (iconClass, label)
               .uk-width-expand Chat
 
         li(class={ "uk-active": (currentView === 'user-settings') })
-          a(href=`/user/${user._id}`).uk-display-block
+          a(href=`/user/${user.username}`).uk-display-block
             div(uk-grid).uk-grid-collapse
               .uk-width-auto
                 .app-menu-icon

app/views/layouts/main-sidebar.pug

@@ -1,6 +1,8 @@
 extends main
 block content-container
+
   block content-header
+
   section.uk-section.uk-section-default.uk-section-small
     .uk-container
       div(uk-grid)#dtp-content-grid

app/views/newsroom/components/feed-entry-list-item.pug

@@ -1,9 +1,9 @@
 mixin renderNewsroomFeedEntryListItem (entry)
-  .uk-text-bold
-    a(href= entry.link, target="_blank").uk-link-reset= entry.title
-  .uk-text-small
-    div(uk-grid).uk-grid-small
-      .uk-width-expand
+  a(href= entry.link, target="_blank").dtp-link
+    div= entry.title
+  .uk-article-meta
+    div(uk-grid).uk-grid-small.uk-grid-divider
+      .uk-width-auto.uk-text-truncate
         a(href= entry.feed.link, target="_blank").uk-link-reset= entry.feed.title
       .uk-width-auto
         div= moment(entry.published).fromNow()

client/less/site/main.less

@@ -50,6 +50,13 @@ body {
   }
 }
 
+a.dtp-link {
+  color: inherit;
+
+  &:hover {
+    color: @global-link-hover-color;
+  }
+}
 .dtp-site-footer {
   .uk-subnav {
     a.dtp-social-link {

dtp-webapp.js

@@ -21,12 +21,16 @@ module.config = {
   site: require(path.join(module.rootPath, 'config', 'site')),
   http: require(path.join(module.rootPath, 'config', 'http')),
   https: require(path.join(module.rootPath, 'config', 'https')),
+  registerMiddleware: async (dtp, app) => {
+    const { feed: feedService } = dtp.services;
+    app.use(feedService.middleware({ maxEntryCount: 5 }));
+  },
 };
 
 module.log = new SiteLog(module, module.config.component);
 
 module.shutdown = async ( ) => {
-
+  await SitePlatform.shutdown();
 };
 
 (async ( ) => {

lib/site-common.js

@@ -106,6 +106,13 @@ class SiteCommon extends EventEmitter2 {
     });
   }
 
+  isSystemRoute (pathname) {
+    return pathname.startsWith('/auth') ||
+           pathname.startsWith('/image') ||
+           pathname.startsWith('/manifest')
+    ;
+  }
+
   isValidString (text) {
     return text && (typeof text === 'string') && (text.length > 0);
   }