triangle-utils 1.4.25 → 1.4.27

package/dist/src/UtilsCognito.d.ts

@@ -1,10 +1,10 @@
 export declare class UtilsCognito {
     private readonly cognito;
     constructor(region: string);
-    get_username(token: string): Promise<string | undefined>;
     admin_get_user(user_pool_id: string, username: string): Promise<import("@aws-sdk/client-cognito-identity-provider").AdminGetUserCommandOutput | undefined>;
     admin_create_user(user_pool_id: string, username: string, user_id: string): Promise<Error | import("@aws-sdk/client-cognito-identity-provider").AdminCreateUserCommandOutput>;
     admin_reset_password(user_pool_id: string, username: string): Promise<Error | import("@aws-sdk/client-cognito-identity-provider").AdminCreateUserCommandOutput>;
+    get_email(token: string): Promise<string | undefined>;
     get_user_id(token: string): Promise<string | undefined>;
     get_new_token(client_id: string, client_secret: string, refresh_token: string): Promise<string | undefined>;
     sign_out(token: string): Promise<void>;

package/dist/src/UtilsCognito.js

@@ -1,21 +1,9 @@
-import { CognitoIdentityProvider, NotAuthorizedException } from "@aws-sdk/client-cognito-identity-provider";
+import { CognitoIdentityProvider } from "@aws-sdk/client-cognito-identity-provider";
 export class UtilsCognito {
     cognito;
     constructor(region) {
         this.cognito = new CognitoIdentityProvider({ region: region });
     }
-    async get_username(token) {
-        try {
-            const user_info = await this.cognito.getUser({
-                AccessToken: token
-            });
-            const username = user_info.Username;
-            return username;
-        }
-        catch (error) {
-            return undefined;
-        }
-    }
     async admin_get_user(user_pool_id, username) {
         try {
             return await this.cognito.adminGetUser({
@@ -64,6 +52,26 @@ export class UtilsCognito {
             return new Error();
         }
     }
+    async get_email(token) {
+        try {
+            const user_info = await this.cognito.getUser({
+                AccessToken: token
+            });
+            const user_attributes = user_info.UserAttributes;
+            if (user_attributes === undefined) {
+                return undefined;
+            }
+            const user_attribute = user_attributes.filter(attribute => attribute.Name === "email")[0];
+            if (user_attribute === undefined) {
+                return undefined;
+            }
+            const email = user_attribute.Value;
+            return email;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
     async get_user_id(token) {
         try {
             const user_info = await this.cognito.getUser({
@@ -91,10 +99,7 @@ export class UtilsCognito {
             return user_id;
         }
         catch (error) {
-            if (error instanceof NotAuthorizedException) {
-                return undefined;
-            }
-            throw error;
+            return undefined;
         }
     }
     async get_new_token(client_id, client_secret, refresh_token) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.25",
+    "version": "1.4.27",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsCognito.ts

@@ -1,4 +1,4 @@
-import { CognitoIdentityProvider, NotAuthorizedException } from "@aws-sdk/client-cognito-identity-provider"
+import { CognitoIdentityProvider, NotAuthorizedException, UserNotFoundException } from "@aws-sdk/client-cognito-identity-provider"
 
 export class UtilsCognito {
 
@@ -8,18 +8,6 @@ export class UtilsCognito {
         this.cognito = new CognitoIdentityProvider({ region : region })
     }
 
-    async get_username(token : string) {
-        try {
-            const user_info = await this.cognito.getUser({
-                AccessToken : token
-            })
-            const username = user_info.Username
-            return username
-        } catch (error) {
-            return undefined
-        }
-    }
-
     async admin_get_user(user_pool_id : string, username : string) {
         try {
             return await this.cognito.adminGetUser({
@@ -68,6 +56,26 @@ export class UtilsCognito {
         }
     }
 
+    async get_email(token : string) {
+        try {
+            const user_info = await this.cognito.getUser({
+                AccessToken : token
+            })
+            const user_attributes = user_info.UserAttributes
+            if (user_attributes === undefined) {
+                return undefined
+            }
+            const user_attribute = user_attributes.filter(attribute => attribute.Name === "email")[0]
+            if (user_attribute === undefined) {
+                return undefined
+            }
+            const email = user_attribute.Value
+            return email
+        } catch (error) {
+            return undefined
+        }
+    }
+
     async get_user_id(token : string) : Promise<string | undefined> {
         try {
             const user_info = await this.cognito.getUser({
@@ -94,10 +102,7 @@ export class UtilsCognito {
             const user_id = user_attribute.Value
             return user_id
         } catch (error) {
-            if (error instanceof NotAuthorizedException) {
-                return undefined
-            }
-            throw error
+            return undefined
         }
     }