Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge/dev to qa 25 07 2024 #725

Merged
merged 25 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e3eb7b4
[Deno Deploy] Update .github/workflows/deploy.yml
deno-deploy[bot] Jun 7, 2024
95aeaa6
feat: support no ledger (#689)
bhavanakarwade Jun 7, 2024
a41d5aa
fixed CSS and avatar issues (#696)
pranalidhanavade Jun 9, 2024
eb793d8
feat: support no ledger (#697)
bhavanakarwade Jun 10, 2024
252b504
refactor: responsiveness of the component (#699)
bhavanakarwade Jun 14, 2024
c318707
feat: manage keycloak client
bhavanakarwade Jun 17, 2024
d40b608
refactor: updated env sample file
bhavanakarwade Jun 17, 2024
2d8875c
fix: error messages issue from create organization and create ecosyst…
pranalidhanavade Jun 17, 2024
03147ee
Merge pull request #702 from credebl/feat/manage-keycloak-client
shitrerohit Jun 18, 2024
40c3b7e
fix: css issues (#704)
bhavanakarwade Jun 19, 2024
7300fc6
feat: add passkey warning message for unsupported devices (#706)
pranalidhanavade Jun 19, 2024
5698893
Feat/passkey warning messages (#707)
pranalidhanavade Jun 19, 2024
0dc76d1
feat: dedicated agent workflow (#693)
pranalidhanavade Jun 20, 2024
7d5a77d
fix: formik validations for dedicated agent workflow (#708)
pranalidhanavade Jun 21, 2024
a297a2a
fix: create did button restrictions (#710)
bhavanakarwade Jun 21, 2024
7616a5f
feat: changed schema payload (#711)
tipusinghaw Jun 23, 2024
a97bdfd
feat/delete wallet and organization (#712)
pranalidhanavade Jun 25, 2024
d3fce1a
fix: custom-avatar-css-issues (#714)
pranalidhanavade Jun 26, 2024
42bd813
feat: delete wallet and organization (#715)
pranalidhanavade Jun 26, 2024
c888199
refactor: added query parameter in get all schemas API (#713)
bhavanakarwade Jun 26, 2024
1f4d3bc
refactor: request schema payload (#717)
bhavanakarwade Jul 8, 2024
d0c5625
fix:client id and secret encryption (#724)
pranalidhanavade Jul 25, 2024
2ad3bca
Merge branch 'qa' of https://github.com/credebl/studio into merge/dev…
pranalidhanavade Jul 25, 2024
759305e
Client id client secret encryption (#726)
pranalidhanavade Jul 25, 2024
6aceaf6
Merge branch 'develop' of https://github.com/credebl/studio into merg…
pranalidhanavade Jul 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PUBLIC_CRYPTO_PRIVATE_KEY=
PUBLIC_SHOW_NAME_AS_LOGO= # Please provide true if you want to give platform name with logo

PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID= # Please sepcify your client id
PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRETE= # Please specify your client secrete
PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET= # Please specify your client secrete

PUBLIC_PLATFORM_NAME= # Please specify your paltform name
PUBLIC_PLATFORM_LOGO= # Please specify your logo file link
Expand Down
7 changes: 4 additions & 3 deletions src/components/Authentication/SignUpUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Form,
Formik
} from 'formik';
import { checkUserExist, sendVerificationMail, setToLocalStorage } from '../../api/Auth.ts';
import { checkUserExist, passwordEncryption, sendVerificationMail, setToLocalStorage } from '../../api/Auth.ts';
import { apiStatusCodes, storageKeys } from '../../config/CommonConstant.js';
import { useEffect, useState } from 'react';
import SignUpUserName from './SignUpUserName'
Expand Down Expand Up @@ -46,9 +46,10 @@ const SignUpUser = () => {
try {
const payload = {
email: email,
clientId: envConfig.PLATFORM_DATA.clientId,
clientSecret: envConfig.PLATFORM_DATA.clientSecrete
clientId: passwordEncryption(envConfig.PLATFORM_DATA.clientId),
clientSecret:passwordEncryption(envConfig.PLATFORM_DATA.clientSecret)
}

setVerifyLoader(true)
const userRsp = await sendVerificationMail(payload);
const { data } = userRsp as AxiosResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import DedicatedAgentForm from '../walletCommonComponents/DedicatedAgent';
import SharedAgentForm from './SharedAgent';
import WalletSteps from './WalletSteps';
import type { IValuesShared } from './interfaces';
import React from 'react';
import OrganizationDetails from '../OrganizationDetails';
import type { Organisation } from '../interfaces';

Expand Down Expand Up @@ -48,7 +49,8 @@ const WalletSpinup = (props: {
const [orgData, setOrgData] = useState<Organisation | null>(null);
const [isShared, setIsShared] = useState<boolean>(false);
const [isConfiguredDedicated, setIsConfiguredDedicated] = useState<boolean>(false);



const maskSeeds = (seed: string) => {
const visiblePart = seed.slice(0, -10);
const maskedPart = seed.slice(-10).replace(/./g, '*');
Expand Down
8 changes: 4 additions & 4 deletions src/config/envConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (import.meta.env) {
}
}

const { PUBLIC_BASE_URL, PUBLIC_POLYGON_TESTNET_URL, PUBLIC_POLYGON_MAINNET_URL, PUBLIC_CRYPTO_PRIVATE_KEY,PUBLIC_SHOW_NAME_AS_LOGO, PUBLIC_PLATFORM_NAME, PUBLIC_PLATFORM_LOGO, PUBLIC_POWERED_BY, PUBLIC_PLATFORM_WEB_URL, PUBLIC_POWERED_BY_URL, PUBLIC_PLATFORM_DOCS_URL, PUBLIC_PLATFORM_GIT, PUBLIC_PLATFORM_SUPPORT_EMAIL, PUBLIC_PLATFORM_TWITTER_URL, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRETE, PUBLIC_PLATFORM_SUPPORT_INVITE, PUBLIC_PLATFORM_DISCORD_URL, PUBLIC_ALLOW_DOMAIN }: any = envVariables;
const { PUBLIC_BASE_URL, PUBLIC_POLYGON_TESTNET_URL, PUBLIC_POLYGON_MAINNET_URL, PUBLIC_CRYPTO_PRIVATE_KEY,PUBLIC_SHOW_NAME_AS_LOGO, PUBLIC_PLATFORM_NAME, PUBLIC_PLATFORM_LOGO, PUBLIC_POWERED_BY, PUBLIC_PLATFORM_WEB_URL, PUBLIC_POWERED_BY_URL, PUBLIC_PLATFORM_DOCS_URL, PUBLIC_PLATFORM_GIT, PUBLIC_PLATFORM_SUPPORT_EMAIL, PUBLIC_PLATFORM_TWITTER_URL, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID, PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET, PUBLIC_PLATFORM_SUPPORT_INVITE, PUBLIC_PLATFORM_DISCORD_URL, PUBLIC_ALLOW_DOMAIN }: any = envVariables;

export const envConfig = {
PUBLIC_BASE_URL:
Expand Down Expand Up @@ -65,9 +65,9 @@ export const envConfig = {
clientId:
PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID ||
import.meta.env.PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID,
clientSecrete:
PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRETE ||
import.meta.env.PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRETE,
clientSecret:
PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET ||
import.meta.env.PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET,
},
PUBLIC_ALLOW_DOMAIN: PUBLIC_ALLOW_DOMAIN || import.meta.env.PUBLIC_ALLOW_DOMAIN
}
Loading