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

.env.default

@@ -62,6 +62,10 @@ MAILGUN_DOMAIN=
 
 MONGODB_HOST=localhost:27017
 MONGODB_DATABASE=dtp-webapp
+# For when NODE_ENV=production
+MONGODB_USERNAME=mongo-user
+MONGODB_PASSWORD=change-me!
+MONGODB_OPTIONS=
 
 #
 # Redis configuration

.gitignore

@@ -6,3 +6,4 @@ ssl/*key
 data/minio
 node_modules
 dist
+start-local-*

app/controllers/admin.js

@@ -51,6 +51,7 @@ class AdminController extends SiteController {
     router.use('/log', await this.loadChild(path.join(__dirname, 'admin', 'log')));
     router.use('/newsletter', await this.loadChild(path.join(__dirname, 'admin', 'newsletter')));
     router.use('/newsroom', await this.loadChild(path.join(__dirname, 'admin', 'newsroom')));
+    router.use('/otp', await this.loadChild(path.join(__dirname, 'admin', 'otp')));
     router.use('/settings', await this.loadChild(path.join(__dirname, 'admin', 'settings')));
     router.use('/service-node', await this.loadChild(path.join(__dirname, 'admin', 'service-node')));
     router.use('/user', await this.loadChild(path.join(__dirname, 'admin', 'user')));
@@ -83,6 +84,8 @@ class AdminController extends SiteController {
       constellation: await coreNodeService.getConstellationStats(),
     };
 
+    res.locals.pageTitle = `Admin Dashbord for ${this.dtp.config.site.name}`;
+
     res.render('admin/index');
   }
 }

app/controllers/admin/otp.js

@@ -0,0 +1,55 @@
+// admin/otp.js
+// Copyright (C) 2021 Digital Telepresence, LLC
+// License: Apache-2.0
+
+'use strict';
+
+const express = require('express');
+// const multer = require('multer');
+
+const { SiteController, SiteError } = require('../../../lib/site-lib');
+
+class OtpAdminController extends SiteController {
+
+  constructor (dtp) {
+    super(dtp, module.exports);
+  }
+
+  async start ( ) {
+    // const upload = multer({ dest: `/tmp/${this.dtp.config.site.domainKey}/uploads/${module.exports.slug}` });
+
+    const router = express.Router();
+    router.use(async (req, res, next) => {
+      res.locals.currentView = 'admin';
+      res.locals.adminView = 'otp';
+      return next();
+    });
+
+    // router.param('otp', this.populateOtp.bind(this));
+    
+    router.get('/', this.getIndex.bind(this));
+
+    return router;
+  }
+
+  async getIndex (req, res, next) {
+    try {
+      const { otpAuth: otpAuthService } = this.dtp.services;
+      if (!req.user) {
+        throw new SiteError(402, "Error getting user");
+      }
+      res.locals.tokens = await otpAuthService.getBackupTokens(req.user, "Admin");
+      res.render('admin/otp/index');
+    } catch (error) {
+      this.log.error('failed to get tokens', { error });
+      return next(error);
+    }
+  }
+
+}
+
+module.exports = {
+  name: 'adminOtp',
+  slug: 'admin-opt',
+  create: async (dtp) => { return new OtpAdminController(dtp); },
+};

app/controllers/admin/settings.js

@@ -16,6 +16,13 @@ class SettingsController extends SiteController {
 
   async start ( ) {
     const router = express.Router();
+
+    const imageUpload = this.createMulter('uploads', {
+      limits: {
+        fileSize: 1024 * 1000 * 12,
+      },
+    });
+
     router.use(async (req, res, next) => {
       res.locals.currentView = 'admin';
       res.locals.adminView = 'settings';
@@ -24,8 +31,12 @@ class SettingsController extends SiteController {
 
     router.post('/', this.postUpdateSettings.bind(this));
     
+    router.post('/images/updateSiteIcon', imageUpload.single('imageFile'), this.postUpdateSiteIcon.bind(this));
+
     router.get('/', this.getSettingsView.bind(this));
 
+    router.get('/images', this.getImageSettings.bind(this));
+    
     return router;
   }
 
@@ -47,6 +58,43 @@ class SettingsController extends SiteController {
       return next(error);
     }
   }
+
+  async getImageSettings (req, res, next) {
+    const { image: imageService } = this.dtp.services;
+    res.locals.adminView = 'image-settings';
+    res.locals.pageTitle = `Image settings for ${this.dtp.config.site.name}`;
+    try {
+      res.locals.siteIcon = await imageService.getSiteIconInfo();
+      res.render('admin/settings/images');
+    } catch (error) {
+      return next(error);
+    }
+  }
+
+  async postUpdateSiteIcon (req, res) {
+    const { image: imageService } = this.dtp.services;
+    try {
+      const displayList = this.createDisplayList('site-icon');
+      await imageService.updateSiteIcon(req.body, req.file);
+      displayList.showNotification(
+        'Site Icon updated successfully.',
+        'success',
+        'bottom-center',
+        2000,
+      );
+      res.status(200).json({
+        success: true,
+        displayList,
+      });
+    } catch (error) {
+      this.log.error('failed to update site icon', { error });
+      return res.status(error.statusCode || 500).json({
+        success: false,
+        message: error.message,
+      });
+    }
+  }
+
 }
 
 module.exports = {

app/services/image.js

@@ -37,7 +37,7 @@ class ImageService extends SiteService {
     try {
       this.log.debug('processing uploaded image', { imageDefinition, file });
 
-      const sharpImage = await sharp(file.path);
+      const sharpImage = sharp(file.path);
       const metadata = await sharpImage.metadata();
 
       // create an Image model instance, but leave it here in application memory.
@@ -216,6 +216,72 @@ class ImageService extends SiteService {
     await SiteAsync.each(outputs, processOutputImage, 4);
   }
 
+  async getSiteIconInfo() {
+    const siteDomain = this.dtp.config.site.domainKey;
+
+    const siteImagesDir = path.join(this.dtp.config.root, 'client', 'img');
+    const siteIconDir = path.join(siteImagesDir, 'icon', siteDomain);
+
+    let icon;
+
+    try {
+
+      await fs.promises.access(siteIconDir);
+      const iconMetadata = await sharp(path.join(siteIconDir, 'icon-512x512.png')).metadata();
+      icon = {
+        metadata: iconMetadata,
+        path: `/img/icon/${siteDomain}/icon-512x512.png`,
+      };
+
+    } catch (error) {
+
+      icon = null;
+    } 
+      
+      return icon;
+  }
+  
+  async updateSiteIcon(imageDefinition, file) {
+    
+    this.log.debug('updating site icon', { imageDefinition, file });
+    try {
+      
+      
+      const siteDomain = this.dtp.config.site.domainKey;
+      
+      const siteImagesDir = path.join(this.dtp.config.root, 'client', 'img');
+      
+      const siteIconDir = path.join(siteImagesDir, 'icon', siteDomain);
+      
+      const sourceIconFilePath = file.path;
+      
+      const sizes = [16, 32, 36, 48, 57, 60, 70, 72, 76, 96, 114, 120, 144, 150, 152, 180, 192, 256, 310, 384, 512];
+      
+      await fs.promises.mkdir(siteIconDir, { force: true, recursive: true });
+      
+      for (var size of sizes) {
+        await sharp(sourceIconFilePath).resize({
+          fit: sharp.fit.contain,
+          width: size,
+          height: size,
+        }).png()
+        .toFile(path.join(siteIconDir, `icon-${size}x${size}.png`));
+      }
+      
+      await fs.promises.cp(sourceIconFilePath, path.join(siteIconDir, `${siteDomain}.png`));
+      
+      await fs.promises.cp(sourceIconFilePath, path.join(siteImagesDir, 'social-cards', `${siteDomain}.png`));
+      return path.join(siteIconDir, 'icon-512x512.png');
+    } catch (error) {
+      this.log.error('failed to update site icon', { error });
+      throw error;
+    } finally {
+      this.log.info('removing uploaded image from local file system', { file: file.path });
+      await fs.promises.rm(file.path);
+    }
+    
+  }
+
   makeImageMetadata(metadata) {
     return {
       format: metadata.format,

app/services/otp-auth.js

@@ -217,8 +217,20 @@ class OtpAuthService extends SiteService {
     return true;
   }
 
-  async removeForUser (user) {
-    return await OtpAccount.deleteMany({ user: user });
+  async destroyOtpSession (req, serviceName) {
+    delete req.session.otp[serviceName];
+    await this.saveSession(req);
+  }
+
+  async removeForUser (user, serviceName) {
+    return await OtpAccount.findOneAndDelete({ user: user, service: serviceName });
+  }
+
+  async getBackupTokens (user, serviceName) {
+    const tokens = await OtpAccount.findOne({ user: user._id, service: serviceName })
+    .select('+backupTokens')
+    .lean();
+    return tokens.backupTokens;
   }
 }
 

app/views/admin/components/file-upload-image.pug

@@ -0,0 +1,51 @@
+mixin renderFileUploadImage (actionUrl, containerId, imageId, imageClass, defaultImage, currentImage, cropperOptions)
+  div(id= containerId).dtp-file-upload
+    form(method="POST", action= actionUrl, enctype="multipart/form-data", onsubmit= "return dtp.app.submitImageForm(event);").uk-form
+      .uk-margin
+        .uk-card.uk-card-default.uk-card-small
+          .uk-card-body
+            div(uk-grid).uk-flex-middle.uk-flex-center
+              div(class="uk-width-1-1 uk-width-auto@m")
+                .upload-image-container.size-512
+                  if !!currentImage
+                    img(id= imageId, src= currentImage.path, class= imageClass).sb-large
+                  else
+                    img(id= imageId, src= defaultImage, class= imageClass)
+
+              div(class="uk-width-1-1 uk-width-auto@m")
+                .uk-text-small.uk-margin
+                  #file-select
+                      .uk-margin(class="uk-text-center uk-text-left@m")
+                        span.uk-text-middle Select an image
+                        div(uk-form-custom).uk-margin-small-left
+                          input(
+                            type="file",
+                            formenctype="multipart/form-data",
+                            accept=".jpg,.png,image/jpeg,image/png",
+                            data-file-select-container= containerId,
+                            data-file-select="test-image-upload",
+                            data-file-size-element= "file-size",
+                            data-file-max-size= 15 * 1024000,
+                            data-image-id= imageId,
+                            data-cropper-options= cropperOptions,
+                            onchange="return dtp.app.selectImageFile(event);",
+                          )
+                          button(type="button", tabindex="-1").uk-button.uk-button-default Select
+
+                  #file-info(class="uk-text-center uk-text-left@m", hidden)
+                    #file-name.uk-text-bold
+                    if currentImage
+                      div resolution: #[span#image-resolution-w= numeral(currentImage.metadata.width).format('0,0')]x#[span#image-resolution-h= numeral(currentImage.metadata.height).format('0,0')]
+                      div size: #[span#file-size= numeral(currentImage.metadata.size).format('0,0.00b')]
+                      div last modified: #[span#file-modified= moment(currentImage.created).format('MMM DD, YYYY')]
+                    else
+                      div resolution: #[span#image-resolution-w 512]x#[span#image-resolution-h 512]
+                      div size: #[span#file-size N/A]
+                      div last modified: #[span#file-modified N/A]
+
+          .uk-card-footer
+            div(class="uk-flex-center", uk-grid)
+              #file-save-btn(hidden).uk-width-auto
+                button(
+                  type="submit",
+                ).uk-button.uk-button-primary Save

app/views/admin/components/menu.pug

@@ -13,6 +13,18 @@ ul(uk-nav).uk-nav-default
         i.fas.fa-cog
       span.uk-margin-small-left Settings
   
+  li(class={ 'uk-active': (adminView === 'image-settings') })
+    a(href="/admin/settings/images")
+      span.nav-item-icon
+        i.fas.fa-image
+      span.uk-margin-small-left Image Settings
+      
+  li(class={ 'uk-active': (adminView === 'otp') })
+    a(href="/admin/otp")
+      span.nav-item-icon
+        i.fas.fa-cog
+      span.uk-margin-small-left Otp Settings
+
   li.uk-nav-divider 
 
   li(class={ 'uk-active': (adminView === 'announcement') })

app/views/admin/otp/index.pug

@@ -0,0 +1,28 @@
+extends ../layouts/main
+block content
+
+
+  div(uk-grid).uk-flex-middle
+    .uk-width-expand
+      h1.margin-remove Tokens
+        section.uk-section.uk-section-default.uk-section-xsmall
+          .uk-container 
+            .uk-text-small
+              h4 This is where you will regenerate OTP tokens for your admin account and destroy your old OTP account.
+        //- .uk-width-auto
+          button(
+              type="button",
+              data-user= user._id,
+              onclick="return dtp.adminApp.generateOTPTokens(event);",
+            ).uk-button.dtp-button-danger
+              +renderButtonIcon('fa-repeat', 'Generate OTP Tokens')
+      //- regenerate route should set this so tokens can be viewed once.
+      if otpRegen 
+        section.uk-section.uk-section-default.uk-section-xsmall
+          .uk-container 
+            h3 You should save these tokens in a safe place. This is the only time you will see them.
+            p These tokens should be saved in a safe place so you can get into your account should you lose your 2FA device
+            each token of tokens
+              ul.uk-list.uk-list-divider
+                li
+                  .uk-text-small= token.token

app/views/admin/settings/images.pug

@@ -0,0 +1,28 @@
+extends ../layouts/main
+block vendorcss
+  link(rel='stylesheet', href=`/cropperjs/cropper.min.css?v=${pkg.version}`)
+block vendorjs
+  script(src=`/cropperjs/cropper.min.js?v=${pkg.version}`)
+block content
+
+  include ../components/file-upload-image
+
+  //- h2 Add or replace your site images here
+  div(uk-grid).uk-flex-middle
+    .uk-width-expand
+      fieldset
+        legend Site Icon
+        .uk-margin
+          if siteIcon 
+            p.uk-card-title Replace your site icon below. 
+          else
+            p.uk-card-title You do not currently have a site icon. Add one below.
+        +renderFileUploadImage(
+          `/admin/settings/images/updateSiteIcon`,
+          'site-icon-upload',
+          'site-icon-file',
+          'site-icon-picture',
+          `/img/icon/dtp-base.png`,
+          siteIcon,
+          { aspectRatio: 1 },
+        )

app/views/otp/new-account.pug

@@ -7,5 +7,16 @@ block content
 
   section.uk-section.uk-section-default.uk-section-xsmall
     .uk-container 
-      p Your account is now enabled with access to #{site.name} #{otpServiceName}.
+      h3 You should save these tokens in a safe place. This is the only time you will see them.
+      p These tokens should be saved in a safe place so you can get into your account should you lose your 2FA device
+        each token of otpAccount.backupTokens
+          ul.uk-list.uk-list-divider
+            li
+              .uk-text-small= token.token
+      
+
+  section.uk-section.uk-section-default.uk-section-xsmall
+    .uk-container
+      p Your account is now enabled with access to #{site.name} #{otpAccount.service}.
       a(href= otpRedirectURL, title="Continue").uk-button.uk-button-primary.uk-border-pill Continue
+

app/views/otp/welcome.pug

@@ -41,7 +41,7 @@ block content
                 .uk-margin
                   button(type="submit").uk-button.dtp-button-primary.uk-border-pill Enable 2FA
 
-              div(class="uk-width-1-1 uk-text-center uk-text-left@m", hidden)
+              div(class="uk-width-1-1 uk-text-center uk-text-left@m")
                 .uk-margin
                   p Or, if your authenticator doesn't support scanning QR codes, you can enter the OTP configuration information shown here to begin displaying codes:
                   pre(

app/views/welcome/core-home.pug

@@ -4,10 +4,10 @@ block content
   section.uk-section.uk-section-default
     .uk-container
       
+      if Array.isArray(hosts) && (hosts.length > 0)  
         .uk-card.uk-card-default
           .uk-card-header
             h1.uk-card-title Select Community
-
           .uk-card-body
             div(uk-grid).uk-grid-small
               each core in connectedCores
@@ -26,3 +26,11 @@ block content
           div(uk-grid).uk-grid-small
             .uk-width-expand
               +renderBackButton()
+      else
+        .uk-card.uk-card-default
+          .uk-card-header
+            h1.uk-card-title There are no communities connected to this site
+            .uk-card-footer
+              div(uk-grid).uk-grid-small
+                .uk-width-expand
+                  +renderBackButton()

client/js/site-admin-app.js

@@ -415,6 +415,43 @@ export default class DtpSiteAdminHostStatsApp extends DtpApp {
 
     return false;
   }
+
+  async submitImageForm (event) {
+    event.preventDefault();
+    event.stopPropagation();
+
+    const formElement = event.currentTarget || event.target;
+    const form = new FormData(formElement);
+
+    this.cropper.getCroppedCanvas().toBlob(async (imageData) => {
+      try {
+        form.append('imageFile', imageData, 'icon.png');
+  
+        this.log.info('submitImageForm', 'updating site image', { event, action: formElement.action });
+        const response = await fetch(formElement.action, {
+          method: formElement.method,
+          body: form,
+        });
+  
+        if (!response.ok) {
+          let json;
+          try {
+            json = await response.json();
+          } catch (error) {
+            throw new Error('Server error');
+          }
+          throw new Error(json.message || 'Server error');
+        }
+  
+        await this.processResponse(response);
+        window.location.reload();
+      } catch (error) {
+        UIkit.modal.alert(`Failed to update site image: ${error.message}`);
+      }
+    });
+
+    return;
+  }
 }
 
 dtp.DtpSiteAdminHostStatsApp = DtpSiteAdminHostStatsApp;

lib/site-platform.js

@@ -34,12 +34,22 @@ module.connectDatabase = async (/*dtp*/) => {
       host: process.env.MONGODB_HOST,
       database: process.env.MONGODB_DATABASE,
     });
-    const mongoConnectUri = `mongodb://${process.env.MONGODB_HOST}/${process.env.MONGODB_DATABASE}`;
+    const mongoConnectionInfo = {
+      host: process.env.MONGODB_HOST,
+      db: process.env.MONGODB_DATABASE,
+      username: encodeURIComponent(process.env.MONGODB_USERNAME),
+      password: encodeURIComponent(process.env.MONGODB_PASSWORD),
+      options: process.env.MONGODB_OPTIONS || '',
+    };
+    let mongoConnectUri = `mongodb://${process.env.MONGODB_HOST}/${process.env.MONGODB_DATABASE}`;
+    if (process.env.NODE_ENV === 'production'){
+      mongoConnectUri = `mongodb://${mongoConnectionInfo.username}:${mongoConnectionInfo.password}@${mongoConnectionInfo.host}/${mongoConnectionInfo.options}`;
+    }
     module.db = await mongoose.connect(mongoConnectUri, {
       socketTimeoutMS: 0,
       keepAlive: true,
       keepAliveInitialDelay: 300000,
-      dbName: process.env.MONGODB_DATABASE,
+      dbName: mongoConnectionInfo.db,
     });
     module.log.info('connected to MongoDB');
   } catch (error) {