Merge branch 'master' of ssh://git.trj.tw:10022/keycloak-org/keycloak-demo

utils/index.js

@@ -122,45 +122,3 @@ mod.selectObject = (obj, param) => {
 
   return newObj;
 };
-
-/**
- * pad string to target length
- * @param {any} v source input
- * @param {number} len target length
- * @param {number} direct pad direct (-1 left, 1 right)
- * @param {string} padChar default '0'
- * @return {string}
- */
-mod.pad = (v, len = 0, direct = -1, padChar = '0') => {
-  if (v === null || v === undefined) return '';
-  if (typeof v !== 'string' && !v.toString) return '';
-  if (direct !== 1 && direct !== -1) return '';
-  if (typeof v !== 'string') v = v.toString();
-  if (typeof padChar !== 'string') padChar = '0';
-  len = mod.toNumber(len, 0, 0);
-  if (v.length < len) {
-    if (direct < 0) v = `${padChar}${v}`;
-    else v = `${v}${padChar}`;
-    return mod.pad(v, len, direct, padChar);
-  }
-
-  return v;
-};
-
-/**
- * pad left
- * @param {any} v
- * @param {number} len
- * @param {string} padChar
- * @return {string}
- */
-mod.padLeft = (v, len = 0, padChar = '0') => mod.pad(v, len, -1, padChar);
-
-/**
- * pad right
- * @param {any} v
- * @param {number} len
- * @param {string} padChar
- * @return {string}
- */
-mod.padRight = (v, len = 0, padChar = '0') => mod.pad(v, len, 1, padChar);

utils/sso/index.js

@@ -135,7 +135,12 @@ mod.getToken = async (code, state) => {
   // decode access token
   console.log("token ::: ", jwt.decode(accessToken));
 
+<<<<<<< HEAD
   console.log("body ::: ", body);
+=======
+  const decoded = jwt.decode(idToken);
+  if (!decoded || typeof decoded !== 'object') throw new Error('jwt decode fail');
+>>>>>>> c96cdf0ebd17f805235c6fa9eecf2ea79ecca19b
   // @ts-ignore
   const { preferred_username: preferredUsername } = decoded;
   if (!preferredUsername) throw new Error("id token field missing");