Skip to content

Feature/sns login #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chomki32 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Feature/sns login #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b4e34b
Feat: KaKao, Google Login
chomki32 Oct 6, 2024
a9e586a
fix: add server client id
chomki32 Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 82 additions & 4 deletions app.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,17 @@
C81D694C2BC1821D00C77484 /* SwiftSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81D694B2BC1821D00C77484 /* SwiftSupport.swift */; };
C81D694F2BC18B9000C77484 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81D694E2BC18B9000C77484 /* JSON.swift */; };
C81D69512BC193AE00C77484 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81D69502BC193AE00C77484 /* UIColor+Extension.swift */; };
C835EDEC2CB269FE00B44D23 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C835EDEB2CB269FE00B44D23 /* LoginDelegate.swift */; };
C835EDEE2CB26A4C00B44D23 /* GoogleLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C835EDED2CB26A4C00B44D23 /* GoogleLogin.swift */; };
C835EDF02CB26A7F00B44D23 /* KakaoLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = C835EDEF2CB26A7F00B44D23 /* KakaoLogin.swift */; };
C867F0C32BB059C0004CE321 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = C867F0C22BB059C0004CE321 /* FirebaseMessaging */; };
C86A24032C109C64006285DD /* Static.swift in Sources */ = {isa = PBXBuildFile; fileRef = C86A24022C109C64006285DD /* Static.swift */; };
C88766972CB17CF700B64A63 /* KakaoSDK in Frameworks */ = {isa = PBXBuildFile; productRef = C88766962CB17CF700B64A63 /* KakaoSDK */; };
C88766992CB17CF700B64A63 /* KakaoSDKAuth in Frameworks */ = {isa = PBXBuildFile; productRef = C88766982CB17CF700B64A63 /* KakaoSDKAuth */; };
C887669B2CB17CF700B64A63 /* KakaoSDKCommon in Frameworks */ = {isa = PBXBuildFile; productRef = C887669A2CB17CF700B64A63 /* KakaoSDKCommon */; };
C887669D2CB17CF700B64A63 /* KakaoSDKUser in Frameworks */ = {isa = PBXBuildFile; productRef = C887669C2CB17CF700B64A63 /* KakaoSDKUser */; };
C88766A12CB1853C00B64A63 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = C88766A02CB1853C00B64A63 /* GoogleSignIn */; };
C88766A32CB1853C00B64A63 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C88766A22CB1853C00B64A63 /* GoogleSignInSwift */; };
C88D19382B9DE72200197101 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88D19372B9DE72200197101 /* AppDelegate.swift */; };
C88D193A2B9DE73600197101 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C88D19392B9DE73600197101 /* SceneDelegate.swift */; };
C8AAE3342BE11AFE002478B2 /* NotificationName.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8AAE3332BE11AFE002478B2 /* NotificationName.swift */; };
Expand Down Expand Up @@ -53,6 +62,9 @@
C81D694B2BC1821D00C77484 /* SwiftSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftSupport.swift; sourceTree = "<group>"; };
C81D694E2BC18B9000C77484 /* JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = "<group>"; };
C81D69502BC193AE00C77484 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
C835EDEB2CB269FE00B44D23 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = "<group>"; };
C835EDED2CB26A4C00B44D23 /* GoogleLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleLogin.swift; sourceTree = "<group>"; };
C835EDEF2CB26A7F00B44D23 /* KakaoLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KakaoLogin.swift; sourceTree = "<group>"; };
C867F0B82BB054A5004CE321 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
C86A24022C109C64006285DD /* Static.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Static.swift; sourceTree = "<group>"; };
C88D19372B9DE72200197101 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -83,6 +95,12 @@
files = (
C867F0C32BB059C0004CE321 /* FirebaseMessaging in Frameworks */,
C8C3B1552C2710CE00D558B9 /* FirebaseRemoteConfigSwift in Frameworks */,
C887669D2CB17CF700B64A63 /* KakaoSDKUser in Frameworks */,
C88766A32CB1853C00B64A63 /* GoogleSignInSwift in Frameworks */,
C88766972CB17CF700B64A63 /* KakaoSDK in Frameworks */,
C887669B2CB17CF700B64A63 /* KakaoSDKCommon in Frameworks */,
C88766992CB17CF700B64A63 /* KakaoSDKAuth in Frameworks */,
C88766A12CB1853C00B64A63 /* GoogleSignIn in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -128,6 +146,9 @@
isa = PBXGroup;
children = (
C8C3B1562C2716B700D558B9 /* FinhubRemoteConfig.swift */,
C835EDEB2CB269FE00B44D23 /* LoginDelegate.swift */,
C835EDEF2CB26A7F00B44D23 /* KakaoLogin.swift */,
C835EDED2CB26A4C00B44D23 /* GoogleLogin.swift */,
);
path = utils;
sourceTree = "<group>";
Expand Down Expand Up @@ -217,6 +238,12 @@
packageProductDependencies = (
C867F0C22BB059C0004CE321 /* FirebaseMessaging */,
C8C3B1542C2710CE00D558B9 /* FirebaseRemoteConfigSwift */,
C88766962CB17CF700B64A63 /* KakaoSDK */,
C88766982CB17CF700B64A63 /* KakaoSDKAuth */,
C887669A2CB17CF700B64A63 /* KakaoSDKCommon */,
C887669C2CB17CF700B64A63 /* KakaoSDKUser */,
C88766A02CB1853C00B64A63 /* GoogleSignIn */,
C88766A22CB1853C00B64A63 /* GoogleSignInSwift */,
);
productName = app;
productReference = FDFD05BD2B74E59C0029CA87 /* app.app */;
Expand Down Expand Up @@ -292,6 +319,8 @@
mainGroup = FDFD05B42B74E59C0029CA87;
packageReferences = (
C867F0C12BB059C0004CE321 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */,
C887669F2CB1853B00B64A63 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
);
productRefGroup = FDFD05BE2B74E59C0029CA87 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -338,6 +367,8 @@
files = (
C81D694C2BC1821D00C77484 /* SwiftSupport.swift in Sources */,
C8AAE3342BE11AFE002478B2 /* NotificationName.swift in Sources */,
C835EDF02CB26A7F00B44D23 /* KakaoLogin.swift in Sources */,
C835EDEE2CB26A4C00B44D23 /* GoogleLogin.swift in Sources */,
C88D193A2B9DE73600197101 /* SceneDelegate.swift in Sources */,
C88D19382B9DE72200197101 /* AppDelegate.swift in Sources */,
C8AAE3362BE1228D002478B2 /* String+Extension.swift in Sources */,
Expand All @@ -348,6 +379,7 @@
C81D694F2BC18B9000C77484 /* JSON.swift in Sources */,
FDFD05C32B74E59C0029CA87 /* ContentView.swift in Sources */,
FDFD05C12B74E59C0029CA87 /* appApp.swift in Sources */,
C835EDEC2CB269FE00B44D23 /* LoginDelegate.swift in Sources */,
FDA5B4E42BB7DE9300A4DC49 /* FinhubWebView.swift in Sources */,
C81D69512BC193AE00C77484 /* UIColor+Extension.swift in Sources */,
);
Expand Down Expand Up @@ -507,12 +539,12 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BASE_URL = "https://dev-main.fin-hub.co.kr";
BASE_URL = "http://192.168.219.108:3000";
CODE_SIGN_ENTITLEMENTS = app/app.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_ASSET_PATHS = "\"app/Preview Content\"";
DEVELOPMENT_TEAM = JBY3X8KKJH;
DEVELOPMENT_TEAM = 8XA9DWRR85;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = app/Info.plist;
Expand Down Expand Up @@ -546,11 +578,11 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_ASSET_PATHS = "\"app/Preview Content\"";
DEVELOPMENT_TEAM = JBY3X8KKJH;
DEVELOPMENT_TEAM = 8XA9DWRR85;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = app/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "ํ•€ํ—ˆ๋ธŒ";
INFOPLIST_KEY_CFBundleDisplayName = "ํ•€ํ—ˆ๋ธŒ(๊ฐœ๋ฐœ)";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -696,6 +728,22 @@
minimumVersion = 10.23.0;
};
};
C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kakao/kakao-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.22.7;
};
};
C887669F2CB1853B00B64A63 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/google/GoogleSignIn-iOS";
requirement = {
kind = exactVersion;
version = 7.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -704,6 +752,36 @@
package = C867F0C12BB059C0004CE321 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseMessaging;
};
C88766962CB17CF700B64A63 /* KakaoSDK */ = {
isa = XCSwiftPackageProductDependency;
package = C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDK;
};
C88766982CB17CF700B64A63 /* KakaoSDKAuth */ = {
isa = XCSwiftPackageProductDependency;
package = C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDKAuth;
};
C887669A2CB17CF700B64A63 /* KakaoSDKCommon */ = {
isa = XCSwiftPackageProductDependency;
package = C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDKCommon;
};
C887669C2CB17CF700B64A63 /* KakaoSDKUser */ = {
isa = XCSwiftPackageProductDependency;
package = C88766952CB168E700B64A63 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDKUser;
};
C88766A02CB1853C00B64A63 /* GoogleSignIn */ = {
isa = XCSwiftPackageProductDependency;
package = C887669F2CB1853B00B64A63 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignIn;
};
C88766A22CB1853C00B64A63 /* GoogleSignInSwift */ = {
isa = XCSwiftPackageProductDependency;
package = C887669F2CB1853B00B64A63 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignInSwift;
};
C8C3B1542C2710CE00D558B9 /* FirebaseRemoteConfigSwift */ = {
isa = XCSwiftPackageProductDependency;
package = C867F0C12BB059C0004CE321 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand Down
47 changes: 46 additions & 1 deletion app.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion app/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import Foundation
import UIKit
import FirebaseCore
import FirebaseMessaging
import KakaoSDKCommon
import KakaoSDKAuth
import GoogleSignIn

class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication,
Expand All @@ -21,9 +24,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {

func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
// Firebase ์ดˆ๊ธฐํ™”
FirebaseApp.configure()

// FirebaseRemoteConfig ์ดˆ๊ธฐํ™”
FinhubRemoteConfig.shared.ready()
// Kakao SDK ์ดˆ๊ธฐํ™”
KakaoSDK.initSDK(appKey: Bundle.main.object(forInfoDictionaryKey: "KAKAO_SDK_KEY") as! String)

let authOption: UNAuthorizationOptions = [.alert, .badge, .sound]
UNUserNotificationCenter.current().requestAuthorization(options: authOption, completionHandler: {_, _ in })
Expand All @@ -39,6 +45,18 @@ class AppDelegate: NSObject, UIApplicationDelegate {
func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
Messaging.messaging().apnsToken = deviceToken
}

func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
if AuthApi.isKakaoTalkLoginUrl(url) {
return AuthController.handleOpenUrl(url: url)
}

if GIDSignIn.sharedInstance.handle(url) {
return true
}

return false
}
}

