magiclabs · Ariflo · Jan 6, 2023 · Jan 3, 2023 · Jan 3, 2023 · Jan 3, 2023
diff --git a/BUILD_SYSTEM.md b/BUILD_SYSTEM.md
@@ -46,7 +46,7 @@ We generate multiple outputs in order to maximize backwards compatibility and in
  // One of: node | browser | neutral
  //
  // node: Targets Node-like runtimes; used for React Native & server-side
- // packages (i.e.: `@magic-sdk/react-native`)
+ // packages (i.e.: `@magic-sdk/react-native-bare`)
  //
  // browser: Targets web-like runtimes; used for web-only packages
  // (i.e.: `magic-sdk`)

diff --git a/README.md b/README.md
@@ -13,7 +13,8 @@
 ## 📖 Documentation
 
 - See the [developer documentation](https://docs.magic.link) to learn how you can master the Magic SDK in a matter of minutes.
-- See the `@magic-sdk/react-native` [README](https://github.com/magiclabs/magic-js/tree/master/packages/%40magic-sdk/react-native#readme) for package specific information. 
+- See the `@magic-sdk/react-native-bare` [README](https://github.com/magiclabs/magic-js/tree/master/packages/%40magic-sdk/react-native-bare#readme) for Bare React Native package specific information.
+- See the `@magic-sdk/react-native-expo` [README](https://github.com/magiclabs/magic-js/tree/master/packages/%40magic-sdk/react-native-expo#readme) for Expo React Native package specific information. 
 
 ## ⚡️ Quick Start
 
@@ -24,14 +25,16 @@ Integrating your app with Magic will require our client-side NPM package:
 ```bash
 # Via NPM:
 npm install --save magic-sdk # If you're targeting web browsers
-npm install --save @magic-sdk/react-native # If you're targeting React Native
+npm install --save @magic-sdk/react-native-bare # If you're targeting Bare React Native
+npm install --save @magic-sdk/react-native-expo # If you're targeting Expo React Native
 
 # Via Yarn:
 yarn add magic-sdk # If you're targeting web browsers
-yarn add @magic-sdk/react-native # If you're targeting React Native
+yarn add @magic-sdk/react-native-bare # If you're targeting Bare React Native
+yarn add @magic-sdk/react-native-expo # If you're targeting Expo React Native
 ```
 
-Alternatively, you can load via CDN with by adding a script tag to your app’s `<head>`:
+Alternatively, you can load via CDN by adding a script tag to your app’s `<head>`:
 
 ```html
 <script src="https://cdn.jsdelivr.net/npm/magic-sdk/dist/magic.js"></script>
@@ -60,7 +63,8 @@ These are packages _you_ can install to enable Magic JS SDK functionality for yo
 | Package Name | Changelog | Description |
 | ------------ | --------- | ----------- |
 | [`magic-sdk`](https://www.npmjs.com/package/magic-sdk) | [CHANGELOG](./packages/magic-sdk/CHANGELOG.md) | Web/browser entry-point for Magic SDK. |
-| [`@magic-sdk/react-native`](https://www.npmjs.com/package/@magic-sdk/react-native) | [CHANGELOG](./packages/@magic-sdk/react-native/CHANGELOG.md) | React Native entry-point for Magic SDK. |
+| [`@magic-sdk/react-native-bare`](https://www.npmjs.com/package/@magic-sdk/react-native-bare) | [CHANGELOG](./packages/@magic-sdk/react-native-bare/CHANGELOG.md) | Bare React Native entry-point for Magic SDK. |
+| [`@magic-sdk/react-native-expo`](https://www.npmjs.com/package/@magic-sdk/react-native-expo) | [CHANGELOG](./packages/@magic-sdk/react-native-expo/CHANGELOG.md) | Expo React Native entry-point for Magic SDK. |
 
 ## Extensions
 
@@ -88,7 +92,8 @@ yarn test
 Test an individual package
 ```bash
 PKG=magic-sdk yarn test
-PKG=@magic-sdk/react-native yarn test
+PKG=@magic-sdk/react-native-bare yarn test
+PKG=@magic-sdk/react-native-expo yarn test
 ```
 
 Test specific files

diff --git a/packages/@magic-ext/oauth/src/index.ts b/packages/@magic-ext/oauth/src/index.ts
@@ -16,6 +16,8 @@ export class OAuthExtension extends Extension.Internal<'oauth'> {
  compat = {
  'magic-sdk': '>=2.4.6',
  '@magic-sdk/react-native': false,
+ '@magic-sdk/react-native-bare': false,
+ '@magic-sdk/react-native-expo': false,
  };
 
  public loginWithRedirect(configuration: OAuthRedirectConfiguration) {

diff --git a/...agic-ext/react-native-oauth/.eslintignore → ...ext/react-native-bare-oauth/.eslintignore b/...agic-ext/react-native-oauth/.eslintignore → ...ext/react-native-bare-oauth/.eslintignore
diff --git a/...magic-ext/react-native-oauth/.eslintrc.js → ...-ext/react-native-bare-oauth/.eslintrc.js b/...magic-ext/react-native-oauth/.eslintrc.js → ...-ext/react-native-bare-oauth/.eslintrc.js
diff --git a/...-ext/react-native-oauth/.lintstagedrc.yml → ...react-native-bare-oauth/.lintstagedrc.yml b/...-ext/react-native-oauth/.lintstagedrc.yml → ...react-native-bare-oauth/.lintstagedrc.yml
diff --git a/...gic-ext/react-native-oauth/.prettierrc.js → ...xt/react-native-bare-oauth/.prettierrc.js b/...gic-ext/react-native-oauth/.prettierrc.js → ...xt/react-native-bare-oauth/.prettierrc.js
diff --git a/...magic-ext/react-native-oauth/CHANGELOG.md → ...-ext/react-native-bare-oauth/CHANGELOG.md b/...magic-ext/react-native-oauth/CHANGELOG.md → ...-ext/react-native-bare-oauth/CHANGELOG.md
@@ -1,16 +1,3 @@
-# v6.0.0 (Thu Jan 05 2023)
-
-#### 🐛 Bug Fix
-
-- Fix ESLint Issues [#419](https://github.com/magiclabs/magic-js/pull/419) ([@Ariflo](https://github.com/Ariflo))
-- Cast json to string for oauth ([@Ariflo](https://github.com/Ariflo))
-
-#### Authors: 1
-
-- Arian Flores ([@Ariflo](https://github.com/Ariflo))
-
----
-
 # v5.0.0 (Tue Dec 20 2022)
 
 #### 🐛 Bug Fix

diff --git a/...ges/@magic-ext/react-native-oauth/LICENSE → ...magic-ext/react-native-bare-oauth/LICENSE b/...ges/@magic-ext/react-native-oauth/LICENSE → ...magic-ext/react-native-bare-oauth/LICENSE
diff --git a/packages/@magic-ext/react-native-bare-oauth/README.md b/packages/@magic-ext/react-native-bare-oauth/README.md
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/packages/@magic-ext/react-native-bare-oauth/package.json b/packages/@magic-ext/react-native-bare-oauth/package.json
@@ -0,0 +1,40 @@
+{
+ "name": "@magic-ext/react-native-bare-oauth",
+ "version": "7.0.0",
+ "description": "Magic SDK OAuth Extension for Bare React Native environments.",
+ "author": "Magic <[email protected]> (https://magic.link/)",
+ "license": "MIT",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/magiclabs/magic-js"
+ },
+ "files": [
+ "dist"
+ ],
+ "target": "node",
+ "main": "./dist/cjs/index.js",
+ "module": "./dist/es/index.js",
+ "types": "./dist/types/index.d.ts",
+ "exports": {
+ "import": "./dist/es/index.mjs",
+ "require": "./dist/cjs/index.js"
+ },
+ "externals": {
+ "include": [
+ "@magic-sdk/react-native-bare"
+ ]
+ },
+ "dependencies": {
+ "@magic-sdk/types": "^10.0.1",
+ "crypto-js": "^3.3.0",
+ "react-native-device-info": "^10.3.0",
+ "react-native-inappbrowser-reborn": "^3.7.0"
+ },
+ "devDependencies": {
+ "@magic-sdk/react-native-bare": "^13.0.1",
+ "@types/crypto-js": "~3.1.47"
+ },
+ "peerDependencies": {
+ "@magic-sdk/react-native-bare": ">=13.0.0"
+ }
+}
diff --git a/...agic-ext/react-native-oauth/src/crypto.ts → ...ext/react-native-bare-oauth/src/crypto.ts b/...agic-ext/react-native-oauth/src/crypto.ts → ...ext/react-native-bare-oauth/src/crypto.ts
diff --git a/packages/@magic-ext/react-native-bare-oauth/src/index.ts b/packages/@magic-ext/react-native-bare-oauth/src/index.ts
@@ -0,0 +1,133 @@
+import { InAppBrowser } from 'react-native-inappbrowser-reborn';
+import { Extension } from '@magic-sdk/react-native-bare';
+import { getBundleId } from 'react-native-device-info';
+import { createCryptoChallenge } from './crypto';
+import {
+ OAuthErrorData,
+ OAuthPayloadMethods,
+ OAuthRedirectConfiguration,
+ OAuthRedirectError,
+ OAuthRedirectResult,
+} from './types';
+
+export class OAuthExtension extends Extension.Internal<'oauth'> {
+ name = 'oauth' as const;
+ config = {};
+ compat = {
+ 'magic-sdk': false,
+ '@magic-sdk/react-native-bare': '>=13.0.0',
+ '@magic-sdk/react-native-expo': false,
+ '@magic-sdk/react-native': false,
+ };
+
+ public loginWithPopup(configuration: OAuthRedirectConfiguration) {
+ return this.utils.createPromiEvent<OAuthRedirectResult>(async (resolve, reject) => {
+ try {
+ const { provider, query, redirectURI } = await createURI.call(this, configuration);
+ const url = `https://auth.magic.link/v1/oauth2/${provider}/start?${query}`;
+
+ /**
+ * Response Type Inspired by:
+ * https://docs.expo.io/versions/latest/sdk/webbrowser/#returns
+ */
+ const res = await InAppBrowser.openAuth(url, redirectURI, {});
+
+ if (res.type === 'success') {
+ const queryString = new URL(res.url).search;
+
+ resolve(getResult.call(this, queryString.toString()));
+ } else {
+ reject(this.createError<object>(res.type, 'User has cancelled the authentication', {}));
+ }
+ } catch (err: any) {
+ reject(
+ this.createError<object>(err.message, 'An error has occurred', {
+ err,
+ }),
+ );
+ }
+ });
+ }
+}
+
+const OAUTH_REDIRECT_METADATA_KEY = 'oauth_redirect_metadata';
+
+export async function createURI(this: OAuthExtension, configuration: OAuthRedirectConfiguration) {
+ // Bust any old, in-progress OAuth flows.
+ await this.utils.storage.removeItem(OAUTH_REDIRECT_METADATA_KEY);
+
+ // Unpack configuration, generate crypto values, and persist to storage.
+ const { provider, redirectURI, scope, loginHint } = configuration;
+ const { verifier, challenge, state } = await createCryptoChallenge();
+ const bundleId = getBundleId();
+
+ /* Stringify for RN Async storage */
+ const storedData = JSON.stringify({
+ verifier,
+ state,
+ });
+
+ await this.utils.storage.setItem(OAUTH_REDIRECT_METADATA_KEY, storedData);
+
+ // Formulate the initial redirect query to Magic's OAuth hub.
+ // Required fields:
+ // - `magic_api_key`
+ // - `magic_challenge`
+ // - `state`
+ // - `redirect_uri`
+ // - `platform`
+ // Optional fields:
+ // - `bundleId`
+
+ const query = [
+ `magic_api_key=${encodeURIComponent(this.sdk.apiKey)}`,
+ `magic_challenge=${encodeURIComponent(challenge)}`,
+ `state=${encodeURIComponent(state)}`,
+ `platform=${encodeURIComponent('rn')}`,
+ scope && `scope=${encodeURIComponent(scope.join(' '))}`,
+ redirectURI && `redirect_uri=${encodeURIComponent(redirectURI)}`,
+ loginHint && `login_hint=${encodeURIComponent(loginHint)}`,
+ bundleId && `bundleId=${encodeURIComponent(bundleId)}`,
+ ].reduce((prev, next) => (next ? `${prev}&${next}` : prev));
+
+ return {
+ query,
+ provider,
+ redirectURI,
+ };
+}
+
+export function getResult(this: OAuthExtension, queryString: string) {
+ return this.utils.createPromiEvent<OAuthRedirectResult>(async (resolve, reject) => {
+ const json: string = (await this.utils.storage.getItem(OAUTH_REDIRECT_METADATA_KEY)) as string;
+
+ const { verifier, state } = JSON.parse(json);
+
+ // Remove the save OAuth state from storage, it stays in memory now...
+ this.utils.storage.removeItem(OAUTH_REDIRECT_METADATA_KEY);
+
+ const parseRedirectResult = this.utils.createJsonRpcRequestPayload(OAuthPayloadMethods.ParseRedirectResult, [
+ queryString,
+ verifier,
+ state,
+ ]);
+
+ // Parse the result, which may contain an OAuth-formatted error.
+ const resultOrError = await this.request<OAuthRedirectResult | OAuthRedirectError>(parseRedirectResult);
+ const maybeResult = resultOrError as OAuthRedirectResult;
+ const maybeError = resultOrError as OAuthRedirectError;
+
+ if (maybeError.error) {
+ reject(
+ this.createError<OAuthErrorData>(maybeError.error, maybeError.error_description ?? 'An error occurred.', {
+ errorURI: maybeError.error_uri,
+ provider: maybeError.provider,
+ }),
+ );
+ }
+
+ resolve(maybeResult);
+ });
+}
+
+export * from './types';
diff --git a/...magic-ext/react-native-oauth/src/types.ts → ...-ext/react-native-bare-oauth/src/types.ts b/...magic-ext/react-native-oauth/src/types.ts → ...-ext/react-native-bare-oauth/src/types.ts
diff --git a/...agic-ext/react-native-oauth/tsconfig.json → ...ext/react-native-bare-oauth/tsconfig.json b/...agic-ext/react-native-oauth/tsconfig.json → ...ext/react-native-bare-oauth/tsconfig.json
diff --git a/packages/@magic-ext/react-native-expo-oauth/.eslintignore b/packages/@magic-ext/react-native-expo-oauth/.eslintignore
@@ -0,0 +1,5 @@
+/node_modules
+/coverage
+/dist
+/.eslintrc.js
+/jest.config.ts
diff --git a/packages/@magic-ext/react-native-expo-oauth/.eslintrc.js b/packages/@magic-ext/react-native-expo-oauth/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+ extends: ['../../../.eslintrc.js'],
+ parserOptions: {
+ project: ['./tsconfig.json'],
+ tsconfigRootDir: __dirname,
+ },
+}
diff --git a/...@magic-sdk/react-native/.lintstagedrc.yml → ...react-native-expo-oauth/.lintstagedrc.yml b/...@magic-sdk/react-native/.lintstagedrc.yml → ...react-native-expo-oauth/.lintstagedrc.yml
diff --git a/...es/@magic-sdk/react-native/.prettierrc.js → ...xt/react-native-expo-oauth/.prettierrc.js b/...es/@magic-sdk/react-native/.prettierrc.js → ...xt/react-native-expo-oauth/.prettierrc.js
diff --git a/packages/@magic-ext/react-native-expo-oauth/CHANGELOG.md b/packages/@magic-ext/react-native-expo-oauth/CHANGELOG.md
@@ -0,0 +1,110 @@
+# v5.0.0 (Tue Dec 20 2022)
+
+#### 🐛 Bug Fix
+
+- Merge branch 'master' into mushfichowdhury-sc-61149-implement-event-emitting-in-magic-sdk-based ([@mushfichowdhury-magic](https://github.com/mushfichowdhury-magic))
+- Adds more Context about Expo dependency in `@magic-ext/react-native-oauth` to README [#386](https://github.com/magiclabs/magic-js/pull/386) ([@Ariflo](https://github.com/Ariflo))
+
+#### ⚠️ Pushed to `master`
+
+- Add bundleId to the OAuth query ([@Ethella](https://github.com/Ethella))
+
+#### Authors: 3
+
+- Arian Flores ([@Ariflo](https://github.com/Ariflo))
+- Jerry Liu ([@Ethella](https://github.com/Ethella))
+- Mushfi Chowdhury ([@mushfichowdhury-magic](https://github.com/mushfichowdhury-magic))
+
+---
+
+# v3.1.0 (Wed Aug 10 2022)
+
+#### 🚀 Enhancement
+
+- bump web-expo-browser version [#345](https://github.com/magiclabs/magic-js/pull/345) ([@Ethella](https://github.com/Ethella))
+
+#### Authors: 1
+
+- Jerry Liu ([@Ethella](https://github.com/Ethella))
+
+---
+
+# v2.2.0 (Mon Mar 07 2022)
+
+#### 🐛 Bug Fix
+
+- Merge branch 'master' into smithki/better-build-system-documentation ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+
+# v2.0.0 (Tue Jan 25 2022)
+
+#### 💥 Breaking Change
+
+- Switch from `microbundle` to `esbuild` [#220](https://github.com/magiclabs/magic-js/pull/220) ([@smithki](https://github.com/smithki))
+
+#### 🐛 Bug Fix
+
+- Merge with master ([@smithki](https://github.com/smithki))
+- Merge branch 'master' into feat/faster-builds ([@smithki](https://github.com/smithki))
+- Fix build errors related to isolatedModules ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+
+# v0.5.4 (Thu Oct 21 2021)
+
+#### 🐛 Bug Fix
+
+- Revert to `.js` extension for ES module builds targeting webpack/CRA [#232](https://github.com/magiclabs/magic-js/pull/232) ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+
+# v0.5.3 (Wed Oct 20 2021)
+
+#### ⚠️ Pushed to `master`
+
+- Merge branch 'master' of github.com:magiclabs/magic-js ([@smithki](https://github.com/smithki))
+- Force re-publish ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+
+# v0.5.2 (Wed Oct 20 2021)
+
+#### 🐛 Bug Fix
+
+- Use '.mjs' extension for ESM build files [#230](https://github.com/magiclabs/magic-js/pull/230) ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+
+# v0.4.1 (Thu Sep 23 2021)
+
+#### 🐛 Bug Fix
+
+- Port `@magic-ext/oauth`, `@magic-ext/react-native-oauth`, `@magic-ext/webauthn` extensions to Magic SDK monorepo [#218](https://github.com/magiclabs/magic-js/pull/218) ([@smithki](https://github.com/smithki))
+
+#### Authors: 1
+
+- Ian K Smith ([@smithki](https://github.com/smithki))
+
+---
+