Merge pull request #100 from Unboxed-Software/fix/rename-auth-flag

Rename auth flag
magiclabs · Sep 12, 2023 · 5d8fc17 · 5d8fc17
2 parents a0f9739 + 9ddd21d
commit 5d8fc17
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "make-magic",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "A tool for quickly scaffolding an app with Magic authentication baked-in!",
   "repository": "magiclabs/create-magic-app",
   "license": "MIT",

diff --git a/scaffolds/nextjs-dedicated-wallet/scaffold.tsx b/scaffolds/nextjs-dedicated-wallet/scaffold.tsx
@@ -53,7 +53,7 @@ export default createScaffold<NextDedicatedWalletData>(
           <Template source="./src/styles" />
           <Template source="./src/utils" />
 
-          {data.selectedAuthTypes.map((authType) => (
+          {data.loginMethods.map((authType) => (
             <React.Fragment key={authType}>
               <Template source={`./src/components/magic/auth/${authType.replaceAll(' ', '')}.tsx`} />
               {(authType === 'Discord' ||

diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/Login.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/Login.tsx
@@ -1,6 +1,6 @@
 import { LoginProps } from '@/utils/types'
 import Header from './Header'
-<% selectedAuthTypes.forEach(authType => { %>
+<% loginMethods.forEach(authType => { %>
 <%-`import ${authType.replaceAll(' ', '')} from './auth/${authType.replaceAll(' ', '')}';`-%>
 <% }) %>
 
@@ -9,7 +9,7 @@ const Login = ({ token, setToken }: LoginProps) => {
     <div className="login-page">
       <Header />
       <div className="login-method-grid">
-      <% selectedAuthTypes.forEach(authType => { %>
+      <% loginMethods.forEach(authType => { %>
       <% if (authType !== "Social Logins") { %>
         <%-`<${authType.replaceAll(' ', '')} token={token} setToken={setToken} />`-%>
       <% } %>

diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx
@@ -7,10 +7,10 @@ import { LoginProps } from '@/utils/types';
 import Card from '@/components/ui/Card';
 import CardHeader from '@/components/ui/CardHeader';
 import { LoginMethod } from '@/utils/common';
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 <%-`import UpdateEmail from '../wallet-methods/UpdateEmail'`-%>
 <% }%>
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 <%-`import UpdatePhone from '../wallet-methods/UpdatePhone'`-%>
 <% }%>
 
@@ -21,15 +21,15 @@ const WalletMethods = ({ token, setToken }: LoginProps) => {
   return (
     <Card>
       <CardHeader id="methods">User Methods</CardHeader>
-	  <% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+	  <% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 	  	<%-`{loginMethod && loginMethod == 'EMAIL' && (
 			<>
 				<UpdateEmail />
 				<Divider />
 			</>
 		)}`-%>
 	  <% }%>
-      <% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+      <% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 	  	<%-`{loginMethod && loginMethod == 'SMS' && (
 			<>
 				<UpdatePhone />

diff --git a/scaffolds/nextjs-flow-dedicated-wallet/scaffold.tsx b/scaffolds/nextjs-flow-dedicated-wallet/scaffold.tsx
@@ -37,7 +37,7 @@ export default createScaffold<NextDedicatedWalletData>(
           <Template source="./src/styles" />
           <Template source="./src/utils" />
 
-          {data.selectedAuthTypes.map((authType) => (
+          {data.loginMethods.map((authType) => (
             <React.Fragment key={authType}>
               <Template source={`./src/components/magic/auth/${authType.replaceAll(' ', '')}.tsx`} />
               {(authType === 'Discord' ||

diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Login.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Login.tsx
@@ -1,6 +1,6 @@
 import {LoginProps} from '@/utils/types'
 import Header from './Header'
-<% selectedAuthTypes.forEach(authType => { %>
+<% loginMethods.forEach(authType => { %>
 <%-`import ${authType.replaceAll(' ', '')} from './auth/${authType.replaceAll(' ', '')}';`-%>
 <% }) %>
 
@@ -9,7 +9,7 @@ const Login = ({token, setToken}: LoginProps) => {
 		<div className='login-page'>
 			<Header />
 			<div className='login-method-grid'>
-			<% selectedAuthTypes.forEach(authType => { %>
+			<% loginMethods.forEach(authType => { %>
 			<% if (authType !== "Social Logins") { %>
 				<%-`<${authType.replaceAll(' ', '')} token={token} setToken={setToken} />`-%>
 			<% } %>

diff --git a/...ds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx b/...ds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx
@@ -7,10 +7,10 @@ import CardHeader from '@/components/ui/CardHeader'
 import {LoginMethod} from '@/utils/common'
 import GetIdToken from '../wallet-methods/GetIdToken'
 import GetMetadata from '../wallet-methods/GetMetadata'
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 <%-`import UpdateEmail from '../wallet-methods/UpdateEmail'`-%>
 <% }%>
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 <%-`import UpdatePhone from '../wallet-methods/UpdatePhone'`-%>
 <% }%>
 
@@ -21,15 +21,15 @@ const WalletMethods = ({token, setToken}: LoginProps) => {
 	return (
 		<Card>
 			<CardHeader id='methods'>Wallet Methods</CardHeader>
-			<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+			<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 				<%-`{loginMethod && loginMethod == 'EMAIL' && (
 					<>
 						<UpdateEmail />
 						<Divider />
 					</>
 				)}`-%>
 			<% }%>
-			<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+			<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 				<%-`{loginMethod && loginMethod == 'SMS' && (
 					<>
 						<UpdatePhone />

diff --git a/scaffolds/nextjs-solana-dedicated-wallet/scaffold.tsx b/scaffolds/nextjs-solana-dedicated-wallet/scaffold.tsx
@@ -37,7 +37,7 @@ export default createScaffold<NextDedicatedWalletData>(
           <Template source="./src/styles" />
           <Template source="./src/utils" />
 
-          {data.selectedAuthTypes.map(
+          {data.loginMethods.map(
             (authType) =>
               authType !== 'Social Logins' && (
                 <React.Fragment key={authType}>

diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Login.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Login.tsx
@@ -1,6 +1,6 @@
 import {LoginProps} from '@/utils/types'
 import Header from './Header'
-<% selectedAuthTypes.forEach(authType => { %>
+<% loginMethods.forEach(authType => { %>
 <%-`import ${authType.replaceAll(' ', '')} from './auth/${authType.replaceAll(' ', '')}';`-%>
 <% }) %>
 
@@ -9,7 +9,7 @@ const Login = ({token, setToken}: LoginProps) => {
 		<div className='login-page'>
 			<Header />
 			<div className='login-method-grid'>
-				<% selectedAuthTypes.forEach(authType => { %>
+				<% loginMethods.forEach(authType => { %>
 				<% if (authType !== "Social Logins") { %>
 					<%-`<${authType.replaceAll(' ', '')} token={token} setToken={setToken} />`-%>
 				<% } %>

diff --git a/.../nextjs-solana-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx b/.../nextjs-solana-dedicated-wallet/template/src/components/magic/cards/WalletMethodsCard.tsx
@@ -7,10 +7,10 @@ import CardHeader from '@/components/ui/CardHeader'
 import {LoginMethod} from '@/utils/common'
 import GetIdToken from '../wallet-methods/GetIdToken'
 import GetMetadata from '../wallet-methods/GetMetadata'
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 <%-`import UpdateEmail from '../wallet-methods/UpdateEmail'`-%>
 <% }%>
-<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 <%-`import UpdatePhone from '../wallet-methods/UpdatePhone'`-%>
 <% }%>
 
@@ -21,15 +21,15 @@ const WalletMethods = ({token, setToken}: LoginProps) => {
 	return (
 		<Card>
 			<CardHeader id='methods'>Wallet Methods</CardHeader>
-			<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
+			<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("EmailOTP")){%>
 				<%-`{loginMethod && loginMethod == 'EMAIL' && (
 					<>
 						<UpdateEmail />
 						<Divider />
 					</>
 				)}`-%>
 			<% }%>
-			<% if(selectedAuthTypes.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
+			<% if(loginMethods.map(authType => authType.replaceAll(" ", "")).includes("SMSOTP")){%>
 				<%-`{loginMethod && loginMethod == 'SMS' && (
 					<>
 						<UpdatePhone />

diff --git a/scaffolds/prompts.ts b/scaffolds/prompts.ts
@@ -183,12 +183,12 @@ export namespace AuthTypePrompt {
   ];
 
   export type Data = {
-    selectedAuthTypes: string[];
+    loginMethods: string[];
   };
 
   export const questions: Questions<Data> = {
     type: 'multiselect',
-    name: 'selectedAuthTypes',
+    name: 'loginMethods',
     message:
       'How do you want your users to log in to their wallet? See Magic docs for help (https://magic.link/docs/auth/overview)',
     hint: '(<space> to select, <return> to submit)',
@@ -214,7 +214,7 @@ export namespace AuthTypePrompt {
   };
 
   export const flags: Flags<Partial<Data>> = {
-    selectedAuthTypes: {
+    loginMethods: {
       type: [String],
       description: `The auth method(s) of your choice. You can provide this flag multiple times to select multiple methods. (one of: ${authMethods.join(
         ', ',