Merge branch 'develop' into feat/slide_topbar

# Conflicts:
#	Core/Core.xcodeproj/project.pbxproj
#	Core/Core/Configuration/Config/FeaturesConfig.swift
#	Course/Course/Presentation/Container/CourseContainerView.swift

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -0,0 +1,19 @@
+# Run the workflow that adds new tickets that are either:
+# - labelled "DEPR"
+# - title starts with "[DEPR]"
+# - body starts with "Proposal Date" (this is the first template field)
+# to the org-wide DEPR project board
+
+name: Add newly created DEPR issues to the DEPR project board
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  routeissue:
+    uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
+    secrets:
+      GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
+      GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/commitlint.yml

@@ -0,0 +1,10 @@
+# Run commitlint on the commit messages in a pull request.
+
+name: Lint Commit Messages
+
+on:
+  - pull_request
+
+jobs:
+  commitlint:
+    uses: openedx/.github/.github/workflows/commitlint.yml@master

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

Authorization/Authorization.xcodeproj/project.pbxproj

@@ -26,7 +26,12 @@
 		0770DE6B28D0C035006D8A5D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0770DE6D28D0C035006D8A5D /* Localizable.strings */; };
 		0770DE7128D0C0E7006D8A5D /* Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE7028D0C0E7006D8A5D /* Strings.swift */; };
 		5FB79D2802949372CDAF08D6 /* Pods_App_Authorization_AuthorizationTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FAE9B7FD61FF88C9C4FE1E8 /* Pods_App_Authorization_AuthorizationTests.framework */; };
+		BA8B3A322AD5487300D25EF5 /* SocialAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8B3A312AD5487300D25EF5 /* SocialAuthView.swift */; };
+		BADB3F552AD6DFC3004D5CFA /* SocialAuthViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BADB3F542AD6DFC3004D5CFA /* SocialAuthViewModel.swift */; };
 		DE843D6BB1B9DDA398494890 /* Pods_App_Authorization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47BCFB7C19382EECF15131B6 /* Pods_App_Authorization.framework */; };
