From b470f9cd63472b608a89ca9cb3f7f6c21b20b4d1 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 25 Nov 2025 14:43:44 +0530 Subject: [PATCH] changes in token: GWM --- .env | 2 +- main.go | 70 ++++++++++++++++++++++++++++++++++++++------ pb_data/data.db | Bin 774144 -> 774144 bytes pb_data/data.db-shm | Bin 32768 -> 32768 bytes pb_data/data.db-wal | Bin 0 -> 20632 bytes pb_data/logs.db-shm | Bin 32768 -> 0 bytes pb_data/logs.db-wal | 0 7 files changed, 62 insertions(+), 10 deletions(-) delete mode 100644 pb_data/logs.db-shm delete mode 100644 pb_data/logs.db-wal diff --git a/.env b/.env index 19c8d17..3bd29d8 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ BASE_URL = https://pb.venbait.in UAEPASS_TOKEN_API = https://stg-id.uaepass.ae/idshub/token UAEPASS_TOKEN_API_PARAM_GRANT_TYPE = authorization_code -UAEPASS_TOKEN_API_PARAM_REDIRECTION_URL = http://localhost:60876 +UAEPASS_TOKEN_API_PARAM_REDIRECTION_URL = http://localhost:55227 UAEPASS_TOKEN_API_AUTHORIZATION_USERNAME = sandbox_stage UAEPASS_TOKEN_API_AUTHORIZATION_PASSWORD = sandbox_stage diff --git a/main.go b/main.go index 21ba74a..8c95ee1 100755 --- a/main.go +++ b/main.go @@ -23,6 +23,7 @@ import ( firebase "firebase.google.com/go" "firebase.google.com/go/messaging" + "github.com/golang-jwt/jwt/v4" "github.com/joho/godotenv" "github.com/labstack/echo/v5" "github.com/pocketbase/dbx" @@ -1827,7 +1828,30 @@ func main() { } defer tokenResp.Body.Close() - tokenBody, _ := ioutil.ReadAll(tokenResp.Body) + // tokenBody, _ := ioutil.ReadAll(tokenResp.Body) + + fmt.Println("---------- UAEPASS TOKEN API DEBUG ----------") + + fmt.Println("Token API URL:", tokenURL) + fmt.Println("grant_type:", os.Getenv("UAEPASS_TOKEN_API_PARAM_GRANT_TYPE")) + fmt.Println("redirect_uri:", os.Getenv("UAEPASS_TOKEN_API_PARAM_REDIRECTION_URL")) + fmt.Println("code:", reqData.Code) + + fmt.Println("BasicAuth Username:", os.Getenv("UAEPASS_TOKEN_API_AUTHORIZATION_USERNAME")) + fmt.Println("BasicAuth Password:", os.Getenv("UAEPASS_TOKEN_API_AUTHORIZATION_PASSWORD")) + + fmt.Println("Status Code:", tokenResp.StatusCode) + + tokenBodyBytes, err := ioutil.ReadAll(tokenResp.Body) + tokenBody := tokenBodyBytes + + if err != nil { + fmt.Println("Error reading token response body:", err) + } else { + fmt.Println("Raw Token API Response:", string(tokenBodyBytes)) + } + + fmt.Println("--------------------------------------------") var tokenResult struct { AccessToken string `json:"access_token"` @@ -1890,11 +1914,25 @@ func main() { }) } + // Extract exp from PB token + parsed, _, err := new(jwt.Parser).ParseUnverified(token, jwt.MapClaims{}) + if err != nil { + return c.JSON(http.StatusInternalServerError, map[string]interface{}{ + "status": "error", + "message": "Failed to decode token", + "error": err.Error(), + }) + } + + claims := parsed.Claims.(jwt.MapClaims) + exp := claims["exp"] + return c.JSON(http.StatusOK, map[string]interface{}{ - "status": "success", - "message": "User found by UUID", - "token": token, - "data": userDetails, + "status": "success", + "message": "User found by UUID", + "token": token, + "data": user, + "expiresOn": exp, }) } @@ -1931,11 +1969,25 @@ func main() { }) } + // Extract exp from PB token + parsed, _, err := new(jwt.Parser).ParseUnverified(token2, jwt.MapClaims{}) + if err != nil { + return c.JSON(http.StatusInternalServerError, map[string]interface{}{ + "status": "error", + "message": "Failed to decode token", + "error": err.Error(), + }) + } + + claims := parsed.Claims.(jwt.MapClaims) + exp := claims["exp"] + return c.JSON(http.StatusOK, map[string]interface{}{ - "status": "success", - "message": "User found by email and UUID updated", - "token": token2, - "data": userDetails, + "status": "success", + "message": "User found by email and UUID updated", + "token": token2, + "data": userByEmail, + "expiresOn": exp, }) }) diff --git a/pb_data/data.db b/pb_data/data.db index e8816f2b9ffd915880ef9fd5585376fa719a4ca4..0042580b54db30a6107ebb1d8baf5749c577304a 100644 GIT binary patch delta 180 zcmZozpx*#QTNw2N7g6Zqh zxQ(VS%Ve~gUXaOX(Jqn22*gZ4%nZaVK+FonY(UHo#2i4(xm_ZQ>+ByPLqlC7Qw0N4 UD^nvYV@o{~Gn4J#)3`Y^0kz#Y5dZ)H delta 245 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 UG)MNgxm=AC+pHklw`Pg|21nlLtpET3 literal 0 HcmV?d00001 diff --git a/pb_data/logs.db-shm b/pb_data/logs.db-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3