fixes example apps

supertokens · Apr 24, 2024 · b9b22b7 · b9b22b7
1 parent 3e8d529
commit b9b22b7
Show file tree

Hide file tree

Showing 10 changed files with 773 additions and 756 deletions.
diff --git a/examples/with-chi-oso/main.go b/examples/with-chi-oso/main.go
@@ -12,9 +12,8 @@ import (
 	"github.com/supertokens/supertokens-golang/recipe/emailverification"
 	"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
 	"github.com/supertokens/supertokens-golang/recipe/session"
+	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword/tpepmodels"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
@@ -37,111 +36,113 @@ func main() {
 			emailverification.Init(evmodels.TypeInput{
 				Mode: evmodels.ModeRequired,
 			}),
-			thirdpartyemailpassword.Init(&tpepmodels.TypeInput{
-				Providers: []tpmodels.ProviderInput{
-					// We have provided you with development keys which you can use for testsing.
-					// IMPORTANT: Please replace them with your own OAuth keys for production use.
-					{
-						Config: tpmodels.ProviderConfig{
-							ThirdPartyId: "google",
-							Clients: []tpmodels.ProviderClientConfig{
-								{
-									ClientType:   "web",
-									ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
-									ClientSecret: "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",
-								},
-								{
-									// we use this for mobile apps
-									ClientType:   "mobile",
-									ClientID:     "1060725074195-c7mgk8p0h27c4428prfuo3lg7ould5o7.apps.googleusercontent.com",
-									ClientSecret: "", // this is empty because we follow Authorization code grant flow via PKCE for mobile apps (Google doesn't issue a client secret for mobile apps).
+			thirdparty.Init(&tpmodels.TypeInput{
+				SignInAndUpFeature: tpmodels.TypeInputSignInAndUp{
+					Providers: []tpmodels.ProviderInput{
+						// We have provided you with development keys which you can use for testsing.
+						// IMPORTANT: Please replace them with your own OAuth keys for production use.
+						{
+							Config: tpmodels.ProviderConfig{
+								ThirdPartyId: "google",
+								Clients: []tpmodels.ProviderClientConfig{
+									{
+										ClientType:   "web",
+										ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
+										ClientSecret: "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",
+									},
+									{
+										// we use this for mobile apps
+										ClientType:   "mobile",
+										ClientID:     "1060725074195-c7mgk8p0h27c4428prfuo3lg7ould5o7.apps.googleusercontent.com",
+										ClientSecret: "", // this is empty because we follow Authorization code grant flow via PKCE for mobile apps (Google doesn't issue a client secret for mobile apps).
+									},
 								},
 							},
 						},
-					},
-					{
-						Config: tpmodels.ProviderConfig{
-							ThirdPartyId: "github",
-							Clients: []tpmodels.ProviderClientConfig{
-								{
-									ClientType:   "web",
-									ClientID:     "467101b197249757c71f",
-									ClientSecret: "e97051221f4b6426e8fe8d51486396703012f5bd",
-								},
-								{
-									// We use this for mobile apps
-									ClientType:   "mobile",
-									ClientID:     "8a9152860ce869b64c44",
-									ClientSecret: "00e841f10f288363cd3786b1b1f538f05cfdbda2",
+						{
+							Config: tpmodels.ProviderConfig{
+								ThirdPartyId: "github",
+								Clients: []tpmodels.ProviderClientConfig{
+									{
+										ClientType:   "web",
+										ClientID:     "467101b197249757c71f",
+										ClientSecret: "e97051221f4b6426e8fe8d51486396703012f5bd",
+									},
+									{
+										// We use this for mobile apps
+										ClientType:   "mobile",
+										ClientID:     "8a9152860ce869b64c44",
+										ClientSecret: "00e841f10f288363cd3786b1b1f538f05cfdbda2",
+									},
 								},
 							},
 						},
-					},
-					/*
-					   For Apple signin, iOS apps always use the bundle identifier as the client ID when communicating with Apple. Android, Web and other platforms
-					   need to configure a Service ID on the Apple developer dashboard and use that as client ID.
-					   In the example below 4398792-io.supertokens.example.service is the client ID for Web. Android etc and thus we mark it as default. For iOS
-					   the frontend for the demo app sends the clientId in the request which is then used by the SDK.
-					*/
-					{
-						Config: tpmodels.ProviderConfig{
-							ThirdPartyId: "apple",
-							Clients: []tpmodels.ProviderClientConfig{
-								{
-									// For Android and website apps
-									ClientType: "web",
-									ClientID:   "4398792-io.supertokens.example.service",
-									AdditionalConfig: map[string]interface{}{
-										"keyId":      "7M48Y4RYDL",
-										"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
-										"teamId":     "YWQCXGJRJL",
+						/*
+						   For Apple signin, iOS apps always use the bundle identifier as the client ID when communicating with Apple. Android, Web and other platforms
+						   need to configure a Service ID on the Apple developer dashboard and use that as client ID.
+						   In the example below 4398792-io.supertokens.example.service is the client ID for Web. Android etc and thus we mark it as default. For iOS
+						   the frontend for the demo app sends the clientId in the request which is then used by the SDK.
+						*/
+						{
+							Config: tpmodels.ProviderConfig{
+								ThirdPartyId: "apple",
+								Clients: []tpmodels.ProviderClientConfig{
+									{
+										// For Android and website apps
+										ClientType: "web",
+										ClientID:   "4398792-io.supertokens.example.service",
+										AdditionalConfig: map[string]interface{}{
+											"keyId":      "7M48Y4RYDL",
+											"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
+											"teamId":     "YWQCXGJRJL",
+										},
 									},
-								},
-								{
-									// For iOS Apps
-									ClientType: "ios",
-									ClientID:   "4398792-io.supertokens.example",
-									AdditionalConfig: map[string]interface{}{
-										"keyId":      "7M48Y4RYDL",
-										"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
-										"teamId":     "YWQCXGJRJL",
+									{
+										// For iOS Apps
+										ClientType: "ios",
+										ClientID:   "4398792-io.supertokens.example",
+										AdditionalConfig: map[string]interface{}{
+											"keyId":      "7M48Y4RYDL",
+											"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
+											"teamId":     "YWQCXGJRJL",
+										},
 									},
 								},
 							},
 						},
-					},
-					{
-						Config: tpmodels.ProviderConfig{
-							ThirdPartyId: "discord",
-							Clients: []tpmodels.ProviderClientConfig{
-								{
-									ClientType:   "web",
-									ClientID:     "4398792-907871294886928395",
-									ClientSecret: "His4yXGEovVp5TZkZhEAt0ZXGh8uOVDm",
-								},
-								{
-									// We use this for mobile apps
-									ClientType:   "mobile",
-									ClientID:     "4398792-907871294886928395",
-									ClientSecret: "His4yXGEovVp5TZkZhEAt0ZXGh8uOVDm",
+						{
+							Config: tpmodels.ProviderConfig{
+								ThirdPartyId: "discord",
+								Clients: []tpmodels.ProviderClientConfig{
+									{
+										ClientType:   "web",
+										ClientID:     "4398792-907871294886928395",
+										ClientSecret: "His4yXGEovVp5TZkZhEAt0ZXGh8uOVDm",
+									},
+									{
+										// We use this for mobile apps
+										ClientType:   "mobile",
+										ClientID:     "4398792-907871294886928395",
+										ClientSecret: "His4yXGEovVp5TZkZhEAt0ZXGh8uOVDm",
+									},
 								},
 							},
 						},
-					},
-					{
-						Config: tpmodels.ProviderConfig{
-							ThirdPartyId: "google-workspaces",
-							Clients: []tpmodels.ProviderClientConfig{
-								{
-									ClientType:   "web",
-									ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
-									ClientSecret: "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",
-								},
-								{
-									// We use this for mobile apps
-									ClientType:   "mobile",
-									ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
-									ClientSecret: "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",
+						{
+							Config: tpmodels.ProviderConfig{
+								ThirdPartyId: "google-workspaces",
+								Clients: []tpmodels.ProviderClientConfig{
+									{
+										ClientType:   "web",
+										ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
+										ClientSecret: "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",
+									},
+									{
+										// We use this for mobile apps
+										ClientType:   "mobile",
+										ClientID:     "1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
+										ClientSecret: "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",
+									},
 								},
 							},
 						},

diff --git a/examples/with-chi-oso/service/service.go b/examples/with-chi-oso/service/service.go
@@ -9,7 +9,7 @@ import (
 	"github.com/osohq/go-oso"
 	"github.com/supertokens/supertokens-golang/examples/with-chi-oso/models"
 	"github.com/supertokens/supertokens-golang/recipe/session"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
+	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
@@ -92,7 +92,7 @@ func (s *service) Repo(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte(err.Error()))
 		return
 	}
-	userByID, err := thirdpartyemailpassword.GetUserById(sessionContainer.GetUserID())
+	userByID, err := thirdparty.GetUserByID(sessionContainer.GetUserID())
 	if err != nil {
 		w.WriteHeader(500)
 		w.Write([]byte(err.Error()))