+		E03261642AE64676002CA7EB /* StartupViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261632AE64676002CA7EB /* StartupViewModel.swift */; };
+		E03261662AE64AF4002CA7EB /* StartupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261652AE64AF4002CA7EB /* StartupView.swift */; };
+		E03261682AE9F156002CA7EB /* LogistrationBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261672AE9F156002CA7EB /* LogistrationBottomView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -75,6 +80,11 @@
 		96C85172770225EB81A6D2DA /* Pods-App-Authorization.releasedev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.releasedev.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.releasedev.xcconfig"; sourceTree = "<group>"; };
 		9BF6A1004A955E24527FCF0F /* Pods-App-Authorization-AuthorizationTests.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization-AuthorizationTests.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-Authorization-AuthorizationTests/Pods-App-Authorization-AuthorizationTests.releaseprod.xcconfig"; sourceTree = "<group>"; };
 		A99D45203C981893C104053A /* Pods-App-Authorization-AuthorizationTests.releasestage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization-AuthorizationTests.releasestage.xcconfig"; path = "Target Support Files/Pods-App-Authorization-AuthorizationTests/Pods-App-Authorization-AuthorizationTests.releasestage.xcconfig"; sourceTree = "<group>"; };
+		BA8B3A312AD5487300D25EF5 /* SocialAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialAuthView.swift; sourceTree = "<group>"; };
+		BADB3F542AD6DFC3004D5CFA /* SocialAuthViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialAuthViewModel.swift; sourceTree = "<group>"; };
+		E03261632AE64676002CA7EB /* StartupViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupViewModel.swift; sourceTree = "<group>"; };
+		E03261652AE64AF4002CA7EB /* StartupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupView.swift; sourceTree = "<group>"; };
+		E03261672AE9F156002CA7EB /* LogistrationBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogistrationBottomView.swift; sourceTree = "<group>"; };
 		E78971D8E6ED2116BBF9FD66 /* Pods-App-Authorization.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.release.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.release.xcconfig"; sourceTree = "<group>"; };
 		F52826C68AEA1CF4769389EA /* Pods-App-Authorization.releasestage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.releasestage.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.releasestage.xcconfig"; sourceTree = "<group>"; };
 		F5802BBA113276950ABCD9B3 /* Pods-App-Authorization.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.releaseprod.xcconfig"; sourceTree = "<group>"; };
@@ -139,6 +149,8 @@
 		071009CC28D1E24000344290 /* Presentation */ = {
 			isa = PBXGroup;
 			children = (
+				BA8B3A302AD5485100D25EF5 /* SocialAuth */,
+				E03261622AE6464A002CA7EB /* Startup */,
 				020C31BD290AADA700D6DEA2 /* Base */,
 				071009C528D1D9FA00344290 /* Login */,
 				07169462296D93E000E3DED6 /* Registration */,
@@ -258,6 +270,25 @@
 			path = ../Pods;
 			sourceTree = "<group>";
 		};
+		BA8B3A302AD5485100D25EF5 /* SocialAuth */ = {
+			isa = PBXGroup;
+			children = (
+				BA8B3A312AD5487300D25EF5 /* SocialAuthView.swift */,
+				BADB3F542AD6DFC3004D5CFA /* SocialAuthViewModel.swift */,
+			);
+			path = SocialAuth;
+			sourceTree = "<group>";
+		};
+		E03261622AE6464A002CA7EB /* Startup */ = {
+			isa = PBXGroup;
+			children = (
+				E03261632AE64676002CA7EB /* StartupViewModel.swift */,
+				E03261652AE64AF4002CA7EB /* StartupView.swift */,
+				E03261672AE9F156002CA7EB /* LogistrationBottomView.swift */,
+			);
+			path = Startup;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -467,16 +498,21 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BADB3F552AD6DFC3004D5CFA /* SocialAuthViewModel.swift in Sources */,
 				02066B442906D72400F4307E /* SignUpView.swift in Sources */,
 				0770DE7128D0C0E7006D8A5D /* Strings.swift in Sources */,
 				025F40E229D360E20064C183 /* ResetPasswordViewModel.swift in Sources */,
 				02066B462906D72F00F4307E /* SignUpViewModel.swift in Sources */,
+				E03261642AE64676002CA7EB /* StartupViewModel.swift in Sources */,
 				02A2ACDB2A4B016100FBBBBB /* AuthorizationAnalytics.swift in Sources */,
+				E03261682AE9F156002CA7EB /* LogistrationBottomView.swift in Sources */,
 				025F40E029D1E2FC0064C183 /* ResetPasswordView.swift in Sources */,
 				020C31CB290BF49900D6DEA2 /* FieldsView.swift in Sources */,
 				0770DE4E28D0A677006D8A5D /* SignInView.swift in Sources */,
 				02F3BFE5292533720051930C /* AuthorizationRouter.swift in Sources */,
+				E03261662AE64AF4002CA7EB /* StartupView.swift in Sources */,
 				071009C728D1DA4F00344290 /* SignInViewModel.swift in Sources */,
+				BA8B3A322AD5487300D25EF5 /* SocialAuthView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Authorization/Authorization/Presentation/AuthorizationAnalytics.swift

@@ -7,17 +7,31 @@
 
 import Foundation
 
-public enum LoginMethod: String {
-    case password = "Password"
+public enum AuthMethod: Equatable {
+    case password
+    case socailAuth(SocialAuthMethod)
+
+    public var analyticsValue: String {
+        switch self {
+        case .password:
+            "Password"
+        case .socailAuth(let socialAuthMethod):
+            socialAuthMethod.rawValue
+        }
+    }
+}
+
+public enum SocialAuthMethod: String {
     case facebook = "Facebook"
     case google = "Google"
     case microsoft = "Microsoft"
+    case apple = "Apple"
 }
 
 //sourcery: AutoMockable
 public protocol AuthorizationAnalytics {
     func setUserID(_ id: String)
-    func userLogin(method: LoginMethod)
+    func userLogin(method: AuthMethod)
     func signUpClicked()
     func createAccountClicked()
     func registrationSuccess()
@@ -28,7 +42,7 @@ public protocol AuthorizationAnalytics {
 #if DEBUG
 class AuthorizationAnalyticsMock: AuthorizationAnalytics {
     public func setUserID(_ id: String) {}
-    public func userLogin(method: LoginMethod) {}
+    public func userLogin(method: AuthMethod) {}
     public func signUpClicked() {}
     public func createAccountClicked() {}
     public func registrationSuccess() {}

Authorization/Authorization/Presentation/Login/SignInView.swift

@@ -7,6 +7,8 @@
 
 import SwiftUI
 import Core
+import Theme
+import Swinject
 
 public struct SignInView: View {
 
@@ -25,13 +27,26 @@ public struct SignInView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                CoreAssets.authBackground.swiftUIImage
+                ThemeAssets.authBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
             }.frame(maxWidth: .infinity, maxHeight: 200)
+            if viewModel.config.features.startupScreenEnabled {
+                VStack {
+                    Button(action: { viewModel.router.back() }, label: {
+                        CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template)
+                            .backButtonStyle(color: .white)
+                    })
+                    .foregroundColor(Theme.Colors.styledButtonText)
+                    .padding(.leading, isHorizontal ? 48 : 0)
+                    .padding(.top, 11)
+
+                }.frame(maxWidth: .infinity, alignment: .topLeading)
+                    .padding(.top, isHorizontal ? 20 : 0)
+            }
 
             VStack(alignment: .center) {
-                CoreAssets.appLogo.swiftUIImage
+                ThemeAssets.appLogo.swiftUIImage
                     .resizable()
                     .frame(maxWidth: 189, maxHeight: 54)
                     .padding(.top, isHorizontal ? 20 : 40)
@@ -49,10 +64,10 @@ public struct SignInView: View {
                                 .foregroundColor(Theme.Colors.textPrimary)
                                 .padding(.bottom, 20)
 
-                            Text(AuthLocalization.SignIn.email)
+                            Text(AuthLocalization.SignIn.emailOrUsername)
                                 .font(Theme.Fonts.labelLarge)
                                 .foregroundColor(Theme.Colors.textPrimary)
-                            TextField(AuthLocalization.SignIn.email, text: $email)
+                            TextField(AuthLocalization.SignIn.emailOrUsername, text: $email)
                                 .keyboardType(.emailAddress)
                                 .textContentType(.emailAddress)
                                 .autocapitalization(.none)
@@ -83,21 +98,23 @@ public struct SignInView: View {
                                         .stroke(lineWidth: 1)
                                         .fill(Theme.Colors.textInputStroke)
                                 )
-
                             HStack {
-                                Button(AuthLocalization.SignIn.registerBtn) {
-                                    viewModel.trackSignUpClicked()
-                                    viewModel.router.showRegisterScreen()
-                                }.foregroundColor(Theme.Colors.accentColor)
-
-                                Spacer()
-
+                                if !viewModel.config.features.startupScreenEnabled {
+                                    Button(AuthLocalization.SignIn.registerBtn) {
+                                        viewModel.trackSignUpClicked()
+                                        viewModel.router.showRegisterScreen()
+                                    }.foregroundColor(Theme.Colors.accentColor)
+
+                                    Spacer()
+                                }
+
                                 Button(AuthLocalization.SignIn.forgotPassBtn) {
                                     viewModel.trackForgotPasswordClicked()
                                     viewModel.router.showForgotPasswordScreen()
                                 }.foregroundColor(Theme.Colors.accentColor)
+                                    .padding(.top, 0)
                             }
-                            .padding(.top, 10)
+
                             if viewModel.isShowProgress {
                                 HStack(alignment: .center) {
                                     ProgressBar(size: 40, lineWidth: 8)
@@ -112,6 +129,15 @@ public struct SignInView: View {
                                     .padding(.top, 40)
                             }
                         }
+                        if viewModel.socialAuthEnabled {
+                            SocialAuthView(
+                                viewModel: .init(
+                                    config: viewModel.config
+                                ) { result in
+                                    Task { await viewModel.login(with: result) }
+                                }
+                            )
+                        }
                         Spacer()
                     }
                     .padding(.horizontal, 24)
@@ -126,7 +152,7 @@ public struct SignInView: View {
                 VStack {
                     Text(viewModel.alertMessage ?? "")
                         .shadowCardStyle(bgColor: Theme.Colors.accentColor,
-                                         textColor: .white)
+                                         textColor: Theme.Colors.white)
                         .padding(.top, 80)
                     Spacer()
 
@@ -153,8 +179,6 @@ public struct SignInView: View {
             }
         }
         .hideNavigationBar()
-        .navigationBarBackButtonHidden(true)
-        .navigationBarHidden(true)
         .ignoresSafeArea(.all, edges: .horizontal)
         .background(Theme.Colors.background.ignoresSafeArea(.all))
     }
@@ -165,7 +189,7 @@ struct SignInView_Previews: PreviewProvider {
     static var previews: some View {
         let vm = SignInViewModel(
             interactor: AuthInteractor.mock,
-            router: AuthorizationRouterMock(), 
+            router: AuthorizationRouterMock(),
             config: ConfigMock(),
             analytics: AuthorizationAnalyticsMock(),
             validator: Validator()