michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-03-20 16:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: support cross domain cookies

Browse Source
This commit is contained in:
Koushik Dutta
2022-11-14 21:37:37 -08:00
parent 29c3a2255f
commit d5515193a7
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/client",
"version": "1.1.11",
"version": "1.1.15",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/client",
"version": "1.1.11",
"version": "1.1.15",
"license": "ISC",
"dependencies": {
"@scrypted/types": "^0.2.1",

2
packages/client/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/client",
"version": "1.1.11",
"version": "1.1.15",
"description": "",
"main": "dist/packages/client/src/index.js",
"scripts": {

15
packages/client/src/index.ts
View File

@@ -48,7 +48,7 @@ export interface ScryptedClientStatic extends ScryptedStatic {
export interface ScryptedConnectionOptions {
webrtc?: boolean;
baseUrl: string;
baseUrl?: string;
axiosConfig?: AxiosRequestConfig;
}
@@ -59,7 +59,7 @@ export interface ScryptedLoginOptions extends ScryptedConnectionOptions {
* The login token can be retrieved with "npx scrypted login".
*/
password: string;
change_password: string,
change_password?: string,
maxAge?: number;
}
@@ -85,6 +85,7 @@ export async function loginScryptedClient(options: ScryptedLoginOptions) {
change_password,
maxAge,
}, {
withCredentials: true,
...options.axiosConfig,
});
@@ -107,6 +108,7 @@ export async function checkScryptedClientLogin(options?: ScryptedConnectionOptio
let { baseUrl } = options || {};
const url = `${baseUrl || ''}/login`;
const response = await axios.get(url, {
withCredentials: true,
...options?.axiosConfig,
});
const scryptedCloud = response.headers['x-scrypted-cloud'] === 'true';
@@ -133,8 +135,9 @@ export function redirectScryptedLogin(options?: {
redirect?: string, baseUrl?: string
}) {
let { baseUrl, redirect } = options || {};
baseUrl = baseUrl || '';
redirect = redirect || `${baseUrl}/endpoint/@scrypted/core/public/`
redirect = redirect || `/endpoint/@scrypted/core/public/`
if (baseUrl)
redirect = new URL(redirect, baseUrl).toString();
const redirect_uri = `${redirect}?redirect_uri=${encodeURIComponent(window.location.href)}`;
console.log('redirect_uri', redirect_uri);
globalThis.location.href = redirect_uri;
@@ -178,6 +181,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
const endpointPath = `/endpoint/${pluginId}`;
const eioOptions: Partial<SocketOptions> = {
path: `${endpointPath}/engine.io/api`,
withCredentials: true,
extraHeaders,
rejectUnauthorized: false,
};
@@ -193,6 +197,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
if (scryptedCloud || options.webrtc) {
const publicEioOptions: Partial<SocketOptions> = {
path: `${endpointPath}/public/engine.io/api`,
withCredentials: true,
extraHeaders,
rejectUnauthorized: false,
};
@@ -230,6 +235,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
promises.push((async () => {
const webrtcEioOptions: Partial<SocketOptions> = {
path: '/endpoint/@scrypted/webrtc/engine.io/',
withCredentials: true,
extraHeaders,
rejectUnauthorized: false,
};
@@ -255,6 +261,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
await axios.post(url, {
id,
}, {
withCredentials: true,
...options.axiosConfig,
});