From 07a77044118c473e1d20c8a16727340cc843fa77 Mon Sep 17 00:00:00 2001
From: yang <yangweiping7@h-partners.com>
Date: Sat, 22 Feb 2025 14:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=20jwks-rsa=E5=BA=93=E4=BF=AE=E6=94=B9=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=9E=84=E5=BB=BAwarning=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yang <yangweiping7@h-partners.com>
---
 .../entry/src/main/ets/pages/TestPage.ets     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/jwks-rsa/entry/src/main/ets/pages/TestPage.ets b/jwks-rsa/entry/src/main/ets/pages/TestPage.ets
index ebc24483..19b30f62 100644
--- a/jwks-rsa/entry/src/main/ets/pages/TestPage.ets
+++ b/jwks-rsa/entry/src/main/ets/pages/TestPage.ets
@@ -15,17 +15,19 @@
 
 import {JwksClient} from "@ohos/jwks_rsa"
 import util from '@ohos.util';
+import cryptoFramework from "@ohos.security.cryptoFramework";
+
 
 // let that:ESObject;
 class Option{
   jwksUri:string;
-  requestHeaders: ESObject; // Optional
+  requestHeaders: null | object; // Optional
   timeout:number=5000; // Defaults to 30s
   cache:boolean;
   rateLimit: boolean
 
   constructor(jwksUri:string,
-  requestHeaders: ESObject, // Optional
+  requestHeaders: null | object, // Optional
   timeout:number, // Defaults to 30s
   cache:boolean,
   rateLimit: boolean) {
@@ -85,14 +87,14 @@ struct Index {
 
 
     if(this.client != null){
-      let signingKey:ESObject|null = await this.client.getSigningKey(kid)
+      let signingKey: Single = await this.client.getSigningKey(kid)
       console.info("jwks_rsa signingKey:"+JSON.stringify(signingKey))
       this.kid = signingKey.kid
       this.alg = signingKey.algorithm
       this.kty = signingKey.type
       this.usage = signingKey.usage
-      let pubKey:ESObject = await signingKey.getPublicKey()
-      let publicData:ESObject  = pubKey.getEncoded().data;
+      let pubKey:cryptoFramework.PubKey | undefined = await signingKey.getPublicKey()
+      let publicData:Uint8Array | undefined  = pubKey?.getEncoded().data;
       console.info("jwks_rsa public key encode  = " + publicData)
       let base64:util.Base64Helper = new util.Base64Helper();
       this.publicKey = base64.encodeToStringSync(publicData);
@@ -100,4 +102,17 @@ struct Index {
     }
 
   }
+}
+
+class Single{
+  kid: string = "";
+  algorithm: string = "";
+  type:string = "";
+  usage: string = "";
+  x5u: undefined | string | string[] = undefined;
+  x5c: undefined | string | string[] = undefined;
+  x5t: undefined | string | string[] = undefined;
+  getPublicKey():cryptoFramework.PubKey | undefined {
+    return undefined
+  }
 }
\ No newline at end of file
-- 
Gitee