@oxyhq/services 30.0.1 → 30.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/ui/components/OxySignInButton.js +7 -6
- package/lib/commonjs/ui/components/OxySignInButton.js.map +1 -1
- package/lib/commonjs/ui/oauth/oauthPopupMessages.js +9 -0
- package/lib/commonjs/ui/oauth/oauthPopupMessages.js.map +1 -1
- package/lib/commonjs/ui/screens/CreateAccountScreen.js +16 -8
- package/lib/commonjs/ui/screens/CreateAccountScreen.js.map +1 -1
- package/lib/module/ui/components/OxySignInButton.js +7 -6
- package/lib/module/ui/components/OxySignInButton.js.map +1 -1
- package/lib/module/ui/oauth/oauthPopupMessages.js +9 -0
- package/lib/module/ui/oauth/oauthPopupMessages.js.map +1 -1
- package/lib/module/ui/screens/CreateAccountScreen.js +16 -8
- package/lib/module/ui/screens/CreateAccountScreen.js.map +1 -1
- package/lib/typescript/commonjs/ui/components/OxySignInButton.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/oauth/oauthPopupMessages.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/CreateAccountScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/OxySignInButton.d.ts.map +1 -1
- package/lib/typescript/module/ui/oauth/oauthPopupMessages.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/CreateAccountScreen.d.ts.map +1 -1
- package/package.json +6 -4
- package/src/ui/components/OxySignInButton.tsx +7 -6
- package/src/ui/oauth/oauthPopupMessages.ts +9 -0
- package/src/ui/screens/CreateAccountScreen.tsx +22 -10
|
@@ -216,10 +216,11 @@ const OxySignInButton = ({
|
|
|
216
216
|
}, [clientId, oauthRedirectUri, onOAuthResult, startOfficialSignIn, startWebOAuthSignIn, shouldPreOpenPopup, notifyNotConfigured, notifyFailed]);
|
|
217
217
|
|
|
218
218
|
// Resolve the Application once, then route: third-party → OAuth; first-party
|
|
219
|
-
// / official
|
|
220
|
-
//
|
|
221
|
-
//
|
|
222
|
-
//
|
|
219
|
+
// / official → the in-app dialog. An unresolved client must fail closed:
|
|
220
|
+
// opening the privileged device-session dialog without a known first-party
|
|
221
|
+
// classification could downgrade a third-party OAuth + PKCE flow. Every path
|
|
222
|
+
// that does NOT reach the OAuth lane closes the pre-opened popup, so an
|
|
223
|
+
// aborted press can never leave an empty window on screen.
|
|
223
224
|
const routeSignIn = (0, _react.useCallback)(async popup => {
|
|
224
225
|
if (routingRef.current) {
|
|
225
226
|
(0, _oauthPopup.closeOAuthPopup)(popup);
|
|
@@ -238,11 +239,11 @@ const OxySignInButton = ({
|
|
|
238
239
|
app = await resolving;
|
|
239
240
|
} catch (error) {
|
|
240
241
|
(0, _oauthPopup.closeOAuthPopup)(popup);
|
|
241
|
-
_core.logger.warn('OxySignInButton: could not resolve the application;
|
|
242
|
+
_core.logger.warn('OxySignInButton: could not resolve the application; sign-in aborted', {
|
|
242
243
|
component: 'OxySignInButton',
|
|
243
244
|
clientId
|
|
244
245
|
}, error);
|
|
245
|
-
|
|
246
|
+
notifyFailed();
|
|
246
247
|
return;
|
|
247
248
|
}
|
|
248
249
|
if (app.type === 'third_party' && !app.isOfficial) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_core","_authStore","_shallow","_theme","_button","_toast","_OxyContext","_useI18n","_LogoIcon","_accountDialogManager","_oauthNavigation","_oauthPopup","_jsxRuntime","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","oauthRedirectUri","onOAuthResult","theme","useTheme","t","useI18n","openAccountDialog","oxyServices","clientId","webAuthMode","startWebOAuthSignIn","useOxy","isAuthenticated","isLoading","useAuthStore","useShallow","state","isModalOpen","setIsModalOpen","useState","useEffect","subscribeToAccountDialog","appResolutionRef","useRef","routingRef","shouldPreOpenPopup","Platform","OS","Boolean","resolvePublicApplication","useCallback","cached","current","promise","getPublicApplication","catch","error","notifyNotConfigured","appName","toast","description","app","notifyFailed","startOfficialSignIn","startThirdPartyOAuth","popup","closeOAuthPopup","logger","undefined","component","application","name","result","redirectUri","status","warn","reason","pkce","Promise","all","generatePkcePair","generateOAuthState","authorizeUrl","buildOAuthAuthorizeUrl","codeChallenge","redirectUrl","openAuthorizeUrlNative","codeVerifier","routeSignIn","resolving","type","isOfficial","Error","String","handlePress","openOAuthPopup","isButtonDisabled","buttonVariant","isContained","logoColor","colors","primary","logoLetterColor","label","jsx","Button","fontWeight","icon","LogoIcon","height","color","letterColor","marginRight","children","exports","_default","default"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_core","_authStore","_shallow","_theme","_button","_toast","_OxyContext","_useI18n","_LogoIcon","_accountDialogManager","_oauthNavigation","_oauthPopup","_jsxRuntime","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","oauthRedirectUri","onOAuthResult","theme","useTheme","t","useI18n","openAccountDialog","oxyServices","clientId","webAuthMode","startWebOAuthSignIn","useOxy","isAuthenticated","isLoading","useAuthStore","useShallow","state","isModalOpen","setIsModalOpen","useState","useEffect","subscribeToAccountDialog","appResolutionRef","useRef","routingRef","shouldPreOpenPopup","Platform","OS","Boolean","resolvePublicApplication","useCallback","cached","current","promise","getPublicApplication","catch","error","notifyNotConfigured","appName","toast","description","app","notifyFailed","startOfficialSignIn","startThirdPartyOAuth","popup","closeOAuthPopup","logger","undefined","component","application","name","result","redirectUri","status","warn","reason","pkce","Promise","all","generatePkcePair","generateOAuthState","authorizeUrl","buildOAuthAuthorizeUrl","codeChallenge","redirectUrl","openAuthorizeUrlNative","codeVerifier","routeSignIn","resolving","type","isOfficial","Error","String","handlePress","openOAuthPopup","isButtonDisabled","buttonVariant","isContained","logoColor","colors","primary","logoLetterColor","label","jsx","Button","fontWeight","icon","LogoIcon","height","color","letterColor","marginRight","children","exports","_default","default"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -94,6 +94,15 @@ function parseOAuthPopupMessage(data) {
|
|
|
94
94
|
* Never throws. See the module header for the acceptance rules.
|
|
95
95
|
*/
|
|
96
96
|
function readOAuthPopupMessage(event, context) {
|
|
97
|
+
// These two are a PAIR, and the source check is load-bearing rather than
|
|
98
|
+
// belt-and-braces. `expectedOrigin` is `new URL(authorizeUrl).origin`, and
|
|
99
|
+
// `authorizeBaseUrl` is app-configurable — a non-http(s) value makes that
|
|
100
|
+
// expression the literal string `"null"`, the opaque origin, which is also
|
|
101
|
+
// what a browser reports as `event.origin` for EVERY sandboxed iframe,
|
|
102
|
+
// `data:` document and `file:` page. The origin check stops discriminating at
|
|
103
|
+
// that point and the source check is the only thing still refusing them.
|
|
104
|
+
// Do not collapse them into one, and do not drop the source check as
|
|
105
|
+
// redundant with the origin check: it is not, in the one case that matters.
|
|
97
106
|
if (event.origin !== context.expectedOrigin) return {
|
|
98
107
|
kind: 'ignore'
|
|
99
108
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","OXY_OAUTH_CODE_MESSAGE_TYPE","exports","OXY_OAUTH_ERROR_MESSAGE_TYPE","isNonEmptyString","value","length","isSameWindowReference","a","b","parseOAuthPopupMessage","data","Array","isArray","record","type","code","state","error","errorDescription","readOAuthPopupMessage","event","context","origin","expectedOrigin","kind","source","popup","message","logger","debug","component","expectedState","undefined"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopupMessages.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_core","require","OXY_OAUTH_CODE_MESSAGE_TYPE","exports","OXY_OAUTH_ERROR_MESSAGE_TYPE","isNonEmptyString","value","length","isSameWindowReference","a","b","parseOAuthPopupMessage","data","Array","isArray","record","type","code","state","error","errorDescription","readOAuthPopupMessage","event","context","origin","expectedOrigin","kind","source","popup","message","logger","debug","component","expectedState","undefined"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopupMessages.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@ var _react = require("react");
|
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
9
|
var _Ionicons = _interopRequireDefault(require("@expo/vector-icons/Ionicons"));
|
|
10
10
|
var _core = require("@oxyhq/core");
|
|
11
|
+
var _contracts = require("@oxyhq/contracts");
|
|
11
12
|
var _useI18n = require("../hooks/useI18n.js");
|
|
12
13
|
var _useSurfaceHeader = require("../hooks/useSurfaceHeader.js");
|
|
13
14
|
var _theme = require("@oxyhq/bloom/theme");
|
|
@@ -37,9 +38,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
|
37
38
|
* inheriting the `project` label in {@link kindLabel}'s fallback.
|
|
38
39
|
*/
|
|
39
40
|
|
|
40
|
-
const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
|
|
41
41
|
const DEBOUNCE_MS = 400;
|
|
42
|
-
const USERNAME_MAX = 30;
|
|
43
42
|
const DISPLAY_NAME_MAX = _core.MAX_DISPLAY_NAME_LENGTH;
|
|
44
43
|
const BIO_MAX = 160;
|
|
45
44
|
// The creatable account kinds, matching the API `createAccountSchema` enum.
|
|
@@ -136,14 +135,19 @@ const CreateAccountScreen = ({
|
|
|
136
135
|
if (debounceTimerRef.current) {
|
|
137
136
|
clearTimeout(debounceTimerRef.current);
|
|
138
137
|
}
|
|
139
|
-
if (!value || value.length <
|
|
138
|
+
if (!value || value.length < _contracts.USERNAME_MIN_LENGTH) {
|
|
140
139
|
setUsernameStatus(value.length > 0 ? 'invalid' : 'idle');
|
|
141
|
-
setUsernameMessage(value.length > 0 ? t('accounts.create.username.tooShort') ||
|
|
140
|
+
setUsernameMessage(value.length > 0 ? t('accounts.create.username.tooShort') || `Username must be at least ${_contracts.USERNAME_MIN_LENGTH} characters` : '');
|
|
142
141
|
return;
|
|
143
142
|
}
|
|
144
|
-
|
|
143
|
+
|
|
144
|
+
// The ONE policy, from `@oxyhq/contracts`. This screen used to carry a
|
|
145
|
+
// private copy of the rule, and the server it talks to enforced a LOOSER one
|
|
146
|
+
// — so a name this field refused was a name `POST /accounts` would happily
|
|
147
|
+
// have stored.
|
|
148
|
+
if (!(0, _contracts.isValidUsername)(value)) {
|
|
145
149
|
setUsernameStatus('invalid');
|
|
146
|
-
setUsernameMessage(t('accounts.create.username.invalidChars') ||
|
|
150
|
+
setUsernameMessage(t('accounts.create.username.invalidChars') || _contracts.USERNAME_INVALID_MESSAGE);
|
|
147
151
|
return;
|
|
148
152
|
}
|
|
149
153
|
setUsernameStatus('checking');
|
|
@@ -163,7 +167,11 @@ const CreateAccountScreen = ({
|
|
|
163
167
|
}, DEBOUNCE_MS);
|
|
164
168
|
}, [oxyServices, t]);
|
|
165
169
|
const handleUsernameChange = (0, _react.useCallback)(value => {
|
|
166
|
-
|
|
170
|
+
// Filters characters the policy forbids, and nothing else. It no longer
|
|
171
|
+
// lower-cases: `MyBot` is stored as `MyBot`, and uniqueness is decided
|
|
172
|
+
// case-insensitively by the database index rather than by rewriting what
|
|
173
|
+
// somebody typed.
|
|
174
|
+
const cleaned = (0, _contracts.stripDisallowedUsernameCharacters)(value);
|
|
167
175
|
setUsername(cleaned);
|
|
168
176
|
checkUsername(cleaned);
|
|
169
177
|
}, [checkUsername]);
|
|
@@ -314,7 +322,7 @@ const CreateAccountScreen = ({
|
|
|
314
322
|
autoCapitalize: "none",
|
|
315
323
|
autoCorrect: false,
|
|
316
324
|
autoComplete: "off",
|
|
317
|
-
maxLength:
|
|
325
|
+
maxLength: _contracts.USERNAME_MAX_LENGTH
|
|
318
326
|
})
|
|
319
327
|
}), usernameStatus === 'checking' || usernameMessage ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
320
328
|
className: "flex-row items-center gap-space-4 px-space-4",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_Ionicons","_interopRequireDefault","_core","_useI18n","_useSurfaceHeader","_theme","_typography","_button","_textField","_settingsList","_OxyContext","_toast","_jsxRuntime","e","__esModule","default","USERNAME_REGEX","DEBOUNCE_MS","USERNAME_MAX","DISPLAY_NAME_MAX","MAX_DISPLAY_NAME_LENGTH","BIO_MAX","KIND_OPTIONS","value","icon","kindLabel","t","kind","kindDescription","ACCOUNT_CATEGORY_OPTIONS","SELECTABLE_ACCOUNT_CATEGORY_IDS","CreateAccountScreen","onClose","goBack","parentAccountId","bloomTheme","useTheme","oxyServices","createAccount","switchToAccount","useOxy","locale","useI18n","useSurfaceHeader","title","subtitle","parentId","undefined","setKind","useState","accountCategories","setAccountCategories","username","setUsername","displayName","setDisplayName","displayNameError","setDisplayNameError","bio","setBio","usernameStatus","setUsernameStatus","usernameMessage","setUsernameMessage","isCreating","setIsCreating","debounceTimerRef","useRef","usernameCheckSeqRef","useEffect","current","clearTimeout","checkUsername","useCallback","length","test","seq","setTimeout","result","checkUsernameAvailability","available","message","handleUsernameChange","cleaned","toLowerCase","replace","handleDisplayNameChange","trimmed","trim","nameParts","split","firstName","lastName","slice","join","invalidPart","find","part","isValidDisplayName","DISPLAY_NAME_INVALID_MESSAGE","toggleAccountCategory","category","includes","filter","entry","MAX_ACCOUNT_CATEGORIES","canCreate","handleCreate","input","name","account","toast","success","accountId","catch","error","Error","usernameIsInvalid","statusColor","colors","negative","textSecondary","jsxs","View","className","children","jsx","SettingsListGroup","map","option","selected","SettingsListItem","size","color","primary","description","onPress","showChevron","rightElement","accessibilityLabel","position","indexOf","label","accountCategoryLabel","disabled","Text","max","TextField","isInvalid","TextFieldInput","floatingLabel","onChangeText","autoCapitalize","autoCorrect","autoComplete","maxLength","ActivityIndicator","style","Boolean","multiline","numberOfLines","textAlignVertical","Button","variant","loading","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/CreateAccountScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_Ionicons","_interopRequireDefault","_core","_contracts","_useI18n","_useSurfaceHeader","_theme","_typography","_button","_textField","_settingsList","_OxyContext","_toast","_jsxRuntime","e","__esModule","default","DEBOUNCE_MS","DISPLAY_NAME_MAX","MAX_DISPLAY_NAME_LENGTH","BIO_MAX","KIND_OPTIONS","value","icon","kindLabel","t","kind","kindDescription","ACCOUNT_CATEGORY_OPTIONS","SELECTABLE_ACCOUNT_CATEGORY_IDS","CreateAccountScreen","onClose","goBack","parentAccountId","bloomTheme","useTheme","oxyServices","createAccount","switchToAccount","useOxy","locale","useI18n","useSurfaceHeader","title","subtitle","parentId","undefined","setKind","useState","accountCategories","setAccountCategories","username","setUsername","displayName","setDisplayName","displayNameError","setDisplayNameError","bio","setBio","usernameStatus","setUsernameStatus","usernameMessage","setUsernameMessage","isCreating","setIsCreating","debounceTimerRef","useRef","usernameCheckSeqRef","useEffect","current","clearTimeout","checkUsername","useCallback","length","USERNAME_MIN_LENGTH","isValidUsername","USERNAME_INVALID_MESSAGE","seq","setTimeout","result","checkUsernameAvailability","available","message","handleUsernameChange","cleaned","stripDisallowedUsernameCharacters","handleDisplayNameChange","trimmed","trim","nameParts","split","firstName","lastName","slice","join","invalidPart","find","part","isValidDisplayName","DISPLAY_NAME_INVALID_MESSAGE","toggleAccountCategory","category","includes","filter","entry","MAX_ACCOUNT_CATEGORIES","canCreate","handleCreate","input","name","account","toast","success","accountId","catch","error","Error","usernameIsInvalid","statusColor","colors","negative","textSecondary","jsxs","View","className","children","jsx","SettingsListGroup","map","option","selected","SettingsListItem","size","color","primary","description","onPress","showChevron","rightElement","accessibilityLabel","position","indexOf","label","accountCategoryLabel","disabled","Text","max","TextField","isInvalid","TextFieldInput","floatingLabel","onChangeText","autoCapitalize","autoCorrect","autoComplete","maxLength","USERNAME_MAX_LENGTH","ActivityIndicator","style","Boolean","multiline","numberOfLines","textAlignVertical","Button","variant","loading","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/screens/CreateAccountScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -212,10 +212,11 @@ export const OxySignInButton = ({
|
|
|
212
212
|
}, [clientId, oauthRedirectUri, onOAuthResult, startOfficialSignIn, startWebOAuthSignIn, shouldPreOpenPopup, notifyNotConfigured, notifyFailed]);
|
|
213
213
|
|
|
214
214
|
// Resolve the Application once, then route: third-party → OAuth; first-party
|
|
215
|
-
// / official
|
|
216
|
-
//
|
|
217
|
-
//
|
|
218
|
-
//
|
|
215
|
+
// / official → the in-app dialog. An unresolved client must fail closed:
|
|
216
|
+
// opening the privileged device-session dialog without a known first-party
|
|
217
|
+
// classification could downgrade a third-party OAuth + PKCE flow. Every path
|
|
218
|
+
// that does NOT reach the OAuth lane closes the pre-opened popup, so an
|
|
219
|
+
// aborted press can never leave an empty window on screen.
|
|
219
220
|
const routeSignIn = useCallback(async popup => {
|
|
220
221
|
if (routingRef.current) {
|
|
221
222
|
closeOAuthPopup(popup);
|
|
@@ -234,11 +235,11 @@ export const OxySignInButton = ({
|
|
|
234
235
|
app = await resolving;
|
|
235
236
|
} catch (error) {
|
|
236
237
|
closeOAuthPopup(popup);
|
|
237
|
-
logger.warn('OxySignInButton: could not resolve the application;
|
|
238
|
+
logger.warn('OxySignInButton: could not resolve the application; sign-in aborted', {
|
|
238
239
|
component: 'OxySignInButton',
|
|
239
240
|
clientId
|
|
240
241
|
}, error);
|
|
241
|
-
|
|
242
|
+
notifyFailed();
|
|
242
243
|
return;
|
|
243
244
|
}
|
|
244
245
|
if (app.type === 'third_party' && !app.isOfficial) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useState","useEffect","useRef","Platform","logger","generatePkcePair","generateOAuthState","buildOAuthAuthorizeUrl","useAuthStore","useShallow","useTheme","Button","toast","useOxy","useI18n","LogoIcon","subscribeToAccountDialog","openAuthorizeUrlNative","closeOAuthPopup","openOAuthPopup","jsx","_jsx","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","oauthRedirectUri","onOAuthResult","theme","t","openAccountDialog","oxyServices","clientId","webAuthMode","startWebOAuthSignIn","isAuthenticated","isLoading","state","isModalOpen","setIsModalOpen","appResolutionRef","routingRef","shouldPreOpenPopup","OS","Boolean","resolvePublicApplication","cached","current","promise","getPublicApplication","catch","error","notifyNotConfigured","appName","description","app","notifyFailed","startOfficialSignIn","startThirdPartyOAuth","popup","undefined","component","application","name","result","redirectUri","status","warn","reason","pkce","Promise","all","authorizeUrl","codeChallenge","redirectUrl","codeVerifier","routeSignIn","resolving","type","isOfficial","Error","String","handlePress","isButtonDisabled","buttonVariant","isContained","logoColor","colors","primary","logoLetterColor","label","fontWeight","icon","height","color","letterColor","marginRight","children"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":";;AACA,SAASA,WAAW,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChE,SAAyDC,QAAQ,QAAQ,cAAc;AACvF,SACIC,MAAM,EACNC,gBAAgB,EAChBC,kBAAkB,EAClBC,sBAAsB,QAEnB,aAAa;AACpB,SAASC,YAAY,QAAQ,wBAAqB;AAClD,SAASC,UAAU,QAAQ,uBAAuB;AAClD,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,MAAM,QAA4B,qBAAqB;AAChE,SAASC,KAAK,QAAQ,oBAAoB;AAC1C,SAASC,MAAM,QAAQ,0BAAuB;AAC9C,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,QAAQ,QAAQ,oBAAiB;AAC1C,SAASC,wBAAwB,QAAQ,uCAAoC;AAC7E,SAASC,sBAAsB,QAAQ,sBAAmB;AAC1D,SAASC,eAAe,EAAEC,cAAc,QAAQ,wBAAqB;;AAGrE;AACA;AACA;AACA;AACA;AACA;AALA,SAAAC,GAAA,IAAAC,IAAA;AA8FA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAA+C,GAAGA,CAAC;EAC5DC,OAAO,GAAG,SAAS;EACnBC,OAAO;EACPC,KAAK;EACLC,SAAS;EACTC,IAAI;EACJC,QAAQ,GAAG,KAAK;EAChBC,qBAAqB,GAAG,KAAK;EAC7BC,gBAAgB;EAChBC;AACJ,CAAC,KAAK;EACF,MAAMC,KAAK,GAAGtB,QAAQ,CAAC,CAAC;EACxB,MAAM;IAAEuB;EAAE,CAAC,GAAGnB,OAAO,CAAC,CAAC;EACvB,MAAM;IAAEoB,iBAAiB;IAAEC,WAAW;IAAEC,QAAQ;IAAEC,WAAW;IAAEC;EAAoB,CAAC,GAAGzB,MAAM,CAAC,CAAC;EAC/F,MAAM;IAAE0B,eAAe;IAAEC;EAAU,CAAC,GAAGhC,YAAY,CAC/CC,UAAU,CAAEgC,KAAK,KAAM;IAAEF,eAAe,EAAEE,KAAK,CAACF,eAAe;IAAEC,SAAS,EAAEC,KAAK,CAACD;EAAU,CAAC,CAAC,CAClG,CAAC;EACD;EACA;EACA;EACA,MAAM,CAACE,WAAW,EAAEC,cAAc,CAAC,GAAG3C,QAAQ,CAAC,KAAK,CAAC;EAErDC,SAAS,CAAC,MAAMe,wBAAwB,CAAC2B,cAAc,CAAC,EAAE,EAAE,CAAC;;EAE7D;EACA;EACA;EACA;EACA;EACA,MAAMC,gBAAgB,GAAG1C,MAAM,CAIrB,IAAI,CAAC;EACf;EACA;EACA;EACA,MAAM2C,UAAU,GAAG3C,MAAM,CAAC,KAAK,CAAC;EAChC;EACA;EACA;EACA;EACA,MAAM4C,kBAAkB,GACpB3C,QAAQ,CAAC4C,EAAE,KAAK,KAAK,IAAIV,WAAW,KAAK,OAAO,IAAIW,OAAO,CAAClB,gBAAgB,CAAC;EAEjF,MAAMmB,wBAAwB,GAAGlD,WAAW,CAAC,MAAyC;IAClF,IAAI,CAACqC,QAAQ,EAAE,OAAO,IAAI;IAC1B,MAAMc,MAAM,GAAGN,gBAAgB,CAACO,OAAO;IACvC,IAAID,MAAM,IAAIA,MAAM,CAACd,QAAQ,KAAKA,QAAQ,IAAIc,MAAM,CAACf,WAAW,KAAKA,WAAW,EAAE;MAC9E,OAAOe,MAAM,CAACE,OAAO;IACzB;IACA,MAAMA,OAAO,GAAGjB,WAAW,CAACkB,oBAAoB,CAACjB,QAAQ,CAAC,CAACkB,KAAK,CAAEC,KAAK,IAAK;MACxE;MACA;MACA,IAAIX,gBAAgB,CAACO,OAAO,EAAEC,OAAO,KAAKA,OAAO,EAAE;QAC/CR,gBAAgB,CAACO,OAAO,GAAG,IAAI;MACnC;MACA,MAAMI,KAAK;IACf,CAAC,CAAC;IACFX,gBAAgB,CAACO,OAAO,GAAG;MAAEf,QAAQ;MAAED,WAAW;MAAEiB;IAAQ,CAAC;IAC7D,OAAOA,OAAO;EAClB,CAAC,EAAE,CAAChB,QAAQ,EAAED,WAAW,CAAC,CAAC;;EAE3B;EACA;EACA;EACA;EACA,MAAMqB,mBAAmB,GAAGzD,WAAW,CAClC0D,OAAe,IAAK;IACjB7C,KAAK,CAAC2C,KAAK,CAACtB,CAAC,CAAC,6BAA6B,CAAC,EAAE;MAC1CyB,WAAW,EAAEzB,CAAC,CAAC,wCAAwC,EAAE;QAAE0B,GAAG,EAAEF;MAAQ,CAAC;IAC7E,CAAC,CAAC;EACN,CAAC,EACD,CAACxB,CAAC,CACN,CAAC;EACD,MAAM2B,YAAY,GAAG7D,WAAW,CAAC,MAAM;IACnCa,KAAK,CAAC2C,KAAK,CAACtB,CAAC,CAAC,sBAAsB,CAAC,EAAE;MACnCyB,WAAW,EAAEzB,CAAC,CAAC,iCAAiC;IACpD,CAAC,CAAC;EACN,CAAC,EAAE,CAACA,CAAC,CAAC,CAAC;;EAEP;EACA,MAAM4B,mBAAmB,GAAG9D,WAAW,CAAC,MAAM;IAC1CmC,iBAAiB,CAAC,QAAQ,CAAC;EAC/B,CAAC,EAAE,CAACA,iBAAiB,CAAC,CAAC;;EAEvB;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAM4B,oBAAoB,GAAG/D,WAAW,CACpC,OAAO4D,GAAsB,EAAEI,KAA8B,KAAoB;IAC7E,IAAI,CAAC3B,QAAQ,EAAE;MACXlB,eAAe,CAAC6C,KAAK,CAAC;MACtBF,mBAAmB,CAAC,CAAC;MACrB;IACJ;IACA,IAAI,CAAC/B,gBAAgB,EAAE;MACnBZ,eAAe,CAAC6C,KAAK,CAAC;MACtB3D,MAAM,CAACmD,KAAK,CACR,0HAA0H,EAC1HS,SAAS,EACT;QAAEC,SAAS,EAAE,iBAAiB;QAAE7B,QAAQ;QAAE8B,WAAW,EAAEP,GAAG,CAACQ;MAAK,CACpE,CAAC;MACDX,mBAAmB,CAACG,GAAG,CAACQ,IAAI,CAAC;MAC7B;IACJ;IAEA,IAAIhE,QAAQ,CAAC4C,EAAE,KAAK,KAAK,EAAE;MACvB,MAAMqB,MAAM,GAAG,MAAM9B,mBAAmB,CAAC;QACrC+B,WAAW,EAAEvC,gBAAgB;QAC7B;QACA;QACA;QACA;QACA,IAAIgB,kBAAkB,GAAG;UAAEiB;QAAM,CAAC,GAAG,CAAC,CAAC;MAC3C,CAAC,CAAC;MACF,IAAIK,MAAM,CAACE,MAAM,KAAK,QAAQ,EAAE;QAC5BlE,MAAM,CAACmE,IAAI,CACP,wCAAwCH,MAAM,CAACI,MAAM,GAAG,EACxD;UAAEP,SAAS,EAAE,iBAAiB;UAAEC,WAAW,EAAEP,GAAG,CAACQ;QAAK,CAAC,EACvDC,MAAM,CAACV,WACX,CAAC;QACDE,YAAY,CAAC,CAAC;MAClB;MACA;IACJ;;IAEA;IACA;IACA,MAAM,CAACa,IAAI,EAAEhC,KAAK,CAAC,GAAG,MAAMiC,OAAO,CAACC,GAAG,CAAC,CAACtE,gBAAgB,CAAC,CAAC,EAAEC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACnF,MAAMsE,YAAY,GAAGrE,sBAAsB,CAAC;MACxC6B,QAAQ;MACRiC,WAAW,EAAEvC,gBAAgB;MAC7BW,KAAK;MACLoC,aAAa,EAAEJ,IAAI,CAACI;IACxB,CAAC,CAAC;IACF,MAAM;MAAEC;IAAY,CAAC,GAAG,MAAM7D,sBAAsB,CAAC2D,YAAY,EAAE9C,gBAAgB,CAAC;IACpF,IAAIC,aAAa,EAAE;MACfA,aAAa,CAAC;QAAE+C,WAAW;QAAErC,KAAK;QAAEsC,YAAY,EAAEN,IAAI,CAACM;MAAa,CAAC,CAAC;MACtE;IACJ;IACA3E,MAAM,CAACmE,IAAI,CACP,yLAAyL,EACzL;MAAEN,SAAS,EAAE,iBAAiB;MAAEC,WAAW,EAAEP,GAAG,CAACQ;IAAK,CAC1D,CAAC;IACDX,mBAAmB,CAACG,GAAG,CAACQ,IAAI,CAAC;EACjC,CAAC,EACD,CACI/B,QAAQ,EACRN,gBAAgB,EAChBC,aAAa,EACb8B,mBAAmB,EACnBvB,mBAAmB,EACnBQ,kBAAkB,EAClBU,mBAAmB,EACnBI,YAAY,CAEpB,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA,MAAMoB,WAAW,GAAGjF,WAAW,CAC3B,MAAOgE,KAA8B,IAAoB;IACrD,IAAIlB,UAAU,CAACM,OAAO,EAAE;MACpBjC,eAAe,CAAC6C,KAAK,CAAC;MACtB;IACJ;IACAlB,UAAU,CAACM,OAAO,GAAG,IAAI;IACzB,IAAI;MACA,MAAM8B,SAAS,GAAGhC,wBAAwB,CAAC,CAAC;MAC5C,IAAI,CAACgC,SAAS,EAAE;QACZ/D,eAAe,CAAC6C,KAAK,CAAC;QACtBF,mBAAmB,CAAC,CAAC;QACrB;MACJ;MACA,IAAIF,GAAsB;MAC1B,IAAI;QACAA,GAAG,GAAG,MAAMsB,SAAS;MACzB,CAAC,CAAC,OAAO1B,KAAK,EAAE;QACZrC,eAAe,CAAC6C,KAAK,CAAC;QACtB3D,MAAM,CAACmE,IAAI,CACP,
|
|
1
|
+
{"version":3,"names":["useCallback","useState","useEffect","useRef","Platform","logger","generatePkcePair","generateOAuthState","buildOAuthAuthorizeUrl","useAuthStore","useShallow","useTheme","Button","toast","useOxy","useI18n","LogoIcon","subscribeToAccountDialog","openAuthorizeUrlNative","closeOAuthPopup","openOAuthPopup","jsx","_jsx","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","oauthRedirectUri","onOAuthResult","theme","t","openAccountDialog","oxyServices","clientId","webAuthMode","startWebOAuthSignIn","isAuthenticated","isLoading","state","isModalOpen","setIsModalOpen","appResolutionRef","routingRef","shouldPreOpenPopup","OS","Boolean","resolvePublicApplication","cached","current","promise","getPublicApplication","catch","error","notifyNotConfigured","appName","description","app","notifyFailed","startOfficialSignIn","startThirdPartyOAuth","popup","undefined","component","application","name","result","redirectUri","status","warn","reason","pkce","Promise","all","authorizeUrl","codeChallenge","redirectUrl","codeVerifier","routeSignIn","resolving","type","isOfficial","Error","String","handlePress","isButtonDisabled","buttonVariant","isContained","logoColor","colors","primary","logoLetterColor","label","fontWeight","icon","height","color","letterColor","marginRight","children"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -88,6 +88,15 @@ export function parseOAuthPopupMessage(data) {
|
|
|
88
88
|
* Never throws. See the module header for the acceptance rules.
|
|
89
89
|
*/
|
|
90
90
|
export function readOAuthPopupMessage(event, context) {
|
|
91
|
+
// These two are a PAIR, and the source check is load-bearing rather than
|
|
92
|
+
// belt-and-braces. `expectedOrigin` is `new URL(authorizeUrl).origin`, and
|
|
93
|
+
// `authorizeBaseUrl` is app-configurable — a non-http(s) value makes that
|
|
94
|
+
// expression the literal string `"null"`, the opaque origin, which is also
|
|
95
|
+
// what a browser reports as `event.origin` for EVERY sandboxed iframe,
|
|
96
|
+
// `data:` document and `file:` page. The origin check stops discriminating at
|
|
97
|
+
// that point and the source check is the only thing still refusing them.
|
|
98
|
+
// Do not collapse them into one, and do not drop the source check as
|
|
99
|
+
// redundant with the origin check: it is not, in the one case that matters.
|
|
91
100
|
if (event.origin !== context.expectedOrigin) return {
|
|
92
101
|
kind: 'ignore'
|
|
93
102
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["logger","OXY_OAUTH_CODE_MESSAGE_TYPE","OXY_OAUTH_ERROR_MESSAGE_TYPE","isNonEmptyString","value","length","isSameWindowReference","a","b","parseOAuthPopupMessage","data","Array","isArray","record","type","code","state","error","errorDescription","readOAuthPopupMessage","event","context","origin","expectedOrigin","kind","source","popup","message","debug","component","expectedState","undefined"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopupMessages.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["logger","OXY_OAUTH_CODE_MESSAGE_TYPE","OXY_OAUTH_ERROR_MESSAGE_TYPE","isNonEmptyString","value","length","isSameWindowReference","a","b","parseOAuthPopupMessage","data","Array","isArray","record","type","code","state","error","errorDescription","readOAuthPopupMessage","event","context","origin","expectedOrigin","kind","source","popup","message","debug","component","expectedState","undefined"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopupMessages.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,6 +4,7 @@ import { useState, useCallback, useRef, useEffect } from 'react';
|
|
|
4
4
|
import { View, ActivityIndicator } from 'react-native';
|
|
5
5
|
import Ionicons from '@expo/vector-icons/Ionicons';
|
|
6
6
|
import { accountCategoryLabel, DISPLAY_NAME_INVALID_MESSAGE, isValidDisplayName, MAX_ACCOUNT_CATEGORIES, MAX_DISPLAY_NAME_LENGTH, SELECTABLE_ACCOUNT_CATEGORY_IDS } from '@oxyhq/core';
|
|
7
|
+
import { isValidUsername, stripDisallowedUsernameCharacters, USERNAME_INVALID_MESSAGE, USERNAME_MAX_LENGTH, USERNAME_MIN_LENGTH } from '@oxyhq/contracts';
|
|
7
8
|
import { useI18n } from "../hooks/useI18n.js";
|
|
8
9
|
import { useSurfaceHeader } from "../hooks/useSurfaceHeader.js";
|
|
9
10
|
import { useTheme } from '@oxyhq/bloom/theme';
|
|
@@ -32,9 +33,7 @@ import { toast } from '@oxyhq/bloom/toast';
|
|
|
32
33
|
* inheriting the `project` label in {@link kindLabel}'s fallback.
|
|
33
34
|
*/
|
|
34
35
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
35
|
-
const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
|
|
36
36
|
const DEBOUNCE_MS = 400;
|
|
37
|
-
const USERNAME_MAX = 30;
|
|
38
37
|
const DISPLAY_NAME_MAX = MAX_DISPLAY_NAME_LENGTH;
|
|
39
38
|
const BIO_MAX = 160;
|
|
40
39
|
// The creatable account kinds, matching the API `createAccountSchema` enum.
|
|
@@ -131,14 +130,19 @@ const CreateAccountScreen = ({
|
|
|
131
130
|
if (debounceTimerRef.current) {
|
|
132
131
|
clearTimeout(debounceTimerRef.current);
|
|
133
132
|
}
|
|
134
|
-
if (!value || value.length <
|
|
133
|
+
if (!value || value.length < USERNAME_MIN_LENGTH) {
|
|
135
134
|
setUsernameStatus(value.length > 0 ? 'invalid' : 'idle');
|
|
136
|
-
setUsernameMessage(value.length > 0 ? t('accounts.create.username.tooShort') ||
|
|
135
|
+
setUsernameMessage(value.length > 0 ? t('accounts.create.username.tooShort') || `Username must be at least ${USERNAME_MIN_LENGTH} characters` : '');
|
|
137
136
|
return;
|
|
138
137
|
}
|
|
139
|
-
|
|
138
|
+
|
|
139
|
+
// The ONE policy, from `@oxyhq/contracts`. This screen used to carry a
|
|
140
|
+
// private copy of the rule, and the server it talks to enforced a LOOSER one
|
|
141
|
+
// — so a name this field refused was a name `POST /accounts` would happily
|
|
142
|
+
// have stored.
|
|
143
|
+
if (!isValidUsername(value)) {
|
|
140
144
|
setUsernameStatus('invalid');
|
|
141
|
-
setUsernameMessage(t('accounts.create.username.invalidChars') ||
|
|
145
|
+
setUsernameMessage(t('accounts.create.username.invalidChars') || USERNAME_INVALID_MESSAGE);
|
|
142
146
|
return;
|
|
143
147
|
}
|
|
144
148
|
setUsernameStatus('checking');
|
|
@@ -158,7 +162,11 @@ const CreateAccountScreen = ({
|
|
|
158
162
|
}, DEBOUNCE_MS);
|
|
159
163
|
}, [oxyServices, t]);
|
|
160
164
|
const handleUsernameChange = useCallback(value => {
|
|
161
|
-
|
|
165
|
+
// Filters characters the policy forbids, and nothing else. It no longer
|
|
166
|
+
// lower-cases: `MyBot` is stored as `MyBot`, and uniqueness is decided
|
|
167
|
+
// case-insensitively by the database index rather than by rewriting what
|
|
168
|
+
// somebody typed.
|
|
169
|
+
const cleaned = stripDisallowedUsernameCharacters(value);
|
|
162
170
|
setUsername(cleaned);
|
|
163
171
|
checkUsername(cleaned);
|
|
164
172
|
}, [checkUsername]);
|
|
@@ -309,7 +317,7 @@ const CreateAccountScreen = ({
|
|
|
309
317
|
autoCapitalize: "none",
|
|
310
318
|
autoCorrect: false,
|
|
311
319
|
autoComplete: "off",
|
|
312
|
-
maxLength:
|
|
320
|
+
maxLength: USERNAME_MAX_LENGTH
|
|
313
321
|
})
|
|
314
322
|
}), usernameStatus === 'checking' || usernameMessage ? /*#__PURE__*/_jsxs(View, {
|
|
315
323
|
className: "flex-row items-center gap-space-4 px-space-4",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useState","useCallback","useRef","useEffect","View","ActivityIndicator","Ionicons","accountCategoryLabel","DISPLAY_NAME_INVALID_MESSAGE","isValidDisplayName","MAX_ACCOUNT_CATEGORIES","MAX_DISPLAY_NAME_LENGTH","SELECTABLE_ACCOUNT_CATEGORY_IDS","useI18n","useSurfaceHeader","useTheme","Text","Button","TextField","TextFieldInput","SettingsListGroup","SettingsListItem","useOxy","toast","jsx","_jsx","jsxs","_jsxs","USERNAME_REGEX","DEBOUNCE_MS","USERNAME_MAX","DISPLAY_NAME_MAX","BIO_MAX","KIND_OPTIONS","value","icon","kindLabel","t","kind","kindDescription","ACCOUNT_CATEGORY_OPTIONS","CreateAccountScreen","onClose","goBack","parentAccountId","bloomTheme","oxyServices","createAccount","switchToAccount","locale","title","subtitle","parentId","undefined","setKind","accountCategories","setAccountCategories","username","setUsername","displayName","setDisplayName","displayNameError","setDisplayNameError","bio","setBio","usernameStatus","setUsernameStatus","usernameMessage","setUsernameMessage","isCreating","setIsCreating","debounceTimerRef","usernameCheckSeqRef","current","clearTimeout","checkUsername","length","test","seq","setTimeout","result","checkUsernameAvailability","available","message","handleUsernameChange","cleaned","toLowerCase","replace","handleDisplayNameChange","trimmed","trim","nameParts","split","firstName","lastName","slice","join","invalidPart","find","part","toggleAccountCategory","category","includes","filter","entry","canCreate","handleCreate","input","name","account","success","accountId","catch","error","Error","usernameIsInvalid","statusColor","colors","negative","textSecondary","className","children","map","option","selected","size","color","primary","description","onPress","showChevron","rightElement","accessibilityLabel","position","indexOf","label","disabled","max","isInvalid","floatingLabel","onChangeText","autoCapitalize","autoCorrect","autoComplete","maxLength","style","Boolean","multiline","numberOfLines","textAlignVertical","variant","loading"],"sourceRoot":"../../../../src","sources":["ui/screens/CreateAccountScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useState","useCallback","useRef","useEffect","View","ActivityIndicator","Ionicons","accountCategoryLabel","DISPLAY_NAME_INVALID_MESSAGE","isValidDisplayName","MAX_ACCOUNT_CATEGORIES","MAX_DISPLAY_NAME_LENGTH","SELECTABLE_ACCOUNT_CATEGORY_IDS","isValidUsername","stripDisallowedUsernameCharacters","USERNAME_INVALID_MESSAGE","USERNAME_MAX_LENGTH","USERNAME_MIN_LENGTH","useI18n","useSurfaceHeader","useTheme","Text","Button","TextField","TextFieldInput","SettingsListGroup","SettingsListItem","useOxy","toast","jsx","_jsx","jsxs","_jsxs","DEBOUNCE_MS","DISPLAY_NAME_MAX","BIO_MAX","KIND_OPTIONS","value","icon","kindLabel","t","kind","kindDescription","ACCOUNT_CATEGORY_OPTIONS","CreateAccountScreen","onClose","goBack","parentAccountId","bloomTheme","oxyServices","createAccount","switchToAccount","locale","title","subtitle","parentId","undefined","setKind","accountCategories","setAccountCategories","username","setUsername","displayName","setDisplayName","displayNameError","setDisplayNameError","bio","setBio","usernameStatus","setUsernameStatus","usernameMessage","setUsernameMessage","isCreating","setIsCreating","debounceTimerRef","usernameCheckSeqRef","current","clearTimeout","checkUsername","length","seq","setTimeout","result","checkUsernameAvailability","available","message","handleUsernameChange","cleaned","handleDisplayNameChange","trimmed","trim","nameParts","split","firstName","lastName","slice","join","invalidPart","find","part","toggleAccountCategory","category","includes","filter","entry","canCreate","handleCreate","input","name","account","success","accountId","catch","error","Error","usernameIsInvalid","statusColor","colors","negative","textSecondary","className","children","map","option","selected","size","color","primary","description","onPress","showChevron","rightElement","accessibilityLabel","position","indexOf","label","disabled","max","isInvalid","floatingLabel","onChangeText","autoCapitalize","autoCorrect","autoComplete","maxLength","style","Boolean","multiline","numberOfLines","textAlignVertical","variant","loading"],"sourceRoot":"../../../../src","sources":["ui/screens/CreateAccountScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxySignInButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxySignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAY,MAAM,cAAc,CAAC;AAqBxF;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC3B,sGAAsG;IACtG,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sFAAsF;IACtF,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;IAE9C;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"OxySignInButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxySignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAY,MAAM,cAAc,CAAC;AAqBxF;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC3B,sGAAsG;IACtG,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sFAAsF;IACtF,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;IAE9C;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAuR1D,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthPopupMessages.d.ts","sourceRoot":"","sources":["../../../../../src/ui/oauth/oauthPopupMessages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,kEAAkE;AAClE,eAAO,MAAM,2BAA2B,mBAAmB,CAAC;AAE5D,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,oBAAoB,CAAC;AAE9D,gDAAgD;AAChD,MAAM,MAAM,wBAAwB;AAClC,4EAA4E;AAC1E;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE;AACnE,+EAA+E;GAC7E;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,qEAAqE;AACrE,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAsB5E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"oauthPopupMessages.d.ts","sourceRoot":"","sources":["../../../../../src/ui/oauth/oauthPopupMessages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEjE,kEAAkE;AAClE,eAAO,MAAM,2BAA2B,mBAAmB,CAAC;AAE5D,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,oBAAoB,CAAC;AAE9D,gDAAgD;AAChD,MAAM,MAAM,wBAAwB;AAClC,4EAA4E;AAC1E;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE;AACnE,+EAA+E;GAC7E;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,qEAAqE;AACrE,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAsB5E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAwC1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyVlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxySignInButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxySignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAY,MAAM,cAAc,CAAC;AAqBxF;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC3B,sGAAsG;IACtG,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sFAAsF;IACtF,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;IAE9C;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"OxySignInButton.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxySignInButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAY,MAAM,cAAc,CAAC;AAqBxF;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC3B,sGAAsG;IACtG,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,sFAAsF;IACtF,KAAK,EAAE,MAAM,CAAC;IACd,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;IAE9C;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAEjC;;;;;;;OAOG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAuR1D,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthPopupMessages.d.ts","sourceRoot":"","sources":["../../../../../src/ui/oauth/oauthPopupMessages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAS,CAAC;AAEjE,kEAAkE;AAClE,eAAO,MAAM,2BAA2B,mBAAmB,CAAC;AAE5D,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,oBAAoB,CAAC;AAE9D,gDAAgD;AAChD,MAAM,MAAM,wBAAwB;AAClC,4EAA4E;AAC1E;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE;AACnE,+EAA+E;GAC7E;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,qEAAqE;AACrE,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAsB5E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"oauthPopupMessages.d.ts","sourceRoot":"","sources":["../../../../../src/ui/oauth/oauthPopupMessages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAS,CAAC;AAEjE,kEAAkE;AAClE,eAAO,MAAM,2BAA2B,mBAAmB,CAAC;AAE5D,6DAA6D;AAC7D,eAAO,MAAM,4BAA4B,oBAAoB,CAAC;AAE9D,gDAAgD;AAChD,MAAM,MAAM,wBAAwB;AAClC,4EAA4E;AAC1E;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE;AACnE,+EAA+E;GAC7E;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAE/B,qEAAqE;AACrE,MAAM,WAAW,wBAAwB;IACvC,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,8DAA8D;IAC9D,aAAa,EAAE,MAAM,CAAC;IACtB,0DAA0D;IAC1D,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAsB5E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAwC1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateAccountScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/screens/CreateAccountScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAqB,CAAC;AAoF3D;;;;;GAKG;AACH,QAAA,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyVlD,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "30.0
|
|
3
|
+
"version": "30.1.0",
|
|
4
4
|
"description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -112,6 +112,8 @@
|
|
|
112
112
|
"typescript": "tsc --skipLibCheck --noEmit",
|
|
113
113
|
"lint": "biome lint --error-on-warnings ./src",
|
|
114
114
|
"build": "bun x react-native-builder-bob build --target commonjs && bun x react-native-builder-bob build --target module && bun x react-native-builder-bob build --target typescript && bun run copy-assets && bun run copy-dts && bun run delete-dts.js && bun run delete-debug-view",
|
|
115
|
+
"postbuild": "node scripts/verify-package.mjs",
|
|
116
|
+
"verify:package": "node scripts/verify-package.mjs",
|
|
115
117
|
"build:js": "bun x react-native-builder-bob build --target commonjs && bun x react-native-builder-bob build --target module && bun run copy-assets",
|
|
116
118
|
"test": "jest --passWithNoTests",
|
|
117
119
|
"test:watch": "jest --watch",
|
|
@@ -138,7 +140,7 @@
|
|
|
138
140
|
}
|
|
139
141
|
},
|
|
140
142
|
"dependencies": {
|
|
141
|
-
"@oxyhq/contracts": "0.
|
|
143
|
+
"@oxyhq/contracts": "0.33.0",
|
|
142
144
|
"@simplewebauthn/browser": "^13.3.0",
|
|
143
145
|
"color": "^4.2.3"
|
|
144
146
|
},
|
|
@@ -147,7 +149,7 @@
|
|
|
147
149
|
"@commitlint/cli": "^21.2.1",
|
|
148
150
|
"@commitlint/config-conventional": "^21.2.0",
|
|
149
151
|
"@expo/vector-icons": "^15.0.3",
|
|
150
|
-
"@oxyhq/core": "
|
|
152
|
+
"@oxyhq/core": "22.0.0",
|
|
151
153
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
152
154
|
"@react-native-community/netinfo": "^11.4.1",
|
|
153
155
|
"@react-native/babel-preset": "^0.86.2",
|
|
@@ -191,7 +193,7 @@
|
|
|
191
193
|
"peerDependencies": {
|
|
192
194
|
"@expo/vector-icons": "^15.0.3",
|
|
193
195
|
"@oxyhq/bloom": "^1.0.0",
|
|
194
|
-
"@oxyhq/core": "^21.0.0",
|
|
196
|
+
"@oxyhq/core": "^21.0.0 || ^22.0.0",
|
|
195
197
|
"@react-native-async-storage/async-storage": "^2.0.0",
|
|
196
198
|
"@react-native-community/netinfo": ">=11.4.1",
|
|
197
199
|
"@tanstack/query-async-storage-persister": "^5.101",
|
|
@@ -303,10 +303,11 @@ export const OxySignInButton: React.FC<OxySignInButtonProps> = ({
|
|
|
303
303
|
);
|
|
304
304
|
|
|
305
305
|
// Resolve the Application once, then route: third-party → OAuth; first-party
|
|
306
|
-
// / official
|
|
307
|
-
//
|
|
308
|
-
//
|
|
309
|
-
//
|
|
306
|
+
// / official → the in-app dialog. An unresolved client must fail closed:
|
|
307
|
+
// opening the privileged device-session dialog without a known first-party
|
|
308
|
+
// classification could downgrade a third-party OAuth + PKCE flow. Every path
|
|
309
|
+
// that does NOT reach the OAuth lane closes the pre-opened popup, so an
|
|
310
|
+
// aborted press can never leave an empty window on screen.
|
|
310
311
|
const routeSignIn = useCallback(
|
|
311
312
|
async (popup: OAuthPopupHandle | null): Promise<void> => {
|
|
312
313
|
if (routingRef.current) {
|
|
@@ -327,11 +328,11 @@ export const OxySignInButton: React.FC<OxySignInButtonProps> = ({
|
|
|
327
328
|
} catch (error) {
|
|
328
329
|
closeOAuthPopup(popup);
|
|
329
330
|
logger.warn(
|
|
330
|
-
'OxySignInButton: could not resolve the application;
|
|
331
|
+
'OxySignInButton: could not resolve the application; sign-in aborted',
|
|
331
332
|
{ component: 'OxySignInButton', clientId },
|
|
332
333
|
error,
|
|
333
334
|
);
|
|
334
|
-
|
|
335
|
+
notifyFailed();
|
|
335
336
|
return;
|
|
336
337
|
}
|
|
337
338
|
if (app.type === 'third_party' && !app.isOfficial) {
|
|
@@ -103,6 +103,15 @@ export function readOAuthPopupMessage(
|
|
|
103
103
|
event: MessageEvent,
|
|
104
104
|
context: OAuthPopupMessageContext,
|
|
105
105
|
): OAuthPopupMessageVerdict {
|
|
106
|
+
// These two are a PAIR, and the source check is load-bearing rather than
|
|
107
|
+
// belt-and-braces. `expectedOrigin` is `new URL(authorizeUrl).origin`, and
|
|
108
|
+
// `authorizeBaseUrl` is app-configurable — a non-http(s) value makes that
|
|
109
|
+
// expression the literal string `"null"`, the opaque origin, which is also
|
|
110
|
+
// what a browser reports as `event.origin` for EVERY sandboxed iframe,
|
|
111
|
+
// `data:` document and `file:` page. The origin check stops discriminating at
|
|
112
|
+
// that point and the source check is the only thing still refusing them.
|
|
113
|
+
// Do not collapse them into one, and do not drop the source check as
|
|
114
|
+
// redundant with the origin check: it is not, in the one case that matters.
|
|
106
115
|
if (event.origin !== context.expectedOrigin) return { kind: 'ignore' };
|
|
107
116
|
if (!isSameWindowReference(event.source, context.popup)) return { kind: 'ignore' };
|
|
108
117
|
|
|
@@ -4,6 +4,13 @@ import { View, ActivityIndicator } from 'react-native';
|
|
|
4
4
|
import Ionicons from '@expo/vector-icons/Ionicons';
|
|
5
5
|
import type { AccountCategoryId, AccountKind, CreateAccountInput } from '@oxyhq/core';
|
|
6
6
|
import { accountCategoryLabel, DISPLAY_NAME_INVALID_MESSAGE, isValidDisplayName, MAX_ACCOUNT_CATEGORIES, MAX_DISPLAY_NAME_LENGTH, SELECTABLE_ACCOUNT_CATEGORY_IDS } from '@oxyhq/core';
|
|
7
|
+
import {
|
|
8
|
+
isValidUsername,
|
|
9
|
+
stripDisallowedUsernameCharacters,
|
|
10
|
+
USERNAME_INVALID_MESSAGE,
|
|
11
|
+
USERNAME_MAX_LENGTH,
|
|
12
|
+
USERNAME_MIN_LENGTH,
|
|
13
|
+
} from '@oxyhq/contracts';
|
|
7
14
|
import type { BaseScreenProps } from '../types/navigation';
|
|
8
15
|
import { useI18n } from '../hooks/useI18n';
|
|
9
16
|
import { useSurfaceHeader } from '../hooks/useSurfaceHeader';
|
|
@@ -36,9 +43,7 @@ type UsernameStatus = 'idle' | 'checking' | 'available' | 'taken' | 'invalid';
|
|
|
36
43
|
*/
|
|
37
44
|
type CreatableAccountKind = Extract<AccountKind, 'organization' | 'project' | 'bot'>;
|
|
38
45
|
|
|
39
|
-
const USERNAME_REGEX = /^[a-zA-Z0-9_-]{3,30}$/;
|
|
40
46
|
const DEBOUNCE_MS = 400;
|
|
41
|
-
const USERNAME_MAX = 30;
|
|
42
47
|
const DISPLAY_NAME_MAX = MAX_DISPLAY_NAME_LENGTH;
|
|
43
48
|
const BIO_MAX = 160;
|
|
44
49
|
|
|
@@ -144,21 +149,24 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
144
149
|
clearTimeout(debounceTimerRef.current);
|
|
145
150
|
}
|
|
146
151
|
|
|
147
|
-
if (!value || value.length <
|
|
152
|
+
if (!value || value.length < USERNAME_MIN_LENGTH) {
|
|
148
153
|
setUsernameStatus(value.length > 0 ? 'invalid' : 'idle');
|
|
149
154
|
setUsernameMessage(
|
|
150
155
|
value.length > 0
|
|
151
|
-
? (t('accounts.create.username.tooShort')
|
|
156
|
+
? (t('accounts.create.username.tooShort')
|
|
157
|
+
|| `Username must be at least ${USERNAME_MIN_LENGTH} characters`)
|
|
152
158
|
: '',
|
|
153
159
|
);
|
|
154
160
|
return;
|
|
155
161
|
}
|
|
156
162
|
|
|
157
|
-
|
|
163
|
+
// The ONE policy, from `@oxyhq/contracts`. This screen used to carry a
|
|
164
|
+
// private copy of the rule, and the server it talks to enforced a LOOSER one
|
|
165
|
+
// — so a name this field refused was a name `POST /accounts` would happily
|
|
166
|
+
// have stored.
|
|
167
|
+
if (!isValidUsername(value)) {
|
|
158
168
|
setUsernameStatus('invalid');
|
|
159
|
-
setUsernameMessage(
|
|
160
|
-
t('accounts.create.username.invalidChars') || 'Only letters, numbers, hyphens, and underscores',
|
|
161
|
-
);
|
|
169
|
+
setUsernameMessage(t('accounts.create.username.invalidChars') || USERNAME_INVALID_MESSAGE);
|
|
162
170
|
return;
|
|
163
171
|
}
|
|
164
172
|
|
|
@@ -186,7 +194,11 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
186
194
|
}, [oxyServices, t]);
|
|
187
195
|
|
|
188
196
|
const handleUsernameChange = useCallback((value: string) => {
|
|
189
|
-
|
|
197
|
+
// Filters characters the policy forbids, and nothing else. It no longer
|
|
198
|
+
// lower-cases: `MyBot` is stored as `MyBot`, and uniqueness is decided
|
|
199
|
+
// case-insensitively by the database index rather than by rewriting what
|
|
200
|
+
// somebody typed.
|
|
201
|
+
const cleaned = stripDisallowedUsernameCharacters(value);
|
|
190
202
|
setUsername(cleaned);
|
|
191
203
|
checkUsername(cleaned);
|
|
192
204
|
}, [checkUsername]);
|
|
@@ -360,7 +372,7 @@ const CreateAccountScreen: React.FC<BaseScreenProps> = ({
|
|
|
360
372
|
autoCapitalize="none"
|
|
361
373
|
autoCorrect={false}
|
|
362
374
|
autoComplete="off"
|
|
363
|
-
maxLength={
|
|
375
|
+
maxLength={USERNAME_MAX_LENGTH}
|
|
364
376
|
/>
|
|
365
377
|
</TextField>
|
|
366
378
|
{(usernameStatus === 'checking' || usernameMessage) ? (
|