@bitrix24/b24jssdk 0.4.1 → 0.4.2

package/dist/umd/index.js

@@ -1,5 +1,5 @@
 /**
- * @version @bitrix24/b24jssdk v0.4.1
+ * @version @bitrix24/b24jssdk v0.4.2
  * @copyright (c) 2025 Bitrix24
  * @licence MIT
  * @links https://github.com/bitrix24/b24jssdk - GitHub
@@ -8538,89 +8538,44 @@
 	  }
 	}
 
-	const _state = {};
-	function getCrypto() {
-	  if (typeof window !== "undefined" && window.crypto) {
-	    return window.crypto;
-	  }
-	  if (typeof globalThis.crypto !== "undefined") {
-	    return globalThis.crypto;
-	  }
-	  throw new Error("Crypto API not available");
-	}
-	function initRng() {
-	  const crypto = getCrypto();
-	  if (!crypto?.getRandomValues) {
-	    throw new Error("Crypto API not available");
-	  }
-	  return {
-	    rng: () => {
-	      const rnds8 = new Uint8Array(16);
-	      return crypto.getRandomValues(rnds8);
-	    }
-	  };
-	}
 	const byteToHex = [];
 	for (let i = 0; i < 256; ++i) {
 	  byteToHex.push((i + 256).toString(16).slice(1));
 	}
-	function updateV7State(state, now, randoms) {
-	  state.msecs ??= -Infinity;
-	  state.seq ??= 0;
-	  if (now > state.msecs) {
-	    state.seq = randoms[6] << 23 | randoms[7] << 16 | randoms[8] << 8 | randoms[9];
-	    state.msecs = now;
-	  } else {
-	    state.seq = Math.trunc(state.seq + 1);
-	    if (state.seq === 0) {
-	      state.msecs++;
-	    }
-	  }
-	  return state;
-	}
-	function v7Bytes(randoms, msecs, seq, buf, offset = 0) {
-	  if (!buf) {
-	    buf = new Uint8Array(16);
-	    offset = 0;
-	  }
-	  msecs ??= Date.now();
-	  seq ??= randoms[6] * 127 << 24 | randoms[7] << 16 | randoms[8] << 8 | randoms[9];
-	  buf[offset++] = msecs / 1099511627776 & 255;
-	  buf[offset++] = msecs / 4294967296 & 255;
-	  buf[offset++] = msecs / 16777216 & 255;
-	  buf[offset++] = msecs / 65536 & 255;
-	  buf[offset++] = msecs / 256 & 255;
-	  buf[offset++] = msecs & 255;
-	  buf[offset++] = 112 | seq >>> 28 & 15;
-	  buf[offset++] = seq >>> 20 & 255;
-	  buf[offset++] = 128 | seq >>> 14 & 63;
-	  buf[offset++] = seq >>> 6 & 255;
-	  buf[offset++] = seq << 2 & 255 | randoms[10] & 3;
-	  buf[offset++] = randoms[11];
-	  buf[offset++] = randoms[12];
-	  buf[offset++] = randoms[13];
-	  buf[offset++] = randoms[14];
-	  buf[offset++] = randoms[15];
-	  return buf;
-	}
-	function unsafeStringify(arr, offset = 0) {
-	  return (byteToHex[arr[offset]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+	function sfc32(a, b, c, d) {
+	  return () => {
+	    a |= 0;
+	    b |= 0;
+	    c |= 0;
+	    d |= 0;
+	    const t = (a + b | 0) + d | 0;
+	    d = d + 1 | 0;
+	    a = b ^ b >>> 9;
+	    b = c + (c << 3) | 0;
+	    c = (c << 21 | c >>> 11) + t | 0;
+	    return t >>> 0;
+	  };
 	}
 	function uuidv7() {
-	  const buf = void 0;
-	  const offset = void 0;
-	  const now = Date.now();
-	  const { rng } = initRng();
-	  const randoms = rng();
-	  updateV7State(_state, now, randoms);
-	  const bytes = v7Bytes(
-	    randoms,
-	    _state.msecs,
-	    _state.seq,
-	    buf,
-	    offset
-	  );
-	  return unsafeStringify(bytes);
+	  const bytes = new Uint8Array(16);
+	  const timestamp = BigInt(Date.now());
+	  const perf = BigInt(Math.floor(performance.now() * 1e3) % 65535);
+	  const combinedTime = timestamp << 16n | perf;
+	  bytes[0] = Number(combinedTime >> 40n & 0xffn);
+	  bytes[1] = Number(combinedTime >> 32n & 0xffn);
+	  bytes[2] = Number(combinedTime >> 24n & 0xffn);
+	  bytes[3] = Number(combinedTime >> 16n & 0xffn);
+	  bytes[4] = Number(combinedTime >> 8n & 0xffn);
+	  bytes[5] = Number(combinedTime & 0xffn);
+	  const seed = (Math.random() * 4294967295 ^ Date.now() ^ performance.now()) >>> 0;
+	  const rand = sfc32(2654435769, 608135816, 3084996962, seed);
+	  const randView = new DataView(bytes.buffer);
+	  randView.setUint32(6, rand());
+	  randView.setUint32(10, rand());
+	  randView.setUint16(14, rand());
+	  bytes[6] = 112 | bytes[6] & 15;
+	  bytes[8] = 128 | bytes[8] & 63;
+	  return (byteToHex[bytes[0]] + byteToHex[bytes[1]] + byteToHex[bytes[2]] + byteToHex[bytes[3]] + "-" + byteToHex[bytes[4]] + byteToHex[bytes[5]] + "-" + byteToHex[bytes[6]] + byteToHex[bytes[7]] + "-" + byteToHex[bytes[8]] + byteToHex[bytes[9]] + "-" + byteToHex[bytes[10]] + byteToHex[bytes[11]] + byteToHex[bytes[12]] + byteToHex[bytes[13]] + byteToHex[bytes[14]] + byteToHex[bytes[15]]).toLowerCase();
 	}
 
 	const reEscape = /[&<>'"]/g;
@@ -14099,7 +14054,7 @@ ${this.stack}`;
 	  #clientSideWarningMessage = "";
 	  constructor(baseURL, authActions, options) {
 	    const defaultHeaders = {
-	      // 'X-Sdk': 'b24-js-sdk-v-0.4.1'
+	      // 'X-Sdk': 'b24-js-sdk-v-0.4.2'
 	    };
 	    this.#clientAxios = axios.create({
 	      baseURL,
@@ -14527,7 +14482,7 @@ ${this.stack}`;
 	    const baseUrl = `${encodeURIComponent(method)}.json`;
 	    const queryParams = new URLSearchParams({
 	      [this.#requestIdGenerator.getQueryStringParameterName()]: this.#requestIdGenerator.getRequestId(),
-	      [this.#requestIdGenerator.getQueryStringSdkParameterName()]: "0.4.1",
+	      [this.#requestIdGenerator.getQueryStringSdkParameterName()]: "0.4.2",
 	      [this.#requestIdGenerator.getQueryStringSdkTypeParameterName()]: "b24-js-sdk"
 	    });
 	    return `${baseUrl}?${queryParams.toString()}`;
@@ -16743,6 +16698,142 @@ ${this.stack}`;
 	  // endregion ////
 	}
 
+	class AuthOAuthManager {
+	  #authOptions;
+	  #oAuthSecret;
+	  #authExpires = 0;
+	  #domain;
+	  #b24Target;
+	  #b24TargetRest;
+	  // 'https://oauth.bitrix.info' ////
+	  #oAuthTarget;
+	  #isAdmin = null;
+	  constructor(b24OAuthParams, oAuthSecret) {
+	    this.#authOptions = Object.assign({}, b24OAuthParams);
+	    this.#oAuthSecret = Object.freeze(Object.assign({}, oAuthSecret));
+	    this.#domain = this.#authOptions.domain.replaceAll("https://", "").replaceAll("http://", "").replace(/:(80|443)$/, "");
+	    this.#b24TargetRest = this.#authOptions.clientEndpoint;
+	    this.#b24Target = this.#b24TargetRest.replace("/rest", "");
+	    this.#oAuthTarget = this.#authOptions.serverEndpoint.replace("/rest/", "");
+	    this.#authExpires = this.#authOptions.expires * 1e3;
+	  }
+	  /**
+	   * Returns authorization data
+	   * @see Http.#prepareParams
+	   */
+	  getAuthData() {
+	    return this.#authExpires > Date.now() ? {
+	      access_token: this.#authOptions.accessToken,
+	      refresh_token: this.#authOptions.refreshToken,
+	      expires_in: this.#authOptions.expiresIn,
+	      domain: this.#domain,
+	      member_id: this.#authOptions.memberId
+	    } : false;
+	  }
+	  /**
+	   * Updates authorization data
+	   */
+	  async refreshAuth() {
+	    try {
+	      const response = await fetch(`${this.#oAuthTarget}/oauth/token/`, {
+	        method: "POST",
+	        headers: {
+	          "Content-Type": "application/json"
+	        },
+	        body: JSON.stringify({
+	          params: {
+	            client_id: this.#oAuthSecret.clientId,
+	            grant_type: "refresh_token",
+	            client_secret: this.#oAuthSecret.clientSecret,
+	            refresh_token: this.#authOptions.refreshToken
+	          }
+	        })
+	      });
+	      if (!response.ok) {
+	        throw new Error(`Token update error: ${response.statusText}`);
+	      }
+	      const data = await response.json();
+	      if (data.error) {
+	        throw new Error(`Token update error: ${data.error}`);
+	      }
+	      this.#authOptions.accessToken = data.access_token;
+	      this.#authOptions.refreshToken = data.refresh_token;
+	      this.#authExpires = data.expires * 1e3;
+	    } catch (error) {
+	      throw new Error(`Token update error: ${error instanceof Error ? error.message : error}`);
+	    }
+	    return this.getAuthData();
+	  }
+	  getUniq(prefix) {
+	    return [prefix, this.#authOptions.memberId || ""].join("_");
+	  }
+	  /**
+	   * Get the account address BX24 ( https://name.bitrix24.com )
+	   */
+	  getTargetOrigin() {
+	    return `${this.#b24Target}`;
+	  }
+	  /**
+	   * Get the account address BX24 with Path ( https://name.bitrix24.com/rest )
+	   */
+	  getTargetOriginWithPath() {
+	    return `${this.#b24TargetRest}`;
+	  }
+	  /**
+	   * Determines whether the current user has administrator rights
+	   */
+	  get isAdmin() {
+	    if (null === this.#isAdmin) {
+	      throw new Error("isAdmin not init. You need call B24OAuth::initIsAdmin().");
+	    }
+	    return this.#isAdmin;
+	  }
+	  async initIsAdmin(http) {
+	    const response = await http.call("profile", {}, 0);
+	    if (!response.isSuccess) {
+	      throw new Error(response.getErrorMessages().join(";"));
+	    }
+	    const data = response.getData().result;
+	    if (data?.ADMIN) {
+	      this.#isAdmin = true;
+	    }
+	  }
+	}
+
+	class B24OAuth extends AbstractB24 {
+	  #authOAuthManager;
+	  constructor(authOptions, oAuthSecret) {
+	    super();
+	    this.#authOAuthManager = new AuthOAuthManager(authOptions, oAuthSecret);
+	    this._http = new Http(
+	      this.#authOAuthManager.getTargetOriginWithPath(),
+	      this.#authOAuthManager,
+	      this._getHttpOptions()
+	    );
+	    this._isInit = true;
+	  }
+	  async initIsAdmin() {
+	    if (!this._http) {
+	      throw new Error("Http Not init");
+	    }
+	    return this.#authOAuthManager.initIsAdmin(this._http);
+	  }
+	  setLogger(logger) {
+	    super.setLogger(logger);
+	  }
+	  get auth() {
+	    return this.#authOAuthManager;
+	  }
+	  getTargetOrigin() {
+	    this._ensureInitialized();
+	    return this.#authOAuthManager.getTargetOrigin();
+	  }
+	  getTargetOriginWithPath() {
+	    this._ensureInitialized();
+	    return this.#authOAuthManager.getTargetOriginWithPath();
+	  }
+	}
+
 	class UnhandledMatchError extends Error {
 	  constructor(value, ...args) {
 	    super(...args);
@@ -26213,9 +26304,11 @@ Data string: ${pullEvent}
 	exports.AppFrame = AppFrame;
 	exports.AuthHookManager = AuthHookManager;
 	exports.AuthManager = AuthManager;
+	exports.AuthOAuthManager = AuthOAuthManager;
 	exports.B24Frame = B24Frame;
 	exports.B24Hook = B24Hook;
 	exports.B24LangList = B24LangList;
+	exports.B24OAuth = B24OAuth;
 	exports.B24PullClientManager = PullClient;
 	exports.Browser = Browser;
 	exports.CatalogProductImageType = CatalogProductImageType;