Skip to content

Commit bbcd6b1

Browse files
lwin-kyawmirceanis
authored andcommitted
feat: update seedless onboarding controller and oauth getToken response
1 parent 1c18228 commit bbcd6b1

File tree

4 files changed

+50
-12
lines changed

4 files changed

+50
-12
lines changed

app/scripts/services/oauth/oauth-service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ export default class OAuthService {
251251
socialLoginEmail: userInfo.email,
252252
refreshToken: authTokenData.refresh_token,
253253
revokeToken: authTokenData.revoke_token,
254+
accessToken: authTokenData.access_token,
255+
metadataAccessToken: authTokenData.metadata_access_token,
254256
};
255257
}
256258

app/scripts/services/oauth/types.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,23 @@ export type AuthTokenResponse = {
130130
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
131131
// eslint-disable-next-line @typescript-eslint/naming-convention
132132
revoke_token: string;
133+
134+
/**
135+
* The access token issued from the Web3Auth Authentication Server.
136+
* This token includes the user information (email, idToken, etc.)
137+
*/
138+
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
139+
// eslint-disable-next-line @typescript-eslint/naming-convention
140+
access_token: string;
141+
142+
/**
143+
* The metadata access token issued from the Web3Auth Authentication Server.
144+
* This is used to access the secret metadata store.
145+
*/
146+
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
147+
// eslint-disable-next-line @typescript-eslint/naming-convention
148+
metadata_access_token: string;
149+
133150
indexes: number[];
134151
endpoints: Record<string, string>;
135152
};
@@ -156,6 +173,8 @@ export type OAuthLoginResult = {
156173
socialLoginEmail: string;
157174
refreshToken: string;
158175
revokeToken: string;
176+
accessToken: string;
177+
metadataAccessToken: string;
159178
};
160179

