Merge pull request #50 from contentstack/staging

aman19K · web-flow · commit 44a8f42a8c04 · 2024-10-04T16:56:30.000+05:30
Merge Staging to Master
diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml
@@ -1,4 +1,4 @@
-name: 'Check Branch'
+name: "Check Branch"
 
 on:
   pull_request:
@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
-            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
+            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
       - name: Check branch
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         run: |
-          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
-          exit 1
+          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
+          exit 1
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Build
         run: |
           # Add commands to build and test your package
-          xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 13 Pro'
+          xcodebuild -workspace Contentstack.xcworkspace -scheme 'Contentstack' -destination 'platform=iOS Simulator,name=iPhone 15'
 
       - name: CocoaPods trunk push
         run: pod trunk push --allow-warnings
diff --git a/.talismanrc b/.talismanrc
@@ -1,4 +1,8 @@
 fileignoreconfig:
 - filename: Contentstack.xcodeproj/project.pbxproj
-  checksum: 331c4ff2e540e9495ff2a0d030ddd7f7c2eda077cb0b1a58c67fc2312b53658e
-version: ""
+  checksum: 10cb4bc5ca755f7392309a88cd6df510a45f8c527ea2f8edc71e1ae1fda60941
+- filename: .github/workflows/sast-scan.yml
+  checksum: 5554abc81d130557f52d64d253c3a23b41fcf0642a9c599131b2c185665ce581
+- filename: PrivacyInfo.xcprivacy
+  checksum: 7697fa6a0a5e0600d35d4678ffff9ef14c5dff5dc1613d37968de7ded3ff1fd0
+version: ""
diff --git a/Contentstack.podspec b/Contentstack.podspec
@@ -4,7 +4,7 @@ s.version          = '3.13.0'
 s.summary          = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'
 
 s.description      = <<-DESC
-Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content. 
+Contentstack is a headless CMS with an API-first approach that puts content at the centre. It is designed to simplify the process of publication by separating code from content.
 In a world where content is consumed via countless channels and form factors across mobile, web and IoT. Contentstack reimagines content management by decoupling code from content. Business users manage content – no training or development required. Developers can create cross-platform apps and take advantage of a headless CMS that delivers content through APIs. With an architecture that’s extensible – but without the bloat of legacy CMS – Contentstack cuts down on infrastructure, maintenance, cost and complexity.
 DESC
 
diff --git a/Contentstack.xcodeproj/project.pbxproj b/Contentstack.xcodeproj/project.pbxproj
diff --git a/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack.xcscheme b/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Contentstack/Asset.h b/Contentstack/Asset.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 BUILT_ASSUME_NONNULL_BEGIN
 
diff --git a/Contentstack/AssetLibrary.h b/Contentstack/AssetLibrary.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 BUILT_ASSUME_NONNULL_BEGIN
 
