@shad-claiborne/basic-oidc 1.1.2 → 1.1.4

package/dist/index.d.ts

@@ -33,11 +33,13 @@ export interface AuthorizationResponse {
     state?: string;
 }
 export interface TokenSet {
+    access_token?: string;
+    refresh_token?: string;
+    id_token?: string;
+}
+export interface TokenResponse extends TokenSet {
     token_type: string;
-    access_token: string;
     expires_in: number;
-    refresh_token: string;
-    id_token?: string;
 }
 export interface Identity {
     sub: string;
@@ -218,9 +220,9 @@ export declare class IdentityProvider {
      * getIdentity
      * @param client Client
      * @param tokenSet TokenSet
-     * @returns Promise<Identity | null>
+     * @returns Promise<Identity>
      */
-    getIdentity(client: Client, tokenSet: TokenSet): Promise<Identity | null>;
+    getIdentity(client: Client, tokenSet: TokenSet): Promise<Identity>;
 }
 /**
  * class Client
@@ -260,9 +262,9 @@ export declare class Client {
      * requestAccess
      * @param authResponse AuthorizationResponse
      * @param codeVerifier string
-     * @returns Promise<TokenSet>
+     * @returns Promise<TokenResponse>
      */
-    requestAccess(authResponse: AuthorizationResponse, codeVerifier?: string): Promise<TokenSet>;
+    requestAccess(authResponse: AuthorizationResponse, codeVerifier?: string): Promise<TokenResponse>;
     /**
      * refreshAccess
      * @param tokenSet TokenSet

package/dist/index.js

@@ -327,19 +327,21 @@ class IdentityProvider {
      * getIdentity
      * @param client Client
      * @param tokenSet TokenSet
-     * @returns Promise<Identity | null>
+     * @returns Promise<Identity>
      */
     async getIdentity(client, tokenSet) {
-        let id = null;
+        let id;
         if (tokenSet.id_token) {
             const jwks = (0, jose_1.createRemoteJWKSet)(new URL(this.config.jwks_uri));
             const { payload } = await (0, jose_1.jwtVerify)(tokenSet.id_token, jwks, { issuer: this.config.issuer });
             id = payload;
         }
-        else {
+        else if (tokenSet.access_token) {
             const api = new IdentityProviderApi(this, tokenSet);
             id = await api.fetchUserinfo();
         }
+        else
+            throw new Error('invalid token set');
         return id;
     }
 }
@@ -430,7 +432,7 @@ class Client {
      * requestAccess
      * @param authResponse AuthorizationResponse
      * @param codeVerifier string
-     * @returns Promise<TokenSet>
+     * @returns Promise<TokenResponse>
      */
     async requestAccess(authResponse, codeVerifier) {
         const tokenRequest = new TokenRequest(this);
@@ -449,6 +451,8 @@ class Client {
      * @returns Promise<TokenSet>
      */
     async refreshAccess(tokenSet) {
+        if (tokenSet.refresh_token === undefined)
+            throw new Error('undefined refresh token');
         const tokenRequest = new TokenRequest(this)
             .setRefreshToken(tokenSet.refresh_token)
             .setGrantType('refresh_token');
@@ -461,6 +465,8 @@ class Client {
      * @returns Promise<void>
      */
     async revokeAccess(tokenSet) {
+        if (tokenSet.access_token === undefined)
+            throw new Error('undefined access token');
         const params = new URLSearchParams();
         params.append('client_id', this.clientId);
         params.append('client_secret', this.clientSecret);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shad-claiborne/basic-oidc",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Basic OpenID Connect library",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",