extension AppDelegate: UNUserNotificationCenterDelegate {
Expand Down
31 changes: 31 additions & 0 deletions app/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,39 @@
<dict>
<key>BASE_URL</key>
<string>${BASE_URL}</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>kakao8ac60f3977b6f8ae9d19501b7faf5edb</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.googleusercontent.apps.353339464651-cnrkadg38nfnk9fn2fset2hb1cho1lj9</string>
</array>
</dict>
</array>
<key>GIDClientID</key>
<string>353339464651-cnrkadg38nfnk9fn2fset2hb1cho1lj9.apps.googleusercontent.com</string>
<key>GIDServerClientID</key>
<string>353339464651-dnul84p5jsljqkg1gfsgsdoqol5ci1ak.apps.googleusercontent.com</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>KAKAO_SDK_KEY</key>
<string>8ac60f3977b6f8ae9d19501b7faf5edb</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>kakaokompassauth</string>
<string>kakaolink</string>
<string>kakaoplus</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
Expand Down
9 changes: 9 additions & 0 deletions app/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import UIKit
import KakaoSDKAuth

class SceneDelegate: NSObject, UIWindowSceneDelegate {
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
Expand All @@ -21,4 +22,12 @@ class SceneDelegate: NSObject, UIWindowSceneDelegate {
SwiftSupport.sendNotification(data: userInfo.toJsonString)
}
}

func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
if let url = URLContexts.first?.url {
if (AuthApi.isKakaoTalkLoginUrl(url)) {
_ = AuthController.handleOpenUrl(url: url)
}
}
}
}
Loading