twitch-auth - npm Package Compare versions

Comparing version 4.4.0-pre.0 to 4.4.0-pre.1

lib/helpers.d.ts

@@ -0,2 +1,4 @@
+import type { Logger } from '@d-fischer/logger';
 import { AccessToken } from './AccessToken';
+import type { AuthProvider } from './AuthProvider/AuthProvider';
 import { TokenInfo } from './TokenInfo';
@@ -44,1 +46,6 @@ /**
 export declare function getTokenInfo(accessToken: string, clientId?: string): Promise<TokenInfo>;
+/** @private */
+export declare function getValidTokenFromProvider(provider: AuthProvider, scopes?: string[], logger?: Logger): Promise<{
+    accessToken: AccessToken;
+    tokenInfo: TokenInfo;
+}>;

lib/helpers.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenInfo = exports.revokeToken = exports.refreshUserToken = exports.getAppToken = exports.exchangeCode = void 0;
+exports.getValidTokenFromProvider = exports.getTokenInfo = exports.revokeToken = exports.refreshUserToken = exports.getAppToken = exports.exchangeCode = void 0;
 var tslib_1 = require("tslib");
@@ -161,1 +161,60 @@ var twitch_api_call_1 = require("twitch-api-call");
 exports.getTokenInfo = getTokenInfo;
+/** @private */
+function getValidTokenFromProvider(provider, scopes, logger) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var lastTokenError, accessToken, tokenInfo, e_2, newToken, tokenInfo, e_3;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    lastTokenError = undefined;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 5, , 6]);
+                    return [4 /*yield*/, provider.getAccessToken(scopes)];
+                case 2:
+                    accessToken = _a.sent();
+                    if (!accessToken) return [3 /*break*/, 4];
+                    return [4 /*yield*/, getTokenInfo(accessToken.accessToken)];
+                case 3:
+                    tokenInfo = _a.sent();
+                    return [2 /*return*/, { accessToken: accessToken, tokenInfo: tokenInfo }];
+                case 4: return [3 /*break*/, 6];
+                case 5:
+                    e_2 = _a.sent();
+                    if (e_2 instanceof InvalidTokenError_1.InvalidTokenError) {
+                        lastTokenError = e_2;
+                    }
+                    else {
+                        logger === null || logger === void 0 ? void 0 : logger.err("Retrieving an access token failed: " + e_2.message);
+                    }
+                    return [3 /*break*/, 6];
+                case 6:
+                    logger === null || logger === void 0 ? void 0 : logger.warning('No valid token available; trying to refresh');
+                    if (!provider.refresh) return [3 /*break*/, 12];
+                    _a.label = 7;
+                case 7:
+                    _a.trys.push([7, 11, , 12]);
+                    return [4 /*yield*/, provider.refresh()];
+                case 8:
+                    newToken = _a.sent();
+                    if (!newToken) return [3 /*break*/, 10];
+                    return [4 /*yield*/, getTokenInfo(newToken.accessToken)];
+                case 9:
+                    tokenInfo = _a.sent();
+                    return [2 /*return*/, { accessToken: newToken, tokenInfo: tokenInfo }];
+                case 10: return [3 /*break*/, 12];
+                case 11:
+                    e_3 = _a.sent();
+                    if (e_3 instanceof InvalidTokenError_1.InvalidTokenError) {
+                        lastTokenError = e_3;
+                    }
+                    else {
+                        logger === null || logger === void 0 ? void 0 : logger.err("Refreshing the access token failed: " + e_3.message);
+                    }
+                    return [3 /*break*/, 12];
+                case 12: throw lastTokenError || new Error('Could not retrieve a valid token');
+            }
+        });
+    });
+}
+exports.getValidTokenFromProvider = getValidTokenFromProvider;

lib/index.d.ts

