@vkid/sdk - npm Package Compare versions

Comparing version 2.0.0-alpha.2 to 2.0.0-alpha.3

CHANGELOG.md

 # Change Log
 
+## 2.0.0-alpha.3
+
+### Исправления
+- Исправлена ошибка, возникающая при наличии query параметров в redirectUrl
+
 ## 2.0.0-alpha.2
@@ -4,0 +9,0 @@

dist-sdk/cjs/auth/auth.js

@@ -12,2 +12,3 @@ 'use strict';
 var url = require('../utils/url/url.js');
+var uuid = require('../utils/uuid.js');
 require('../widgets/oauthList/oauthList.js');
@@ -83,2 +84,3 @@ var types = require('../widgets/oauthList/types.js');
         _define_property(this, "interval", void 0);
+        _define_property(this, "id", uuid.uuid());
         _define_property(this, "close", function() {
@@ -170,4 +172,4 @@ _this.opener && _this.opener.close();
                 stats_info: url.encodeStatsInfo({
-                    flow_source: (_params4 = params) === null || _params4 === void 0 ? void 0 : _params4.statsFlowSource,
-                    session_id: (_params5 = params) === null || _params5 === void 0 ? void 0 : _params5.uniqueSessionId
+                    flow_source: ((_params4 = params) === null || _params4 === void 0 ? void 0 : _params4.statsFlowSource) || types$2.AuthStatsFlowSource.AUTH,
+                    session_id: ((_params5 = params) === null || _params5 === void 0 ? void 0 : _params5.uniqueSessionId) || _this.id
                 })
@@ -174,0 +176,0 @@ };

dist-sdk/cjs/auth/types.js

@@ -5,2 +5,3 @@ 'use strict';
 (function(AuthStatsFlowSource) {
+    AuthStatsFlowSource["AUTH"] = "from_custom_auth";
     AuthStatsFlowSource["BUTTON_ONE_TAP"] = "from_one_tap";
@@ -7,0 +8,0 @@ AuthStatsFlowSource["FLOATING_ONE_TAP"] = "from_floating_one_tap";

dist-sdk/cjs/constants.js

 'use strict';
 
 // @ts-ignore-next-line пробрасываем версию из package.json в rollup.config
-var VERSION = "2.0.0-alpha.2";
+var VERSION = "2.0.0-alpha.3";
 // @ts-ignore-next-line пробрасываем тип сборки из rollup.config
@@ -6,0 +6,0 @@ var DOMAIN = "vk.com";

dist-sdk/cjs/core/analytics/ProductionStatsCollector.js

 'use strict';
 
+var constants = require('../../constants.js');
 var request = require('../../utils/request.js');
@@ -73,3 +74,4 @@
                         var params = {
-                            events: JSON.stringify(_this.stackEvents)
+                            events: JSON.stringify(_this.stackEvents),
+                            sak_version: constants.VERSION
                         };
@@ -76,0 +78,0 @@ _this.stackEvents = [];

dist-sdk/cjs/utils/url/url.js

@@ -74,6 +74,8 @@ 'use strict';
 var getRedirectWithPayloadUrl = function(payload, config) {
+    var redirectUrlFromConfig = config.get().redirectUrl;
+    var containsQuery = redirectUrlFromConfig.includes("?");
     var params = Object.keys(payload).map(function(key) {
         return encodeURIComponent(key) + "=" + encodeURIComponent(payload[key]);
     }).join("&");
-    return "".concat(config.get().redirectUrl, "?").concat(params);
+    return "".concat(redirectUrlFromConfig).concat(containsQuery ? "&" : "?").concat(params);
 };
@@ -80,0 +82,0 @@ var encodeStatsInfo = function(params) {

dist-sdk/esm/auth/auth.js

@@ -10,6 +10,7 @@ import './../lib/@vkontakte/vkjs/lib/es6/detections.js';
 import { encodeStatsInfo, getVKIDUrl, getRedirectWithPayloadUrl } from '../utils/url/url.js';
+import { uuid } from '../utils/uuid.js';
 import '../widgets/oauthList/oauthList.js';
 import { ExternalOAuthName } from '../widgets/oauthList/types.js';
 import { OAUTH2_RESPONSE, OAUTH2_RESPONSE_TYPE, AUTH_ERROR_TEXT } from './constants.js';
-import { AuthErrorCode } from './types.js';
+import { AuthStatsFlowSource, AuthErrorCode } from './types.js';
 
@@ -24,2 +25,3 @@ const CODE_CHALLENGE_METHOD = 's256';
     interval;
+    id = uuid();
     close = ()=>{
@@ -110,4 +112,4 @@ this.opener && this.opener.close();
             stats_info: encodeStatsInfo({
-                flow_source: params?.statsFlowSource,
-                session_id: params?.uniqueSessionId
+                flow_source: params?.statsFlowSource || AuthStatsFlowSource.AUTH,
+                session_id: params?.uniqueSessionId || this.id
             })
@@ -114,0 +116,0 @@ };

dist-sdk/esm/auth/types.js

 var AuthStatsFlowSource;
 (function(AuthStatsFlowSource) {
+    AuthStatsFlowSource["AUTH"] = 'from_custom_auth';
     AuthStatsFlowSource["BUTTON_ONE_TAP"] = 'from_one_tap';
@@ -4,0 +5,0 @@ AuthStatsFlowSource["FLOATING_ONE_TAP"] = 'from_floating_one_tap';

dist-sdk/esm/constants.js

 // @ts-ignore-next-line пробрасываем версию из package.json в rollup.config
-const VERSION = "2.0.0-alpha.2";
+const VERSION = "2.0.0-alpha.3";
 // @ts-ignore-next-line пробрасываем тип сборки из rollup.config
@@ -4,0 +4,0 @@ const DOMAIN = 'vk.com';

dist-sdk/esm/core/analytics/ProductionStatsCollector.js

@@ -0,1 +1,2 @@
+import { VERSION } from '../../constants.js';
 import { getStatsUrl, request } from '../../utils/request.js';
@@ -28,3 +29,4 @@
                 const params = {
-                    events: JSON.stringify(this.stackEvents)
+                    events: JSON.stringify(this.stackEvents),
+                    sak_version: VERSION
                 };
@@ -31,0 +33,0 @@ this.stackEvents = [];

dist-sdk/esm/utils/url/url.js

@@ -21,4 +21,6 @@ import './../../lib/@vkontakte/vkjs/lib/es6/detections.js';
 const getRedirectWithPayloadUrl = (payload, config)=>{
+    const redirectUrlFromConfig = config.get().redirectUrl;
+    const containsQuery = redirectUrlFromConfig.includes('?');
     const params = Object.keys(payload).map((key)=>encodeURIComponent(key) + '=' + encodeURIComponent(payload[key])).join('&');
-    return `${config.get().redirectUrl}?${params}`;
+    return `${redirectUrlFromConfig}${containsQuery ? '&' : '?'}${params}`;
 };
@@ -25,0 +27,0 @@ const encodeStatsInfo = (params)=>{

dist-sdk/types/auth/auth.d.ts

@@ -12,2 +12,3 @@ import { Config } from "../core/config";
     private interval;
+    private readonly id;
     private readonly close;
@@ -14,0 +15,0 @@ private readonly handleMessage;

dist-sdk/types/auth/types.d.ts

@@ -5,2 +5,3 @@ import { OAUTH2_CODE_TYPE } from "./constants";
 export declare enum AuthStatsFlowSource {
+    AUTH = "from_custom_auth",
     BUTTON_ONE_TAP = "from_one_tap",
@@ -7,0 +8,0 @@ FLOATING_ONE_TAP = "from_floating_one_tap",

package.json

 {
   "name": "@vkid/sdk",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "description": "VK ID Web SDK",
@@ -5,0 +5,0 @@ "main": "dist-sdk/cjs/index.js",

README.md

@@ -29,3 +29,3 @@ <div align="center">
 
-ℹ️ Версия VK ID SDK 2.0.0-alpha поддерживает авторизацию по протоколу [OAuth 2.1](https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-10), а также способы входа через аккаунты Одноклассников и Mail.ru. Если вы хотите участвовать в тестировании этой версии SDK или узнать о ней подробнее, напишите нам на почту [e-mail].
+ℹ️ Версия VK ID SDK 2.0.0-alpha.3 поддерживает авторизацию по протоколу [OAuth 2.1](https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-10), а также способы входа через аккаунты Одноклассников и Mail.ru. Если вы хотите участвовать в тестировании этой версии SDK или узнать о ней подробнее, напишите нам на почту [e-mail].
 
@@ -61,3 +61,3 @@ ---
 ```html
-<script src="https://unpkg.com/@vkid/sdk@2.0.0-alpha/dist-sdk/umd/index.js"></script>
+<script src="https://unpkg.com/@vkid/sdk@2.0.0-alpha.3/dist-sdk/umd/index.js"></script>
 ```
@@ -64,0 +64,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1619442

increased by0.07%

Lines of code

12961

increased by0.13%

No dependency changes