v0.6 release

.storybook/theme-decorator.tsx

@@ -1,8 +1,6 @@
-import { RenderFunction } from '@storybook/react'
-import * as React from 'react'
-import { ThemeProvider } from 'styled-components'
-import theme from '../src/themes/styled.theme'
+import { RenderFunction } from '@storybook/react';
+import * as React from 'react';
+import { ThemeProvider } from 'styled-components';
+import theme from 'src/themes/styled.theme';
 
-export default (storyFn: RenderFunction) => (
-  <ThemeProvider theme={theme}>{storyFn()}</ThemeProvider>
-)
+export default (storyFn: RenderFunction) => <ThemeProvider theme={theme}>{storyFn()}</ThemeProvider>;

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '8'
+  - '10'
 dist: trusty
 sudo: false
 cache: yarn

functions/package.json

@@ -39,7 +39,7 @@
     "typescript": "^3.2.2"
   },
   "engines": {
-    "node": "8"
+    "node": "10"
   },
   "private": true
 }

functions/src/DaveHakkensNL/index.ts

@@ -1,8 +1,39 @@
 import { migrateAvatar } from './avatarMigrate'
-import { updateDHUserIds, getDHUserProfile } from './dataMigrate'
+import { getDHUserProfile } from './dataMigrate'
+import { DHLogin } from './login'
 
-export default {
-  updateDHUserIds,
-  migrateAvatar,
-  getDHUserProfile,
-}
+import * as functions from 'firebase-functions'
+
+const DHSite_getUser = functions.https.onCall(async (mention_name: string) => {
+  console.log('getting DH user profile', mention_name)
+  try {
+    const profile = await getDHUserProfile(mention_name)
+    return profile
+  } catch (error) {
+    throw new functions.https.HttpsError('not-found', error.message)
+  }
+})
+
+const DHSite_migrateAvatar = functions.https.onCall(
+  async ({ avatarUrl, user }) => {
+    console.log('migrating user avatar', user, avatarUrl)
+    try {
+      const meta = await migrateAvatar(avatarUrl, user)
+      return meta
+    } catch (error) {
+      throw new functions.https.HttpsError('not-found', error.message)
+    }
+  },
+)
+
+const DHSite_login = functions.https.onCall(async ({ email, password }) => {
+  try {
+    const token = await DHLogin(email, password)
+    return token
+  } catch (error) {
+    console.log(error.message)
+    throw new functions.https.HttpsError('permission-denied', error.message)
+  }
+})
+
+export const DH_Exports = { DHSite_getUser, DHSite_migrateAvatar, DHSite_login }

functions/src/DaveHakkensNL/login.ts

@@ -0,0 +1,106 @@
+const endpoint = 'https://davehakkens.nl/wp-json/aam/v1/authenticate'
+import axios from 'axios'
+import { firebaseAdmin } from '../Firebase/admin'
+// tslint:disable no-implicit-dependencies
+import { IUser } from '@OAModels/user.models'
+
+export const DHLogin = async (username: string, password: string) => {
+  const dhJWT = await DHGetJWTToken(username, password)
+  const userId = dhJWT.user.data.user_login
+  const claims = mergeDhData(dhJWT)
+  return firebaseAdmin.auth().createCustomToken(userId, claims)
+}
+
+// Use AAM plugin on DH site to generate JWT token from DH site
+// User credentials are validated and a JWT token passed back on successful user login
+const DHGetJWTToken = async (username: string, password: string) => {
+  const body = { username, password }
+  const headers = {
+    'Content-Type': 'application/json',
+    Accept: 'application/json',
+  }
+  const res = await axios.post(endpoint, body, { headers: headers })
+  const token: IDHTokenResponse = res.data
+  return token
+}
+
+// when logging in via dh site a JWT token is returned with a variety of user profile information
+// want to extract data from token and format in way consistent with other users (OpenIDConnect)
+// and fields that will be used in the platform
+const mergeDhData = (dhJWT: IDHTokenResponse) => {
+  const oidcClaims = {
+    email: dhJWT.user.data.user_email,
+    name: dhJWT.user.data.display_name,
+  }
+  const additionalUserClaims: Partial<IUser> = {
+    DHSite_id: dhJWT.user.ID,
+    DHSite_mention_name: dhJWT.user.data.user_login,
+  }
+  return { ...oidcClaims, ...additionalUserClaims }
+}
+
+/********************************************************************************************************
+ *  Interfaces and Mocks
+ *********************************************************************************************************/
+interface IDHTokenResponse {
+  token: string
+  token_expires: string
+  user: {
+    data: {
+      ID: string
+      user_login: string
+      user_pass: string
+      user_nicename: string
+      user_email: string
+      user_url: string
+      user_registered: string
+      user_activation_key: string
+      user_status: string
+      display_name: string
+    }
+    ID: number
+    caps: {
+      subscriber: boolean
+    }
+    cap_key: string
+    roles: string[]
+    allcaps: {
+      read: boolean
+      level_0: boolean
+      subscriber: boolean
+    }
+    filter: null
+  }
+}
+
+const LOGIN_MOCK: IDHTokenResponse = {
+  token:
+    'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NjgxMjcxNzQsImlzcyI6Imh0dHA6XC9cL3Rlc3R3cC5vbmVhcm15LndvcmxkIiwiZXhwIjoiMDlcLzExXC8yMDE5LCAxNDo1MiArMDAwMCIsImp0aSI6ImM2OGE1YWViLWJjZjQtNDNmOS1iYjJiLTFmODVmNDc2YTEyNSIsInVzZXJJZCI6MiwicmV2b2NhYmxlIjp0cnVlLCJyZWZyZXNoYWJsZSI6ZmFsc2V9.4yxRenweWSJ69gNg_2RhqxpMozBN29FGODcx82L5a7A',
+  token_expires: '09/11/2019, 14:52 +0000',
+  user: {
+    data: {
+      ID: '2',
+      user_login: 'testwp',
+      user_pass: '$P$Bw2/hfTcHvHXLKawFMST3OSE5CxmIN0',
+      user_nicename: 'testwp',
+      user_email: 'testwp@test.com',
+      user_url: '',
+      user_registered: '2019-09-10 11:55:34',
+      user_activation_key: '',
+      user_status: '0',
+      display_name: 'testwp',
+    },
+    ID: 2,
+    caps: {
+      subscriber: true,
+    },
+    cap_key: 'wp_capabilities',
+    roles: ['subscriber'],
+    allcaps: {
+      read: true,
+      level_0: true,
+      subscriber: true,
+    },
+    filter: null,
+  },
+}

functions/src/Firebase/firebaseSync.ts

@@ -2,7 +2,7 @@
 // import { IDBEndpoint } from '@OAModels/common.models'
 import * as rtdb from './realtimeDB'
 import * as firestore from './firestoreDB'