@@ -1,9 +0,13 @@
-export { AccessToken, AccessTokenData } from './AccessToken';
-export { exchangeCode, getAppToken, getTokenInfo, refreshUserToken, revokeToken } from './helpers';
-export { TokenInfo, TokenInfoData } from './TokenInfo';
-export { AuthProvider, AuthProviderTokenType } from './AuthProvider/AuthProvider';
+export { AccessToken } from './AccessToken';
+export type { AccessTokenData } from './AccessToken';
+export { exchangeCode, getAppToken, getTokenInfo, getValidTokenFromProvider, refreshUserToken, revokeToken } from './helpers';
+export { TokenInfo } from './TokenInfo';
+export type { TokenInfoData } from './TokenInfo';
+export type { AuthProvider, AuthProviderTokenType } from './AuthProvider/AuthProvider';
 export { ClientCredentialsAuthProvider } from './AuthProvider/ClientCredentialsAuthProvider';
-export { RefreshableAuthProvider, RefreshConfig } from './AuthProvider/RefreshableAuthProvider';
+export { RefreshableAuthProvider } from './AuthProvider/RefreshableAuthProvider';
+export type { RefreshConfig } from './AuthProvider/RefreshableAuthProvider';
 export { StaticAuthProvider } from './AuthProvider/StaticAuthProvider';
 export { InvalidTokenError } from './Errors/InvalidTokenError';
-export { getAppAccessToken, getUserAccessToken, LegacyAuthCredentials, refreshUserAccessToken } from './legacy';
+export { getAppAccessToken, getUserAccessToken, refreshUserAccessToken } from './legacy';
+export type { LegacyAuthCredentials } from './legacy';

lib/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshUserAccessToken = exports.getUserAccessToken = exports.getAppAccessToken = exports.InvalidTokenError = exports.StaticAuthProvider = exports.RefreshableAuthProvider = exports.ClientCredentialsAuthProvider = exports.TokenInfo = exports.revokeToken = exports.refreshUserToken = exports.getTokenInfo = exports.getAppToken = exports.exchangeCode = exports.AccessToken = void 0;
+exports.refreshUserAccessToken = exports.getUserAccessToken = exports.getAppAccessToken = exports.InvalidTokenError = exports.StaticAuthProvider = exports.RefreshableAuthProvider = exports.ClientCredentialsAuthProvider = exports.TokenInfo = exports.revokeToken = exports.refreshUserToken = exports.getValidTokenFromProvider = exports.getTokenInfo = exports.getAppToken = exports.exchangeCode = exports.AccessToken = void 0;
 var AccessToken_1 = require("./AccessToken");
@@ -10,2 +10,3 @@ Object.defineProperty(exports, "AccessToken", { enumerable: true, get: function () { return AccessToken_1.AccessToken; } });
 Object.defineProperty(exports, "getTokenInfo", { enumerable: true, get: function () { return helpers_1.getTokenInfo; } });
+Object.defineProperty(exports, "getValidTokenFromProvider", { enumerable: true, get: function () { return helpers_1.getValidTokenFromProvider; } });
 Object.defineProperty(exports, "refreshUserToken", { enumerable: true, get: function () { return helpers_1.refreshUserToken; } });
@@ -12,0 +13,0 @@ Object.defineProperty(exports, "revokeToken", { enumerable: true, get: function () { return helpers_1.revokeToken; } });

package.json

 {
   "name": "twitch-auth",
-  "version": "4.4.0-pre.0",
+  "version": "4.4.0-pre.1",
   "description": "Authenticate with Twitch and stop caring about refreshing tokens.",
@@ -33,5 +33,6 @@ "keywords": [
     "@d-fischer/deprecate": "^2.0.2",
+    "@d-fischer/logger": "^2.1.1",
     "@d-fischer/shared-utils": "^2.4.1",
     "tslib": "^2.0.3",
-    "twitch-api-call": "^4.4.0-pre.0"
+    "twitch-api-call": "^4.4.0-pre.1"
   },
@@ -48,3 +49,3 @@ "files": [
   },
-  "gitHead": "f55f399f7e35f75746473485716cee87a24408f3"
+  "gitHead": "eb3b84e3ac4e7fc336c9e88dfed78ec5778c48e0"
 }

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

85517

increased by8.16%

Lines of code

2073

increased by6.64%

Worsened metrics

Dependency count

5

increased by25%

Dependency changes

• + Added@d-fischer/logger@^2.1.1

• + Added@d-fischer/logger@2.1.1(transitive)

• Updatedtwitch-api-call@^4.4.0-pre.1