@@ -230,6 +230,24 @@ typedef NS_ENUM(NSUInteger, OrderBy) {
  */
 
 - (void)fetchAll:(void (^) (ResponseType type,NSArray<Asset *> * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock;
+
+/**
+ This method fetches assets using other fields than UID..
+ 
+      //Obj-C
+      [assetLib where:(NSString *)field equalTo:(NSObject *)value];
+ 
+      //Swift
+      assetLib.where("fieldName","value");
+ 
+ This allows filtering assets by specifying the field name and the value to match.
+ @param field The name of the field to filter by.
+ @param value The value that the field should match.
+ */
+- (void)where:(NSString *)field equalTo:(NSObject *)value ;
+
+- (NSDictionary*)getPostParamDictionary;
+
 @end
 
 BUILT_ASSUME_NONNULL_END
diff --git a/Contentstack/AssetLibrary.m b/Contentstack/AssetLibrary.m
@@ -156,6 +156,25 @@ - (void)cancelRequest {
         [self.requestOperation cancel];
     }
 }
+// MARK: - Where Query -
+- (NSDictionary*) getPostParamDictionary {
+    return [self.postParamDictionary copy];
+}
+
+- (void)where:(NSString *)field equalTo:(NSObject *)value {
+    if (field.length == 0 || !value) {
+        NSLog(@"Field or value cannot be empty");
+        return;
+    }
+    NSMutableDictionary *queryDict = [NSMutableDictionary dictionary];
+    NSDictionary *existingQuery = self.postParamDictionary[@"query"];
+    // If an existing query exists, merge it
+    if (existingQuery) {
+        [queryDict addEntriesFromDictionary:existingQuery];
+    }
+    queryDict[field] = value;
+    [self.postParamDictionary setObject:queryDict forKey:@"query"];
+}
 
 
 @end
diff --git a/Contentstack/Config.h b/Contentstack/Config.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
-#import "CSURLSessionDelegate.h"
+#import <Contentstack/ContentstackDefinitions.h>
+#import <Contentstack/CSURLSessionDelegate.h>
 @interface Config : NSObject
 
 /**----------------------------------------------------------------------------------------
@@ -88,4 +88,27 @@
  */
 @property (nullable, retain) id<CSURLSessionDelegate> delegate;
 
+
+
+/**
+ Early access features
+ 
+     //Obj-C
+     Config *config = [[Config alloc] init];
+     [config setEarlyAccess:@[@"Taxonomy", @"Teams", @"Terms", @"LivePreview"]];
+     
+     //Swift
+     let config = Config()
+     config.setEarlyAccess(["Taxonomy", "Teams", "Terms", "LivePreview"])
+ 
+ */
+@property (nonatomic, strong, nullable) NSArray<NSString *> *setEarlyAccess;
+
+
+/**
+ Set early access features
+ 
+ @param setearlyAccess An array of early access feature names
+ */
+- (NSDictionary<NSString *, NSString *> *)earlyAccessHeaders;
 @end
diff --git a/Contentstack/Config.m b/Contentstack/Config.m
@@ -15,7 +15,8 @@ -(instancetype)init {
     if (self) {
         _region = US;
         _host = @"cdn.contentstack.io";
-        _version = kCSIO_ApiVersion;        
+        _version = kCSIO_ApiVersion;
+        _setEarlyAccess = nil;
     }
     return self;
 }
@@ -25,4 +26,11 @@ - (void)setRegion:(ContentstackRegion)region {
         _host = [self hostURL:_region];
     }
 }
+- (NSDictionary<NSString *, NSString *> *)earlyAccessHeaders {
+    if (_setEarlyAccess.count > 0) {
+        NSString *earlyAccessString = [_setEarlyAccess componentsJoinedByString:@","];
+        return @{@"x-header-ea": earlyAccessString};
+    }
+    return @{};
+}
 @end
diff --git a/Contentstack/ContentType.h b/Contentstack/ContentType.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 @class Entry;
 @class Query;
diff --git a/Contentstack/Entry.h b/Contentstack/Entry.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 @class Asset;
 @class Group;
@@ -87,6 +87,10 @@ BUILT_ASSUME_NONNULL_BEGIN
  *  Readonly property to check deletedBy of entry
  */
 @property (nonatomic, copy, readonly) NSString *deletedBy;
+/**
+ *  Readonly property to check deletedBy of entry
+ */
+@property (nonatomic, copy, readonly) NSMutableDictionary *localHeaders;
 
 
 /**
@@ -124,6 +128,36 @@ BUILT_ASSUME_NONNULL_BEGIN
  */
 - (void)setHeader:(NSString *)headerValue forKey:(NSString *)headerKey;
 
+/**
+ Set a single variant uid as header
+ 
+     //'API_KEY' is a ENVIRONMENT Stack API key
+     
+     //Obj-C
+     [entryObj variantUid:@"variantUid"];
+     
+     //Swift
+     entryObj.variantUid("variantUid")
+ 
+ @param variantUid  The variant uid
+ */
+- (void)variantUid:(NSString *)variantUid;
+
+/**
+ Set multiple variant uids as header
+ 
+     //'API_KEY' is a ENVIRONMENT Stack API key
+     
+     //Obj-C
+     [entryObj variantUids:@["variant1", "variant2"]];
+     
+     //Swift
+     entryObj.setHeader(["variant1", "variant2"])
+ 
+ @param variantUids The variant uids
+ */
+- (void)variantUids:(NSArray *)variantUids;
+
 /**
  Set a header for Entry
  
diff --git a/Contentstack/Entry.m b/Contentstack/Entry.m
@@ -82,6 +82,17 @@ - (void)setHeader:(NSString *)headerValue forKey:(NSString *)headerKey {
     [self.localHeaders setObject:headerValue forKey:headerKey];
 }
 
+- (void)variantUid:(NSString *)variantUid {
+    NSString *key = @"x-cs-variant-uid";
+    [self.localHeaders setObject:variantUid forKey: key];
+}
+
+- (void)variantUids:(NSArray *)variantUids {
+    NSString *key = @"x-cs-variant-uid";
+    NSString *joinedString = [variantUids componentsJoinedByString:@","];
+    [self.localHeaders setObject:joinedString forKey: key];
+}
+
 - (void)addHeadersWithDictionary:(NSDictionary<NSString *, NSString *> *)headers {
     [headers enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
         [self.localHeaders setObject:obj forKey:key];
diff --git a/Contentstack/Group.h b/Contentstack/Group.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 
 @class Asset;
diff --git a/Contentstack/Query.h b/Contentstack/Query.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 @class QueryResult;
 @class Entry;
diff --git a/Contentstack/QueryResult.h b/Contentstack/QueryResult.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 BUILT_ASSUME_NONNULL_BEGIN
 
diff --git a/Contentstack/QueryResult.m b/Contentstack/QueryResult.m
@@ -69,7 +69,10 @@ - (NSInteger)totalCount {
         // if condition is fix for value of "entries" key ie.array inside array in response JSON
         if (objectsArray.firstObject && [objectsArray.firstObject isKindOfClass:[NSDictionary class]]) {
             [objectsArray enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL * _Nonnull stop) {
-                Entry *formEntry = [self.taxonomy entry];
+                Entry *formEntry = [self.contentType entry];
+                if (formEntry == NULL) {
+                    formEntry = [self.taxonomy entry];
+                }
                 [formEntry configureWithDictionary:obj];
                 [entryObjects addObject:formEntry];
             }];
diff --git a/Contentstack/Stack.h b/Contentstack/Stack.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 @class Config;
 @class ContentType;
@@ -68,6 +68,8 @@ BUILT_ASSUME_NONNULL_BEGIN
 
 - (Taxonomy *)taxonomy;
 
+- (NSDictionary *)getHeaders;
+
 //MARK: - Manually set headers
 /**---------------------------------------------------------------------------------------
  * @name Manually set headers
diff --git a/Contentstack/Stack.m b/Contentstack/Stack.m
@@ -47,6 +47,11 @@ - (instancetype)initWithAPIKey:(NSString*)apiKey andaccessToken:(NSString *)acce
         _commonDateFormatter.includeTime = YES;
         
         _requestOperationSet = [NSMutableSet set];
+        // Add early access headers only if they exist
+              NSDictionary *earlyAccessHeaders = [_config earlyAccessHeaders];
+              if (earlyAccessHeaders.count > 0) {
+                  [_stackHeaders addEntriesFromDictionary:earlyAccessHeaders];
+              }
 
         
         [self setHeader:_apiKey forKey:kCSIO_SiteApiKey];
@@ -128,6 +133,10 @@ - (void)removeHeaderForKey:(NSString *)headerKey {
     }
 }
 
+- (NSDictionary *)getHeaders {
+    return [self.stackHeaders copy];
+}
+
 - (NSString *)imageTransformWithUrl:(NSString *)url andParams:(NSDictionary<NSString *, id> *)params{
     if([url rangeOfString:@"?" options:NSCaseInsensitiveSearch].length==0) {
         url = [url stringByAppendingString:@"?"];
diff --git a/Contentstack/Taxonomy.h b/Contentstack/Taxonomy.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ContentstackDefinitions.h"
+#import <Contentstack/ContentstackDefinitions.h>
 
 @class Query;
 
diff --git a/ContentstackTest/ContentstackTest.m b/ContentstackTest/ContentstackTest.m
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/README.md b/README.md
