Commit 389a8f01 authored by christianrhansen's avatar christianrhansen

Update from master

# Conflicts:
#	src/components/mosys
#	src/components/shared
parents 17b7d16d b21af278
Pipeline #16990 passed with stage
in 1 minute and 25 seconds
Subproject commit 7ce80d811314d22996bc6f3e70c03e439c31bbef
Subproject commit e110a92669f2dc9569e4bead385aa9970591847b
......@@ -28,6 +28,9 @@ app, including a local metadata service as store module `metadata-ffprobe`
under `media/create` (playback possible using forked
[vue-video-player](https://github.com/dasantonym/vue-video-player))
- Export timelines as CSV
- Mobile compatiblity for MoSys Editor
- The file `statics/env.js` can be overwritten to configure
the frontend at runtime
### Changed
......
This diff is collapsed.
......@@ -73,7 +73,8 @@
"vue-shortkey": "3.1.6",
"vue-socket.io": "^3.0.7",
"vue-video-player": "git+https://github.com/dasantonym/vue-video-player.git",
"vuelidate": "0.7.4"
"vuelidate": "0.7.4",
"vuezingtouch": "^18.10.27"
},
"devDependencies": {
"@babel/runtime": "^7.0.0-beta.54",
......@@ -106,7 +107,7 @@
"metapak-motionbank": "1.16.0",
"pug": "^2.0.3",
"pug-plain-loader": "^1.0.0",
"quasar-cli": "^0.17.26",
"quasar-cli": "0.17.20",
"static-server": "^2.2.1",
"strip-ansi": "^3.0.1"
},
......
......@@ -17,6 +17,7 @@ module.exports = function (ctx) {
'shortkey',
'sort',
'socket',
'touch',
'vocabularies',
'window'
],
......
......@@ -13,11 +13,11 @@ const
keytarAccount = os.userInfo().username
function getAuthenticationURL () {
return 'https://' + process.env.AUTH0_DOMAIN + '/authorize?' +
'audience=' + process.env.AUTH0_AUDIENCE + '&' +
return 'https://' + (window.AUTH0_DOMAIN || process.env.AUTH0_DOMAIN) + '/authorize?' +
'audience=' + (window.AUTH0_AUDIENCE || process.env.AUTH0_AUDIENCE) + '&' +
'scope=openid profile offline_access&' +
'response_type=code&' +
'client_id=' + process.env.AUTH0_CLIENT_ID + '&' +
'client_id=' + (window.AUTH0_CLIENT_ID || process.env.AUTH0_CLIENT_ID) + '&' +
'redirect_uri=' + redirectUri
}
......@@ -25,9 +25,9 @@ async function refreshTokens () {
const refreshToken = await keytar.getPassword(keytarService, keytarAccount)
if (!refreshToken) return throw new Error('No refresh token found')
const result = await axios.post(`https://${process.env.AUTH0_DOMAIN}/oauth/token`, {
const result = await axios.post(`https://${window.AUTH0_DOMAIN || process.env.AUTH0_DOMAIN}/oauth/token`, {
grant_type: 'refresh_token',
client_id: process.env.AUTH0_CLIENT_ID,
client_id: window.AUTH0_CLIENT_ID || process.env.AUTH0_CLIENT_ID,
refresh_token: refreshToken
}, {
headers: {'Content-Type': 'application/json'}
......@@ -43,12 +43,12 @@ async function loadTokens (callbackURL) {
const exchangeOptions = {
'grant_type': 'authorization_code',
'client_id': process.env.AUTH0_CLIENT_ID,
'client_id': window.AUTH0_CLIENT_ID || process.env.AUTH0_CLIENT_ID,
'code': query.code,
'redirect_uri': redirectUri
}
const result = await axios.post(`https://${process.env.AUTH0_DOMAIN}/oauth/token`, exchangeOptions, {
const result = await axios.post(`https://${window.AUTH0_DOMAIN || process.env.AUTH0_DOMAIN}/oauth/token`, exchangeOptions, {
headers: {
'Content-Type': 'application/json'
}
......@@ -66,7 +66,7 @@ async function logout () {
}
function getLogOutUrl () {
return `https://${process.env.AUTH0_DOMAIN}/v2/logout`
return `https://${window.AUTH0_DOMAIN || process.env.AUTH0_DOMAIN}/v2/logout`
}
export {
......
......@@ -9,7 +9,10 @@
<script>
export default {
name: 'App'
name: 'App',
mounted () {
console.log(window.TRANSCODER_HOST)
}
}
</script>
......
Subproject commit c6ac9440d2c89a562412459e52eecc95f18234db
Subproject commit c46d0f431106486c178f2f4c211431008203270a
......@@ -21,5 +21,6 @@
<div id="q-app"></div>
<!-- built files will be auto injected here -->
<script src="statics/env.js" language="JavaScript"></script>
</body>
</html>
......@@ -8,10 +8,10 @@ export default ({ Vue }) => {
}
else {
authService = new AuthService({
domain: process.env.AUTH0_DOMAIN,
clientID: process.env.AUTH0_CLIENT_ID,
redirectUri: process.env.AUTH0_REDIRECT_URL || `${document.location.origin}/users/callback`,
audience: process.env.AUTH0_AUDIENCE,
domain: window.AUTH0_DOMAIN || process.env.AUTH0_DOMAIN,
clientID: window.AUTH0_CLIENT_ID || process.env.AUTH0_CLIENT_ID,
redirectUri: `${document.location.origin}/users/callback`,
audience: window.AUTH0_AUDIENCE || process.env.AUTH0_AUDIENCE,
scope: 'openid profile read write',
responseType: 'token id_token'
})
......
import VueZingTouch from 'vuezingtouch'
export default ({ Vue }) => {
Vue.directive(VueZingTouch.name, VueZingTouch)
}
Object.assign(window, {
//
// HOST CONFIG
//
API_HOST: 'https://api.motionbank.org',
TRANSCODER_HOST: 'https://transcoder.motionbank.org',
SOCKETS_HOST: 'https://sockets.motionbank.org',
STORAGE_HOST: 'https://storage.motionbank.org',
PACKAGER_HOST: 'https://packager.motionbank.org',
//
// AUTH
//
AUTH0_CLIENT_ID: '80t5TRU9MVhGDVnZ522CvX4hutBxDB6U',
AUTH0_DOMAIN: 'auth.motionbank.org',
AUTH0_AUDIENCE: 'https://api.motionbank.org'
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment