fix(useOidcIdToken): init state with current values (#722)

* fix(useOidcIdToken): init state with current values * update package
AxaFrance · Mar 8, 2022 · 7286141 · 7286141
1 parent a1d3d2d
commit 7286141
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -18,7 +18,7 @@ jobs:
 
       - name: Bump version and push tag
         id: tag_version
-      #  if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master'
         uses: mathieudutour/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/react-oidc-context",
-  "version": "4.2.7-alpha.0",
+  "version": "4.2.12-alpha.0",
   "private": false,
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",

diff --git a/packages/context/src/oidc/ReactOidc.tsx b/packages/context/src/oidc/ReactOidc.tsx
@@ -23,9 +23,19 @@ export const useOidc =(configurationName=defaultConfigurationName) =>{
 
 const accessTokenInitialState = {accessToken:null, accessTokenPayload:null};
 
+const initTokens = (configurationName) => {
+    const getOidc =  Oidc.get;
+    const oidc = getOidc(configurationName);
+    if(oidc.tokens) {
+        const tokens = oidc.tokens;
+        return {accessToken :tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload }
+    }
+    return accessTokenInitialState;
+}
+
 export const useOidcAccessToken =(configurationName=defaultConfigurationName) =>{
     const getOidc =  Oidc.get;
-    const [state, setAccessToken] = useState<any>(accessTokenInitialState);
+    const [state, setAccessToken] = useState<any>(initTokens(configurationName));
     const [subscriptionId, setSubscriptionId] = useState(null);
 
     useEffect(() => {
@@ -60,10 +70,20 @@ export const useOidcAccessToken =(configurationName=defaultConfigurationName) =>
 
 const idTokenInitialState = {idToken:null, idTokenPayload:null};
 
+const initIdToken= (configurationName) =>{
+    const getOidc =  Oidc.get;
+    const oidc = getOidc(configurationName);
+    if(oidc.tokens) {
+        const tokens = oidc.tokens;
+        return { idToken: tokens.idToken, idTokenPayload:tokens.idTokenPayload };
+    }
+    return idTokenInitialState
+}
+
 export const useOidcIdToken =(configurationName= defaultConfigurationName) =>{
     const getOidc =  Oidc.get;
     const [state, setIDToken] = useState<any>(idTokenInitialState);
-    const [subscriptionId, setSubscriptionId] = useState(null);
+    const [subscriptionId, setSubscriptionId] = useState(initIdToken(configurationName));
 
     useEffect(() => {
         let isMounted = true;

diff --git a/packages/vanilla/package.json b/packages/vanilla/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/vanilla-oidc",
-  "version": "4.2.7-alpha.0",
+  "version": "4.2.12-alpha.0",
   "private": false,
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",