161180
/**

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
"@metamask/rpc-errors": "^7.0.0",
330330
"@metamask/safe-event-emitter": "^3.1.1",
331331
"@metamask/scure-bip39": "^2.0.3",
332-
"@metamask/seedless-onboarding-controller": "^2.0.1",
332+
"@metamask/seedless-onboarding-controller": "npm:@metamask-previews/seedless-onboarding-controller@2.0.1-preview-c10fdda1",
333333
"@metamask/selected-network-controller": "^22.1.0",
334334
"@metamask/signature-controller": "^30.0.0",
335335
"@metamask/smart-transactions-controller": "^16.5.0",

yarn.lock

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5520,6 +5520,23 @@ __metadata:
55205520
languageName: node
55215521
linkType: hard
55225522

5523+
"@metamask/auth-network-utils@npm:^0.3.1":
5524+
version: 0.3.1
5525+
resolution: "@metamask/auth-network-utils@npm:0.3.1"
5526+
dependencies:
5527+
"@noble/curves": "npm:^1.8.1"
5528+
"@noble/hashes": "npm:^1.7.1"
5529+
"@toruslabs/bs58": "npm:^1.0.0"
5530+
"@toruslabs/constants": "npm:^15.0.0"
5531+
"@toruslabs/eccrypto": "npm:^6.1.0"
5532+
bn.js: "npm:^5.2.1"
5533+
elliptic: "npm:^6.6.1"
5534+
json-stable-stringify-without-jsonify: "npm:^1.0.1"
5535+
loglevel: "npm:^1.9.2"
5536+
checksum: 10/6b4f105b03e5231ae3ed448e8423cd6681e49db1be7ebe20232e0b5eee8bce08e3565dbe890837abc9158b417c65d06279b676f226c52ffc81ef5f50f6d87428
5537+
languageName: node
5538+
linkType: hard
5539+
55235540
"@metamask/auto-changelog@npm:^2.1.0":
55245541
version: 2.6.1
55255542
resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -7140,18 +7157,18 @@ __metadata:
71407157
languageName: node
71417158
linkType: hard
71427159

7143-
"@metamask/seedless-onboarding-controller@npm:^2.0.1":
7144-
version: 2.0.1
7145-
resolution: "@metamask/seedless-onboarding-controller@npm:2.0.1"
7160+
"@metamask/seedless-onboarding-controller@npm:@metamask-previews/seedless-onboarding-controller@2.0.1-preview-c10fdda1":
7161+
version: 2.0.1-preview-c10fdda1
7162+
resolution: "@metamask-previews/seedless-onboarding-controller@npm:2.0.1-preview-c10fdda1"
71467163
dependencies:
71477164
"@metamask/auth-network-utils": "npm:^0.3.0"
71487165
"@metamask/base-controller": "npm:^8.0.1"
7149-
"@metamask/toprf-secure-backup": "npm:^0.4.0"
7166+
"@metamask/toprf-secure-backup": "npm:^0.6.0"
71507167
"@metamask/utils": "npm:^11.4.2"
71517168
async-mutex: "npm:^0.5.0"
71527169
peerDependencies:
71537170
"@metamask/keyring-controller": ^22.0.0
7154-
checksum: 10/3a1e0dda8e323384e306ab5d72beb7af996d64a5778b49ce34bc404b492d8969490f5c70e813499736555821dcf9a6dd7bd07fcfe145bd8dafc72756f9cf5f29
7171+
checksum: 10/9903cdb6f36c222f5ecfcfeeef2d89d80ae1f8b2f6740fa50f0a66b4a1e98c49d5d53574b772cbd0b96d4ffd27cb238c1b2f10a0941e63eacf8072c3d2172985
71557172
languageName: node
71567173
linkType: hard
71577174

@@ -7527,11 +7544,11 @@ __metadata:
75277544
languageName: node
75287545
linkType: hard
75297546

7530-
"@metamask/toprf-secure-backup@npm:^0.4.0":
7531-
version: 0.4.0
7532-
resolution: "@metamask/toprf-secure-backup@npm:0.4.0"
7547+
"@metamask/toprf-secure-backup@npm:^0.6.0":
7548+
version: 0.6.0
7549+
resolution: "@metamask/toprf-secure-backup@npm:0.6.0"
75337550
dependencies:
7534-
"@metamask/auth-network-utils": "npm:^0.3.0"
7551+
"@metamask/auth-network-utils": "npm:^0.3.1"
75357552
"@noble/ciphers": "npm:^1.2.1"
75367553
"@noble/curves": "npm:^1.8.1"
75377554
"@noble/hashes": "npm:^1.7.1"
@@ -7541,7 +7558,7 @@ __metadata:
75417558
"@toruslabs/fetch-node-details": "npm:^15.0.0"
75427559
"@toruslabs/http-helpers": "npm:^8.1.1"
75437560
bn.js: "npm:^5.2.1"
7544-
checksum: 10/8aebf34e1051a2715bbbd5af576084b8c6eb4ecd1b8383e326aabf390c486d520746777d4fb0fd19078ca8f714e92b0a693795afe7acc38439d820ed22ec7a52
7561+
checksum: 10/2fd8a6147ed45adceb11b408478e160d01ce1e1ff841ff64dec78c4bbeed6ffe3679c1f0d5d6ef7db59abced6b42d9ef693595e0b659b869a0f94cdb41aed5bf
75457562
languageName: node
75467563
linkType: hard
75477564

@@ -31947,7 +31964,7 @@ __metadata:
3194731964
"@metamask/rpc-errors": "npm:^7.0.0"
3194831965
"@metamask/safe-event-emitter": "npm:^3.1.1"
3194931966
"@metamask/scure-bip39": "npm:^2.0.3"
31950-
"@metamask/seedless-onboarding-controller": "npm:^2.0.1"
31967+
"@metamask/seedless-onboarding-controller": "npm:@metamask-previews/seedless-onboarding-controller@2.0.1-preview-c10fdda1"
3195131968
"@metamask/selected-network-controller": "npm:^22.1.0"
3195231969
"@metamask/signature-controller": "npm:^30.0.0"
3195331970
"@metamask/smart-transactions-controller": "npm:^16.5.0"

0 commit comments

Comments
 (0)