milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4194 from nielsvanvelzen/qc-admin

Browse source 
Support admin login in QuickConnect
This commit is contained in:
Bill Thornton 2023-01-05 00:08:06 -05:00 • committed by GitHub
commit acc8dcfd40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/session/login/index.js
View file

@ -48,7 +48,7 @@ import './login.scss';
function authenticateQuickConnect(apiClient) { function authenticateQuickConnect(apiClient) {
const url = apiClient.getUrl('/QuickConnect/Initiate'); const url = apiClient.getUrl('/QuickConnect/Initiate');
apiClient.getJSON(url).then(function (json) { apiClient.ajax({ type: 'POST', url }, true).then(res => res.json()).then(function (json) {
if (!json.Secret || !json.Code) { if (!json.Secret || !json.Code) {
console.error('Malformed quick connect response', json); console.error('Malformed quick connect response', json);
return false; return false;

2
src/controllers/user/menu/index.js
View file

@ -31,7 +31,7 @@ export default function (view, params) {
page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId); page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId);
page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId); page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId);
page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#/mypreferencessubtitles.html?userId=' + userId); page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#/mypreferencessubtitles.html?userId=' + userId);
page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#/mypreferencesquickconnect.html'); page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#/mypreferencesquickconnect.html?userId=' + userId);
page.querySelector('.lnkControlsPreferences').setAttribute('href', '#/mypreferencescontrols.html?userId=' + userId); page.querySelector('.lnkControlsPreferences').setAttribute('href', '#/mypreferencescontrols.html?userId=' + userId);
const supportsClientSettings = appHost.supports('clientsettings'); const supportsClientSettings = appHost.supports('clientsettings');

4
src/controllers/user/quickConnect/helper.js
View file

@ -1,8 +1,8 @@
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import toast from '../../../components/toast/toast'; import toast from '../../../components/toast/toast';
export const authorize = (code) => { export const authorize = (code, userId) => {
const url = ApiClient.getUrl('/QuickConnect/Authorize?Code=' + code); const url = ApiClient.getUrl('/QuickConnect/Authorize?Code=' + code + '&UserId=' + userId);
ApiClient.ajax({ ApiClient.ajax({
type: 'POST', type: 'POST',
url: url url: url

6
src/controllers/user/quickConnect/index.js
View file

@ -2,7 +2,9 @@ import { authorize } from './helper';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import toast from '../../../components/toast/toast'; import toast from '../../../components/toast/toast';
export default function (view) { export default function (view, params) {
const userId = params.userId || ApiClient.getCurrentUserId();
view.addEventListener('viewshow', function () { view.addEventListener('viewshow', function () {
const codeElement = view.querySelector('#txtQuickConnectCode'); const codeElement = view.querySelector('#txtQuickConnectCode');
@ -17,7 +19,7 @@ export default function (view) {
// Remove spaces from code // Remove spaces from code
const normalizedCode = codeElement.value.replace(/\s/g, ''); const normalizedCode = codeElement.value.replace(/\s/g, '');
authorize(normalizedCode); authorize(normalizedCode, userId);
}); });
}); });
} }