TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Updated members sdk to latest content-api (#45)

Browse Source 
no-issue

* Upgrade to latest content api
* Removed unused closeAuth

* Removed auto close of popup and wait for event
* Added globals to top of file
This commit is contained in:
Fabien O'Carroll 2019-02-06 17:03:55 +01:00 committed by GitHub
parent 0f6809bab5
commit 8d2bbe5b0d
3 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ghost/sdk/layer2/index.js
View File

@ -1,3 +1,4 @@
/* global window */
var layer1 = require('@tryghost/members-layer1');
module.exports = function layer2(options) {
@ -20,13 +21,6 @@ module.exports = function layer2(options) {
return frame;
});
function closeAuth() {
return loadAuth.then(function (frame) {
frame.style.display = 'none';
return frame;
});
}
function openAuth(hash, query = '') {
return loadAuth.then(function (frame) {
return new Promise(function (resolve) {
@ -36,17 +30,12 @@ module.exports = function layer2(options) {
if (event.source !== frame.contentWindow) {
return;
}
if (event.data !== 'pls-close-auth-popup') {
if (!event.data || event.data.msg !== 'pls-close-auth-popup') {
return;
}
window.removeEventListener('message', messageListener);
frame.style.display = 'none';
resolve(false);
})
members.bus.on('signedin', function signedinListener() {
members.bus.off('signedin', signedinListener);
frame.style.display = 'none';
resolve(true);
resolve(!!event.data.success);
});
});
});

18
ghost/sdk/theme-dropin/src/index.js
View File

@ -1,3 +1,4 @@
/* global window document */
const DomReady = require('domready');
const GhostContentApi = require('@tryghost/content-api');
const layer2 = require('@tryghost/members-layer2');
@ -8,10 +9,10 @@ function reload(success) {
}
}
function show (el) {
function show(el) {
el.style.display = 'block';
}
function hide (el) {
function hide(el) {
el.style.display = 'none';
}
@ -34,7 +35,7 @@ DomReady(function () {
}
}
const membersContentElements = Array.from(document.querySelectorAll("[data-members]")) // TODO use data-members-content;
const membersContentElements = Array.from(document.querySelectorAll('[data-members]')); // TODO use data-members-content;
var signinBtn = document.querySelector('[data-members-signin]');
var signinCta = document.querySelector('[data-members-signin-cta]');
@ -67,27 +68,22 @@ DomReady(function () {
signinCta.addEventListener('click', signin);
membersContentElements.forEach(function (element) {
console.log(element);
const resourceType = element.getAttribute('data-members-resource-type');
const resourceId = element.getAttribute('data-members-resource-id');
const host = element.getAttribute('data-members-content-host');
const api = GhostContentApi.create({
const api = GhostContentApi({
host,
version
});
const audience = new URL(host).origin
console.log(audience);
const audience = new URL(host).origin;
members.getToken({audience}).then((token) => {
console.log(token);
if (!token) {
return;
}
console.log({resourceType, resourceId});
api[resourceType].read({ id: resourceId }, {}, token).then(({html}) => {
api[resourceType].read({id: resourceId}, {}, token).then(({html}) => {
element.innerHTML = html;
}).catch((err) => {
element.innerHTML = err.message;

26
ghost/sdk/theme-dropin/yarn.lock
View File

@ -541,10 +541,10 @@
resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.2.tgz#16947fce5f57258d01f1688fdc32723093c55d3f"
"@tryghost/content-api@file:../../content-api":
version "0.1.0"
version "1.0.0"
dependencies:
axios "0.18.0"
ghost-ignition "^2.9.6"
superagent "^4.0.0-beta.5"
"@tryghost/members-layer0@file:../layer0":
version "0.0.0"
@ -556,7 +556,7 @@
"@tryghost/members-layer1@../layer1", "@tryghost/members-layer1@file:../layer1":
version "0.0.0"
dependencies:
"@tryghost/members-layer0" "file:../../../../../Library/Caches/Yarn/v4/npm-@tryghost-members-layer1-0.0.0-0d37ce78-17c3-4a6a-ad21-b8de0e2e41de-1543948924228/node_modules/@tryghost/layer0"
"@tryghost/members-layer0" "file:../../../../../../../.cache/yarn/v2/npm-@tryghost/layer0"
ghost-ignition "^2.9.6"
jsonwebtoken "^8.3.0"
minivents "^2.2.0"
@ -564,7 +564,7 @@
"@tryghost/members-layer2@file:../layer2":
version "0.0.0"
dependencies:
"@tryghost/members-layer1" "file:../../../../../Library/Caches/Yarn/v4/npm-@tryghost-members-layer2-0.0.0-4cb09098-60ce-4c40-9320-e7e125528431-1543948924243/node_modules/@tryghost/layer1"
"@tryghost/members-layer1" "file:../../../../../../../.cache/yarn/v2/npm-@tryghost/layer1"
bluebird "^3.5.3"
document-ready "^2.0.1"
ghost-ignition "^2.9.6"
@ -673,6 +673,13 @@ aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
axios@0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
dependencies:
follow-redirects "^1.3.0"
is-buffer "^1.1.5"
babelify@^10.0.0:
version "10.0.0"
resolved "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz#fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"
@ -1063,7 +1070,7 @@ date-now@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
debug@3.1.0:
debug@3.1.0, debug@=3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
dependencies:
@ -1225,6 +1232,12 @@ find-root@1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
follow-redirects@^1.3.0:
version "1.6.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb"
dependencies:
debug "=3.1.0"
forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@ -1445,7 +1458,7 @@ invert-kv@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
is-buffer@^1.1.0:
is-buffer@^1.1.0, is-buffer@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@ -1701,7 +1714,6 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
minivents@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/minivents/-/minivents-2.2.0.tgz#559492edc04bc00b62168850af5b8ca06d5e088b"
integrity sha1-VZSS7cBLwAtiFohQr1uMoG1eCIs=
mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@~0.5.1:
version "0.5.1"