-import { IDBEndpoint, IDbDoc } from '../models'
+import { IDBEndpoint, DBDoc } from '../models'
 
 /*  Functions in this folder are used to sync data between firestore and firebase realtime databases
     The reason for this is to allow large collections to be 'cached' for cheap retrieval
@@ -14,7 +14,6 @@ import { IDBEndpoint, IDbDoc } from '../models'
 */
 
 const endpoints: IDBEndpoint[] = [
-  'v2_discussions',
   'v2_events',
   'v2_howtos',
   'v2_mappins',
@@ -37,7 +36,7 @@ export const sync = async (endpoint: IDBEndpoint) => {
   const existing = await rtdb.get(endpoint)
   const latest =
     existing && Object.keys(existing).length > 1
-      ? Object.values<IDbDoc>(existing).sort((a, b) => _sortByModified(a, b))[0]
+      ? Object.values<DBDoc>(existing).sort((a, b) => _sortByModified(a, b))[0]
           ._modified
       : ''
 
@@ -52,7 +51,7 @@ export const sync = async (endpoint: IDBEndpoint) => {
   return json
 }
 
-function _sortByModified(a: IDbDoc, b: IDbDoc) {
+function _sortByModified(a: DBDoc, b: DBDoc) {
   return a._modified > b._modified ? -1 : 1
 }
 

functions/src/Firebase/firestoreDB.ts

@@ -1,5 +1,5 @@
 import { firebaseAdmin } from './admin'
-import { IDbDoc, IDBEndpoint } from '../models'
+import { DBDoc, IDBEndpoint } from '../models'
 
 export const db = firebaseAdmin.firestore()
 
@@ -25,5 +25,5 @@ export const getCollection = (endpoint: IDBEndpoint) =>
     .collection(endpoint)
     .get()
     .then(snapshot => {
-      return snapshot.empty ? [] : snapshot.docs.map(d => d.data() as IDbDoc)
+      return snapshot.empty ? [] : snapshot.docs.map(d => d.data() as DBDoc)
     })

functions/src/exports/api.ts

@@ -8,8 +8,7 @@ import * as functions from 'firebase-functions'
 import * as bodyParser from 'body-parser'
 import * as cors from 'cors'
 import * as express from 'express'
-import * as sync from '../Firebase/firebaseSync'
-import { upgradeDBAll } from '../upgrade/dbV1Upgrade'
+import { DHLogin } from '../DaveHakkensNL/login'
 
 console.log('api ready')
 const app = express()
@@ -47,10 +46,12 @@ app.all('*', async (req, res, next) => {
     //   const upgradeStatus = await upgradeDBAll()
     //   res.send(upgradeStatus)
     //   break
-    case 'sync':
-      console.log('sync test')
+    case 'DHSite_login':
+      console.log('dh login test', JSON.stringify(req.body))
       try {
-        const d = await sync.syncAll()
+        const { username, password } = req.body
+        console.log('testing login', username, password)
+        const d = await DHLogin(username, password)
         res.send(d)
       } catch (error) {
         console.log(error)

functions/src/exports/tasks.ts

@@ -4,9 +4,9 @@ Add/change schedule from `./functions-cron/appengine/cron.yaml`
 ************************************************************************************/
 
 import * as functions from 'firebase-functions'
-import DHSite from '../DaveHakkensNL'
 import { BackupDatabase } from '../Firebase/databaseBackup'
 import * as FirebaseSync from '../Firebase/firebaseSync'
+import { updateDHUserIds } from '../DaveHakkensNL/dataMigrate'
 
 export const weeklyTasks = functions.pubsub
   .topic('weekly-tick')
@@ -20,6 +20,6 @@ export const dailyTasks = functions.pubsub
   .topic('daily-tick')
   .onPublish(async (message, context) => {
     console.log('daily tick', message, context)
-    DHSite.updateDHUserIds()
+    updateDHUserIds()
     FirebaseSync.syncAll()
   })

functions/src/index.ts

@@ -1,11 +1,12 @@
 import { api } from './exports/api'
 import { weeklyTasks, dailyTasks } from './exports/tasks'
-import { DHSite_getUser, DHSite_migrateAvatar } from './exports/dhsite'
+import { DH_Exports } from './DaveHakkensNL'
 
 // the following endpoints are exposed for use by various triggers
 // see individual files for more informaiton
 exports.api = api
 exports.weeklyTasks = weeklyTasks
 exports.dailyTasks = dailyTasks
-exports.DHSite_getUser = DHSite_getUser
-exports.DHSite_migrateAvatar = DHSite_migrateAvatar
+exports.DHSite_getUser = DH_Exports.DHSite_getUser
+exports.DHSite_migrateAvatar = DH_Exports.DHSite_migrateAvatar
+exports.DHSite_login = DH_Exports.DHSite_login

functions/src/models.ts

@@ -2,6 +2,6 @@
 // Models can be imported from the main package for use here
 // NOTE 1 - this requires adjustment main src in package.json
 // NOTE 2 - shorthand @OAModels notation defined in tsconfig
-import { IDBEndpoint, IDbDoc } from '@OAModels/common.models'
+import { IDBEndpoint, DBDoc } from '@OAModels/common.models'
 
-export { IDBEndpoint, IDbDoc }
+export { IDBEndpoint, DBDoc }

functions/src/upgrade/dbV1Upgrade.ts

@@ -6,7 +6,6 @@ import { db } from '../Firebase/firestoreDB'
 */
 
 const mappings: DBMapping = {
-  discussions: 'v2_discussions',
   eventsV1: 'v2_events',
   howtosV1: 'v2_howtos',
   tagsV1: 'v2_tags',
@@ -79,16 +78,6 @@ function _upgradeDate(date: any) {
 
 type DBMapping = { [key in IDBEndpointV1]: IDBEndpointV2 }
 
-type IDBEndpointV1 =
-  | 'howtosV1'
-  | 'users'
-  | 'discussions'
-  | 'tagsV1'
-  | 'eventsV1'
+type IDBEndpointV1 = 'howtosV1' | 'users' | 'tagsV1' | 'eventsV1'
 
-type IDBEndpointV2 =
-  | 'v2_howtos'
-  | 'v2_users'
-  | 'v2_discussions'
-  | 'v2_tags'
-  | 'v2_events'
+type IDBEndpointV2 = 'v2_howtos' | 'v2_users' | 'v2_tags' | 'v2_events'