MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Budibase/budibase into peek-screen

This commit is contained in:
Andrew Kingston 2021-08-02 09:27:28 +01:00
parent c7566a7b90 0cb528489c
commit c50460b88f
25 changed files with 74 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/auth/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/auth", "name": "@budibase/auth",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"description": "Authentication middlewares for budibase builder and apps", "description": "Authentication middlewares for budibase builder and apps",
"main": "src/index.js", "main": "src/index.js",
"author": "Budibase", "author": "Budibase",

23
packages/auth/src/middleware/passport/third-party-common.js
View File

@ -6,6 +6,7 @@ const { authError } = require("./utils")
const { newid } = require("../../hashing") const { newid } = require("../../hashing")
const { createASession } = require("../../security/sessions") const { createASession } = require("../../security/sessions")
const { getGlobalUserByEmail } = require("../../utils") const { getGlobalUserByEmail } = require("../../utils")
const fetch = require("node-fetch")
/** /**
* Common authentication logic for third parties. e.g. OAuth, OIDC. * Common authentication logic for third parties. e.g. OAuth, OIDC.
@ -65,7 +66,7 @@ exports.authenticateThirdParty = async function (
} }
} }
dbUser = syncUser(dbUser, thirdPartyUser) dbUser = await syncUser(dbUser, thirdPartyUser)
// create or sync the user // create or sync the user
const response = await db.post(dbUser) const response = await db.post(dbUser)
@ -86,10 +87,26 @@ exports.authenticateThirdParty = async function (
return done(null, dbUser) return done(null, dbUser)
} }
async function syncProfilePicture(user, thirdPartyUser) {
const pictureUrl = thirdPartyUser.profile._json.picture
if (pictureUrl) {
const response = await fetch(pictureUrl)
if (response.status === 200) {
const type = response.headers.get("content-type")
if (type.startsWith("image/")) {
user.pictureUrl = pictureUrl
}
}
}
return user
}
/** /**
* @returns a user that has been sync'd with third party information * @returns a user that has been sync'd with third party information
*/ */
function syncUser(user, thirdPartyUser) { async function syncUser(user, thirdPartyUser) {
// provider // provider
user.provider = thirdPartyUser.provider user.provider = thirdPartyUser.provider
user.providerType = thirdPartyUser.providerType user.providerType = thirdPartyUser.providerType
@ -112,6 +129,8 @@ function syncUser(user, thirdPartyUser) {
} }
} }
user = await syncProfilePicture(user, thirdPartyUser)
// profile // profile
user.thirdPartyProfile = { user.thirdPartyProfile = {
...profile._json, ...profile._json,

2
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",

8
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -65,10 +65,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^0.9.87-alpha.1", "@budibase/bbui": "^0.9.87-alpha.3",
"@budibase/client": "^0.9.87-alpha.1", "@budibase/client": "^0.9.87-alpha.3",
"@budibase/colorpicker": "1.1.2", "@budibase/colorpicker": "1.1.2",
"@budibase/string-templates": "^0.9.87-alpha.1", "@budibase/string-templates": "^0.9.87-alpha.3",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

6
packages/builder/src/pages/builder/apps/index.svelte
View File

@ -54,7 +54,11 @@
</Layout> </Layout>
<ActionMenu align="right"> <ActionMenu align="right">
<div slot="control" class="avatar"> <div slot="control" class="avatar">
<Avatar size="M" initials={$auth.initials} /> <Avatar
size="M"
initials={$auth.initials}
url={$auth.user.pictureUrl}
/>
<Icon size="XL" name="ChevronDown" /> <Icon size="XL" name="ChevronDown" />
</div> </div>
<MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}> <MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}>

6
packages/builder/src/pages/builder/portal/_layout.svelte
View File

@ -100,7 +100,11 @@
<div /> <div />
<ActionMenu align="right"> <ActionMenu align="right">
<div slot="control" class="avatar"> <div slot="control" class="avatar">
<Avatar size="M" initials={$auth.initials} /> <Avatar
size="M"
initials={$auth.initials}
url={$auth.user.pictureUrl}
/>
<Icon size="XL" name="ChevronDown" /> <Icon size="XL" name="ChevronDown" />
</div> </div>
<MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}> <MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}>

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -18,9 +18,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^0.9.87-alpha.1", "@budibase/bbui": "^0.9.87-alpha.3",
"@budibase/standard-components": "^0.9.87-alpha.1", "@budibase/standard-components": "^0.9.87-alpha.3",
"@budibase/string-templates": "^0.9.87-alpha.1", "@budibase/string-templates": "^0.9.87-alpha.3",
"regexparam": "^1.3.0", "regexparam": "^1.3.0",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"svelte-spa-router": "^3.0.5" "svelte-spa-router": "^3.0.5"

