Move parse to js-helpers

client/.npmignore

@@ -1,6 +1,9 @@
 dist
 build
 node_modules
+html
+tools/docker
+tools/webpack
 .env
 .env.prod
 .env.sample

client/package-lock.json

@@ -1,13 +1,13 @@
 {
 	"name": "@advancedalgos/teams-client",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
 		"@advancedalgos/web-components": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.8.tgz",
-			"integrity": "sha512-NXzJNtweuBdxLptf5NbuBfUC4HGddb6Z8LVYNHbPXw20X2EoM6s25cY1eBUCIqgwob/ceCz56yofHW1T35B8lQ==",
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.10.tgz",
+			"integrity": "sha512-aYmA8HGkh+c2L1LuONfVQA2dHNHtKPctB0IdAOhElJBW4zaETrzQJkq0DHcZzDBGgbnafaX5ydq27Pm617K8Iw==",
 			"requires": {
 				"@azure/storage-blob": "^10.1.0-preview",
 				"@material-ui/core": "^3.0.3",

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@advancedalgos/teams-client",
-  "version": "0.0.12",
+  "version": "0.0.16",
   "description": "Advanced Algos Team client-side web app",
   "main": "src/index.js",
   "scripts": {
@@ -68,7 +68,7 @@
     "workbox-cli": "^3.6.2"
   },
   "dependencies": {
-    "@advancedalgos/web-components": "0.0.8",
+    "@advancedalgos/web-components": "0.0.10",
     "@azure/storage-blob": "^10.0.0-preview",
     "@material-ui/core": "^3.2.0",
     "@material-ui/icons": "^3.0.1",

client/src/auth/Auth0.js

@@ -1,7 +0,0 @@
-export const AUTH_CONFIG = {
-  api_audience: process.env.AUTH0_AUDIENCE,
-  domain: process.env.AUTH0_DOMAIN,
-  clientId: process.env.AUTH0_CLIENTID,
-  callbackUrl: process.env.AUTH0_CALLBACK_URL,
-  logoutUrl: process.env.AUTH0_LOGOUT_URL
-}

client/src/auth/index.js

@@ -1,268 +0,0 @@
-import Auth0Lock from 'auth0-lock'
-import gql from 'graphql-tag'
-
-import { getItem, setItem, removeItem } from '../utils/local-storage'
-import { validObject, deleteCookie } from '../utils/js-helpers'
-
-import { client } from '../App'
-
-import { AUTH_CONFIG } from './Auth0' // create by renaming Auth0.sample.js to Auth0.js and setting vars
-
-const AUTHENTICATE = gql`
-  mutation authenticate($idToken: String!) {
-    authenticate(idToken: $idToken) {
-      alias
-      authId
-    }
-  }
-`
-
-const VERIFY_TEAM_INVITE = gql`
-  mutation verifyTeamInvite($token: String!) {
-    verifyTeamInvite(token: $token) {
-      email
-      team {
-        slug
-      }
-    }
-  }
-`
-
-export const defaultOptions = {
-  oidcConformant: true,
-  autoclose: true,
-  auth: {
-    sso: true,
-    redirectUrl: window.location.origin + '/callback',
-    responseType: 'token id_token',
-    audience: `${AUTH_CONFIG.api_audience}`,
-    params: {
-      scope: `openid profile email user_metadata app_metadata picture`
-    }
-  }
-}
-
-export const inviteOptions = {
-  oidcConformant: true,
-  autoclose: false,
-  allowedConnections: ['Username-Password-Authentication'],
-  allowShowPassword: true,
-  auth: {
-    sso: false,
-    redirectUrl: window.location.origin + '/callback',
-    responseType: 'token id_token',
-    audience: `${AUTH_CONFIG.api_audience}`,
-    params: {
-      state: '',
-      scope: `email`
-    }
-  },
-  prefill: { email: '' }
-}
-
-let lock = new Auth0Lock(AUTH_CONFIG.clientId, AUTH_CONFIG.domain, defaultOptions)
-
-class Auth {
-  constructor (cb, apolloClient) {
-    this.handleAuthentication()
-    // binds  functions to keep this context
-    this.apolloClient = apolloClient
-    this.cb = cb.bind(this)
-    this.login = this.login.bind(this)
-    this.loginInvite = this.loginInvite.bind(this)
-    this.logout = this.logout.bind(this)
-    this.isAuthenticated = this.isAuthenticated.bind(this)
-    this.checkSession = this.checkSession.bind(this)
-  }
-
-  login () {
-    // Call the show method to display the widget.
-    lock.show()
-  }
-
-  async loginInvite (jwt) {
-    let email
-    let team
-    try {
-      const data = await client.mutate({
-        mutation: VERIFY_TEAM_INVITE,
-        variables: { token: jwt }
-      })
-
-      console.log('loginInvite auth: ', await data.data.verifyTeamInvite)
-      setItem('invite', JSON.stringify(data.data.verifyTeamInvite))
-
-      email = data.data.verifyTeamInvite.email
-      team = data.data.verifyTeamInvite.team.slug
-    } catch (err) {
-      return console.log('loginInvite err: ', err)
-    }
-    inviteOptions.prefill.email = email
-    inviteOptions.auth.params.state = `${email}|${team}`
-    let lockInvite = new Auth0Lock(AUTH_CONFIG.clientId, AUTH_CONFIG.domain, inviteOptions)
-    lockInvite.show()
-  }
-
-  handleAuthentication () {
-    // Add a callback for Lock's `authenticated` event
-    lock.on('authenticated', this.setSession.bind(this))
-    // Add a callback for Lock's `authorization_error` event
-    lock.on('authorization_error', err => {
-      console.log(err)
-      const data = { status: `error`, errMessage: err.error }
-      this.cb(data)
-    })
-  }
-
-  checkSession () {
-    return new Promise((resolve, reject) => {
-      // Add a callback for Lock's `authenticated` event
-      lock.checkSession(
-        {
-          responseType: 'token id_token',
-          audience: AUTH_CONFIG.api_audience,
-          scope:
-            'openid email profile read:teams write:teams read:member write:member',
-          connection: 'github',
-          prompt: 'none'
-        },
-        function (err, authResult) {
-          if (!err) {
-            resolve(authResult)
-          } else {
-            reject(err)
-          }
-        }
-      )
-    })
-  }
-
-  setSession (authResult) {
-    console.log('setSession')
-    if (authResult && authResult.accessToken && authResult.idToken) {
-      // Set the time that the access token will expire at
-      let expiresAt = JSON.stringify(
-        authResult.expiresIn * 1000 + new Date().getTime()
-      )
-      setItem('access_token', authResult.accessToken)
-      setItem('id_token', authResult.idToken)
-      setItem('expires_at', expiresAt)
-      const data = {
-        status: `success`,
-        accessToken: authResult.accessToken,
-        idToken: authResult.idToken,
-        expiresAt
-      }
-      console.log('setSession idTokenPayload: ', authResult.idTokenPayload)
-
-      this.signinOrCreateAccount({ ...data })
-      this.cb(data)
-      console.log(authResult.idTokenPayload)
-      const user = {
-        authId: authResult.idTokenPayload.sub,
-        alias: authResult.idTokenPayload.nickname
-      }
-      setItem('user', JSON.stringify(user))
-      if (window.location.href.includes(`callback`)) {
-        // window.location.href = '/dashboard'
-      }
-      return true
-    }
-  }
-
-  async signinOrCreateAccount ({ accessToken, idToken, expiresAt }) {
-    console.log(
-      'signinOrCreateAccount: ',
-      client,
-      this.apolloClient,
-      accessToken,
-      idToken,
-      expiresAt
-    )
-    try {
-      const data = await client.mutate({
-        mutation: AUTHENTICATE,
-        variables: { idToken }
-      })
-
-      console.log('signinOrCreateAccount auth: ', await data)
-      const user = {
-        authId: data.data.authenticate.authId,
-        alias: data.data.authenticate.alias
-      }
-      setItem('user', JSON.stringify(user))
-      if (window.location.href.includes(`callback`)) {
-        window.location.href = '/dashboard'
-      }
-      return data
-    } catch (err) {
-      return console.log('Sign in or create account error: ', err)
-    }
-  }
-
-  logout () {
-    // Clear access token and ID token from local storage
-    removeItem('access_token')
-    removeItem('id_token')
-    removeItem('expires_at')
-    removeItem('user')
-    removeItem('auth0.ssodata')
-    window.localStorage.clear()
-    deleteCookie('ajs_anonymous_id')
-    deleteCookie('ajs_user_id')
-    deleteCookie('current_tenant')
-
-    lock.logout({ returnTo: AUTH_CONFIG.logoutUrl })
-    console.log('logout')
-  }
-
-  async isAuthenticated () {
-    // check session and run Auth0 SS0
-    const getUser = await getItem('user')
-    const getExpires = await getItem('expires_at')
-    let user = JSON.parse(getUser)
-
-    if (new Date().getTime() < getExpires * 1000) {
-      console.log(
-        'handleAuth.user exp: ',
-        user,
-        getExpires,
-        window.location.href
-      )
-
-      return user
-    }
-
-    const checkSSO = await this.checkSession()
-      .then(result => {
-        console.log('handleAuth.checksessions: ', result)
-        const user = {
-          authId: result.idTokenPayload.sub,
-          alias: result.idTokenPayload.nickname
-        }
-        setItem('user', JSON.stringify(user))
-        // user confirmed, log into client
-        this.setSession(result)
-        return result.idTokenPayload
-      })
-      .catch(err => {
-        console.log('handleAuth.checksessions err: ', err)
-        if (err.error === 'login_required') {
-          // return this.login()
-        }
-        return err
-      })
-
-    if (/manage|profile|create|dashboard/.test(window.location.href) && !user) {
-      this.login()
-    }
-
-    if (validObject(checkSSO, 'error')) {
-      return false
-    } else {
-      return checkSSO
-    }
-  }
-}
-
-export default Auth

client/src/utils/js-helpers.js

@@ -68,3 +68,13 @@ export function slugify (string) {
     .replace(/^-+/, '') // Trim - from start of text
     .replace(/-+$/, '') // Trim - from end of text
 }
+
+export function parse (queryString) {
+  var query = {}
+  var pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&')
+  for (var i = 0; i < pairs.length; i++) {
+    var pair = pairs[i].split('=')
+    query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '')
+  }
+  return query
+}

client/src/views/teams/AcceptTeamInvite.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
-import { parse } from 'query-string'
+import { parse } from '../../utils/js-helpers'
 
 import { MessageCard } from '@advancedalgos/web-components'