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

master #249

Merged
merged 22 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6c28625
Merge pull request #235 from aesirxio/develop
NguyenBao10 Aug 12, 2024
4fcc89e
prepare for release
NguyenBao10 Aug 12, 2024
4f696a2
prepare for release
NguyenBao10 Aug 16, 2024
a510804
prepare for release
NguyenBao10 Aug 23, 2024
161e032
Bump axios from 1.6.0 to 1.7.7
dependabot[bot] Sep 1, 2024
b12ea58
Bump micromatch from 4.0.5 to 4.0.8
dependabot[bot] Sep 4, 2024
92bbffc
Bump rollup from 3.29.4 to 3.29.5
dependabot[bot] Sep 26, 2024
b5e1b8f
Merge pull request #241 from aesirxio/dependabot/npm_and_yarn/rollup-…
vietredweb Oct 2, 2024
1110e49
Merge branch 'master' into dependabot/npm_and_yarn/micromatch-4.0.8
vietredweb Oct 2, 2024
2d96906
Merge pull request #240 from aesirxio/dependabot/npm_and_yarn/microma…
vietredweb Oct 2, 2024
fbbfecf
Merge branch 'master' into dependabot/npm_and_yarn/axios-1.7.7
vietredweb Oct 2, 2024
effb9a6
Merge pull request #239 from aesirxio/dependabot/npm_and_yarn/axios-1…
vietredweb Oct 2, 2024
d02da60
Update package
vietredweb Oct 2, 2024
f59d354
fix conflict
vietredweb Oct 2, 2024
d46068b
Update
vietredweb Oct 2, 2024
fe43774
Update prettier
vietredweb Oct 2, 2024
ec452b9
Merge pull request #245 from vietredweb/update-package
vietredweb Oct 2, 2024
7967eef
Update ws
vietredweb Oct 2, 2024
82a4799
Merge branch 'master' into update-package
vietredweb Oct 2, 2024
8e70168
Merge pull request #246 from vietredweb/update-package
vietredweb Oct 2, 2024
c638c67
prepare for release
vietredweb Oct 2, 2024
fb1f392
Merge pull request #247 from vietredweb/master
vietredweb Oct 2, 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
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "aesirx-sso",
"version": "1.4.14",
"version": "1.4.18",
"license": "GPL-3.0-only",
"author": "AesirX",
"repository": "https://github.com/aesirxio/sso",
"main": "build/lib/index.js",
"types": "build/lib/types/index.d.ts",
"source": "src/index.js",
"dependencies": {
"@concordium/browser-wallet-api-helpers": "^3.0.0",
"@concordium/react-components": "^0.4.0-rc.7",
"@concordium/browser-wallet-api-helpers": "3.0.1",
"@concordium/react-components": "0.4.0-rc.7",
"@concordium/web-sdk": "7.1.0",
"@fingerprintjs/fingerprintjs": "3.4.2",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
Expand All @@ -18,8 +18,8 @@
"@wagmi/core": "^1.3.8",
"@web3modal/ethereum": "^2.7.0",
"@web3modal/react": "^2.7.0",
"aesirx-lib": "^2.0.11",
"axios": "^1.6.0",
"aesirx-lib": "^2.1.1",
"axios": "^1.7.7",
"bootstrap": "^5.3.3",
"cross-env": "^7.0.3",
"dotenv": "^16.4.5",
Expand All @@ -43,6 +43,9 @@
"wagmi": "^1.3.2",
"yup": "^1.3.2"
},
"resolutions": {
"ws": "8.17.1"
},
"tsup": {
"entry": [
"src/index.tsx"
Expand Down
4 changes: 2 additions & 2 deletions src/SSOButton/Providers/Concordium/sign.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ const SignMessageConcordium = ({
{status === 'sign'
? 'Please sign message on the wallet'
: status === 'loading'
? 'Connecting...'
: `Please wait to connect...`}
? 'Connecting...'
: `Please wait to connect...`}
</span>
</div>
) : !isExist || isSignUpForm ? (
Expand Down
16 changes: 8 additions & 8 deletions src/SSOButton/Providers/CreateAccount/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -302,19 +302,19 @@ const CreateAccount = ({
username: data[`field${registerForm.email}_1_email`]
? data[`field${registerForm.email}_1_email`]
: Object.keys(socialType)?.length
? `${socialType?.id}`
: `${walletState?.accountAddress}`,
? `${socialType?.id}`
: `${walletState?.accountAddress}`,
password: passwordGenerate,
email: data[`field${registerForm.email}_1_email`]
? data[`field${registerForm.email}_1_email`]
: Object.keys(socialType)?.length
? `${socialType?.id}@aesirx.io`
: `${walletState?.accountAddress}@aesirx.io`,
? `${socialType?.id}@aesirx.io`
: `${walletState?.accountAddress}@aesirx.io`,
organisation: data[`field${registerForm.email}_1_email`]
? data[`field${registerForm.email}_1_email`]
: Object.keys(socialType)?.length
? `${socialType?.id}`
: `${walletState?.accountAddress}`,
? `${socialType?.id}`
: `${walletState?.accountAddress}`,
block: 0,
...(walletState?.wallet === 'concordium'
? { wallet_concordium: walletState?.accountAddress }
Expand Down Expand Up @@ -347,8 +347,8 @@ const CreateAccount = ({
[`field${registerForm.email}_1[email]`]: data[`field${registerForm.email}_1_email`]
? data[`field${registerForm.email}_1_email`]
: Object.keys(socialType).length
? `${socialType?.id}@aesirx.io`
: `${walletState?.accountAddress}@aesirx.io`,
? `${socialType?.id}@aesirx.io`
: `${walletState?.accountAddress}@aesirx.io`,
[`field${registerForm.organization}_1`]: data[`field${registerForm.organization}_1`],
[`field${registerForm.message}_1`]: data[`field${registerForm.message}_1`],
[`field${registerForm.order_id}_1`]: data[`field${registerForm.order_id}_1`] ?? '',
Expand Down
4 changes: 2 additions & 2 deletions src/SSOButton/Providers/Ethereum/sign.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ const SignMessage = ({ setIsAccountExist, setExpand, setAccountInfo }: any) => {
{status === 'sign'
? `Please sign message via ${connector?.name}`
: status === 'loading'
? 'Connecting...'
: `Please wait to connect... via ${connector?.name}`}
? 'Connecting...'
: `Please wait to connect... via ${connector?.name}`}
</span>
</div>
) : !isExist || isSignUpForm ? (
Expand Down
8 changes: 4 additions & 4 deletions src/SSOButton/Providers/Social/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ const SSOSocialProvider = ({
typeSocial === 'google'
? google_icon
: typeSocial === 'facebook'
? fb_icon
: typeSocial === 'twitter'
? twitter_icon
: reddit_icon
? fb_icon
: typeSocial === 'twitter'
? twitter_icon
: reddit_icon
}
width={24}
height={24}
Expand Down
Loading