1
packages/server/.gitignore vendored
View File

@ -7,3 +7,4 @@ public/
db/dev.db/ db/dev.db/
dist dist
coverage/ coverage/
watchtower-hook.json

5
packages/server/Dockerfile
View File

@ -1,5 +1,10 @@
FROM node:12-alpine FROM node:12-alpine
LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
WORKDIR /app WORKDIR /app
ENV PORT=4001 ENV PORT=4001

10
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.js", "main": "src/index.js",
"repository": { "repository": {
@ -60,9 +60,9 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/auth": "^0.9.87-alpha.1", "@budibase/auth": "^0.9.87-alpha.3",
"@budibase/client": "^0.9.87-alpha.1", "@budibase/client": "^0.9.87-alpha.3",
"@budibase/string-templates": "^0.9.87-alpha.1", "@budibase/string-templates": "^0.9.87-alpha.3",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0", "@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1", "@sendgrid/mail": "7.1.1",
@ -115,7 +115,7 @@
"devDependencies": { "devDependencies": {
"@babel/core": "^7.14.3", "@babel/core": "^7.14.3",
"@babel/preset-env": "^7.14.4", "@babel/preset-env": "^7.14.4",
"@budibase/standard-components": "^0.9.87-alpha.1", "@budibase/standard-components": "^0.9.87-alpha.3",
"@jest/test-sequencer": "^24.8.0", "@jest/test-sequencer": "^24.8.0",
"@types/bull": "^3.15.1", "@types/bull": "^3.15.1",
"@types/jest": "^26.0.23", "@types/jest": "^26.0.23",

1
packages/server/scripts/watchtower-hooks/post-check.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "post-check" }' > 'watchtower-hook.json'

1
packages/server/scripts/watchtower-hooks/post-update.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "post-update" }' > 'watchtower-hook.json'

1
packages/server/scripts/watchtower-hooks/pre-check.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "pre-check" }' > 'watchtower-hook.json'

1
packages/server/scripts/watchtower-hooks/pre-update.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "pre-update" }' > 'watchtower-hook.json'

4
packages/standard-components/package.json
View File

@ -29,11 +29,11 @@
"keywords": [ "keywords": [
"svelte" "svelte"
], ],
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"license": "MIT", "license": "MIT",
"gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc", "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
"dependencies": { "dependencies": {
"@budibase/bbui": "^0.9.87-alpha.1", "@budibase/bbui": "^0.9.87-alpha.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/link": "^3.1.3", "@spectrum-css/link": "^3.1.3",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

1
packages/worker/.gitignore vendored
View File

@ -1,2 +1,3 @@
node_modules/ node_modules/
.env .env
watchtower-hook.json

5
packages/worker/Dockerfile
View File

@ -1,5 +1,10 @@
FROM node:12-alpine FROM node:12-alpine
LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
WORKDIR /app WORKDIR /app
# copy files and install dependencies # copy files and install dependencies

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "0.9.87-alpha.1", "version": "0.9.87-alpha.3",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.js", "main": "src/index.js",
"repository": { "repository": {
@ -21,8 +21,8 @@
"author": "Budibase", "author": "Budibase",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@budibase/auth": "^0.9.87-alpha.1", "@budibase/auth": "^0.9.87-alpha.3",
"@budibase/string-templates": "^0.9.87-alpha.1", "@budibase/string-templates": "^0.9.87-alpha.3",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@techpass/passport-openidconnect": "^0.3.0", "@techpass/passport-openidconnect": "^0.3.0",
"aws-sdk": "^2.811.0", "aws-sdk": "^2.811.0",

1
packages/worker/scripts/watchtower-hooks/post-check.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "post-check" }' > 'watchtower-hook.json'

1
packages/worker/scripts/watchtower-hooks/post-update.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "post-update" }' > 'watchtower-hook.json'

1
packages/worker/scripts/watchtower-hooks/pre-check.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "pre-check" }' > 'watchtower-hook.json'

1
packages/worker/scripts/watchtower-hooks/pre-update.sh Executable file
View File

@ -0,0 +1 @@
echo '{ "current-hook" : "pre-update" }' > 'watchtower-hook.json'